From 46872a311da9480d3edb19223aca2e0833fb1e31 Mon Sep 17 00:00:00 2001
From: hcong <1050828145@qq.com>
Date: 星期二, 17 十二月 2024 11:41:00 +0800
Subject: [PATCH] 1. 完成数据产品中间结果基本信息和具体信息入库 2. 修改ColInspectionInfo.kt 监管时间格式修改为yyyy-mm-dd 3. 新增数据产品类型枚举类 DataProductType 4. 修改BaseTemplate实现类通过重写genData方法生成Template相关数据 5. TODO 其他未涉及到的产品对象的中间结果对象
---
src/main/kotlin/cn/flightfeather/supervision/lightshare/web/SubtaskController.kt | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/SubtaskController.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/SubtaskController.kt
index cf2670e..46d2217 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/SubtaskController.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/SubtaskController.kt
@@ -28,7 +28,7 @@
@PostMapping
fun update(@RequestBody subtask: Subtask): Int {
- val res = subtaskService.update(subtask)
+ val res = subtaskService.changeStatus(subtask)
if (subtask.status == Constant.TaskProgress.RUNINGSTATUS3.text) {
val event = "鍦�${subtask.scensename}缁撴潫宸℃煡"
bizLog.info(WorkStreamLogInfo(subtask.executorguids, subtask.executorrealtimes, event))
@@ -38,6 +38,10 @@
}
return res
}
+
+ @ApiOperation("璋冩暣宸℃煡浠诲姟淇℃伅")
+ @PostMapping("/adjust")
+ fun adjust(@RequestBody subtask: Subtask) = resPack { subtaskService.update(subtask) }
@GetMapping("/{id}")
fun getById(@PathVariable id: String) = subtaskService.findByID(id)
@@ -90,7 +94,7 @@
@PostMapping("/summary/area")
fun getTaskProgressByArea(
@RequestBody areaVo: AreaVo,
- ) = resPack { subtaskService.getTaskProgressByArea(areaVo) }
+ ) = subtaskService.getTaskProgressByArea(areaVo)
@ApiOperation("鑾峰彇鏌愪釜鍦烘櫙鐨勫贰鏌ヤ换鍔�")
@GetMapping("/byScene")
--
Gitblit v1.9.3