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/MenuController.kt | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/MenuController.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/MenuController.kt
index f0400fa..7b2b1d7 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/MenuController.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/MenuController.kt
@@ -247,10 +247,10 @@
val planstarttime = subtaskVo.planstarttime
val planendtime = subtaskVo.planendtime
if (planstarttime != null) {
- subtaskVo.planstarttimestr = DateUtil().DateToString(planstarttime, "yyyy-MM-dd")
+ subtaskVo.planstarttimestr = DateUtil.DateToString(planstarttime, "yyyy-MM-dd")
}
if (planendtime != null) {
- subtaskVo.planendtimestr = DateUtil().DateToString(planendtime, "yyyy-MM-dd")
+ subtaskVo.planendtimestr = DateUtil.DateToString(planendtime, "yyyy-MM-dd")
}
}
val taskdayVolist = taskService.getDayTaskByTaskID(taskId)
@@ -272,7 +272,7 @@
BeanUtils.copyProperties(subtaskVo, subtask)
//濡傛灉guid涓嶄负绌�,閭ｅ氨鏇存柊
if (!StringUtils.isEmpty(subtask.stguid)) {
- subtaskService.update(subtask)
+ subtaskService.changeStatus(subtask)
} else {
//鑾峰彇鏃ヤ换鍔�
val daytask = taskService.findByID(subtaskVo.tsguid!!)
@@ -308,10 +308,10 @@
val starttime = taskVo.starttime
val endtime = taskVo.endtime
if (starttime != null) {
- taskVo.starttimestr = DateUtil().DateToString(starttime, "yyyy-MM-dd")
+ taskVo.starttimestr = DateUtil.DateToString(starttime, "yyyy-MM-dd")
}
if (endtime != null) {
- taskVo.endtimestr = DateUtil().DateToString(endtime, "yyyy-MM-dd")
+ taskVo.endtimestr = DateUtil.DateToString(endtime, "yyyy-MM-dd")
}
}
@@ -349,10 +349,10 @@
val starttime = taskVo.starttime
val endtime = taskVo.endtime
if (starttime != null) {
- taskVo.starttimestr = DateUtil().DateToString(starttime, "yyyy-MM-dd")
+ taskVo.starttimestr = DateUtil.DateToString(starttime, "yyyy-MM-dd")
}
if (endtime != null) {
- taskVo.endtimestr = DateUtil().DateToString(endtime, "yyyy-MM-dd")
+ taskVo.endtimestr = DateUtil.DateToString(endtime, "yyyy-MM-dd")
}
}
val taskVolist = taskService.findTopTask()
@@ -398,8 +398,8 @@
//鏂拌祴鍊糶uid
toptask.tguid = UUIDGenerator.generate16ShortUUID()
//鏃ユ湡鍙樺寲
- toptask.starttime = DateUtil().StringToDate(starttimestr)
- toptask.endtime = DateUtil().StringToDate(starttimestr)
+ toptask.starttime = DateUtil.StringToDate(starttimestr)
+ toptask.endtime = DateUtil.StringToDate(starttimestr)
//鏂板缓浠诲姟鍙戝竷涓簄ull
toptask.deploytime = null
}
@@ -437,8 +437,8 @@
// }
task.tguid = UUIDGenerator.generate16ShortUUID()
task.name = taskname
- task.starttime = DateUtil().StringToDate(taskVo.starttimestr!!)
- task.endtime = DateUtil().StringToDate(taskVo.endtimestr!!)
+ task.starttime = DateUtil.StringToDate(taskVo.starttimestr!!)
+ task.endtime = DateUtil.StringToDate(taskVo.endtimestr!!)
task.settime = Date()
taskService.save(task)
}
--
Gitblit v1.9.3