From 0516cba27e632f20efac2752787f38f0c87baafa Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期三, 25 九月 2024 09:24:05 +0800
Subject: [PATCH] 1. 新增自动评估添加和更新接口
---
src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/SubtaskServiceImpl.kt | 87 +++++++++++++++----------------------------
1 files changed, 31 insertions(+), 56 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/SubtaskServiceImpl.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/SubtaskServiceImpl.kt
index 37f67a2..d58addf 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/SubtaskServiceImpl.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/SubtaskServiceImpl.kt
@@ -31,8 +31,6 @@
private val subTaskRep: SubTaskRep,
) : SubtaskService {
- val dateUtil = DateUtil()
-
@Autowired
lateinit var taskService: TaskService
@Autowired
@@ -188,25 +186,25 @@
dateString = date.substring(0, 7)
}
//鍒ゆ柇鍙傛暟鏄惁姝ｇ‘
- if (dateUtil.StringToDate(dateString) == null) {
+ if (DateUtil.StringToDate(dateString) == null) {
return taskPackList
}
//鏍规嵁type绫诲瀷,寰楀埌鍏蜂綋鏄鍝笁涓湀鏁版嵁
when (type) {
"Middle" -> {
- one = dateUtil.addMonth(dateString, -1)
+ one = DateUtil.addMonth(dateString, -1)
two = dateString
- three = dateUtil.addMonth(dateString, 1)
+ three = DateUtil.addMonth(dateString, 1)
}
"Left" -> {
- one = dateUtil.addMonth(dateString, 1)
- two = dateUtil.addMonth(dateString, 2)
- three = dateUtil.addMonth(dateString, 3)
+ one = DateUtil.addMonth(dateString, 1)
+ two = DateUtil.addMonth(dateString, 2)
+ three = DateUtil.addMonth(dateString, 3)
}
"Right" -> {
- one = dateUtil.addMonth(dateString, -1)
- two = dateUtil.addMonth(dateString, -2)
- three = dateUtil.addMonth(dateString, -3)
+ one = DateUtil.addMonth(dateString, -1)
+ two = DateUtil.addMonth(dateString, -2)
+ three = DateUtil.addMonth(dateString, -3)
}
else -> {
//鍙傛暟涓嶆纭氨杩斿洖
@@ -242,25 +240,25 @@
dateString = date.substring(0, 7)
}
//鍒ゆ柇鍙傛暟鏄惁姝ｇ‘
- if (dateUtil.StringToDate(dateString) == null) {
+ if (DateUtil.StringToDate(dateString) == null) {
return taskPackList
}
//鏍规嵁type绫诲瀷,寰楀埌鍏蜂綋鏄鍝笁涓湀鏁版嵁
when (type) {
"Middle" -> {
- one = dateUtil.addMonth(dateString, -1)
+ one = DateUtil.addMonth(dateString, -1)
two = dateString
- three = dateUtil.addMonth(dateString, 1)
+ three = DateUtil.addMonth(dateString, 1)
}
"Left" -> {
- one = dateUtil.addMonth(dateString, 1)
- two = dateUtil.addMonth(dateString, 2)
- three = dateUtil.addMonth(dateString, 3)
+ one = DateUtil.addMonth(dateString, 1)
+ two = DateUtil.addMonth(dateString, 2)
+ three = DateUtil.addMonth(dateString, 3)
}
"Right" -> {
- one = dateUtil.addMonth(dateString, -1)
- two = dateUtil.addMonth(dateString, -2)
- three = dateUtil.addMonth(dateString, -3)
+ one = DateUtil.addMonth(dateString, -1)
+ two = DateUtil.addMonth(dateString, -2)
+ three = DateUtil.addMonth(dateString, -3)
}
else -> {
//鍙傛暟涓嶆纭氨杩斿洖
@@ -393,7 +391,7 @@
val toptaskVo = taskService.findByID(subtask.tguid.toString())
// //鏍规嵁鏃ユ湡鑾峰彇鏃ヤ换鍔�
-// val daytaskVo = taskService.findByDate(dateUtil.getDate(subtask.planstarttime)!!)
+// val daytaskVo = taskService.findByDate(DateUtil.getDate(subtask.planstarttime)!!)
//搴旇鐩存帴鏍规嵁瀛愪换鍔＄殑鏃ヤ换鍔d鏌ヨ鏃ヤ换鍔�
val daytaskVo = taskService.findByID(subtask.tsguid!!)
@@ -407,9 +405,9 @@
task.tsguid = toptaskVo.tguid
task.tguid = guid
task.name = subtask.name
- task.starttime = dateUtil.StringToDate(dateUtil.getDate(subtask.planstarttime)!!.substring(0, 10))
+ task.starttime = DateUtil.StringToDate(DateUtil.getDate(subtask.planstarttime)!!.substring(0, 10))
task.endtime =
- dateUtil.StringToDate(dateUtil.getDate(subtask.planstarttime)!!.substring(0, 10) + " 23:59:59")
+ DateUtil.StringToDate(DateUtil.getDate(subtask.planstarttime)!!.substring(0, 10) + " 23:59:59")
//****鏃ヤ换鍔℃墽琛岀姸鎬佺户鎵垮瓙浠诲姟鐨勭姸鎬�*锛堜慨鏀癸級***
task.runingstatus = subtask.status
//********************************************
@@ -431,6 +429,7 @@
if (!bool){
daytaskVo.runingstatus = Constant.TaskProgress.RUNINGSTATUS3.text
}
+
}
//涓よ�呯姸鎬佺浉鍚屾椂涓嶅仛淇敼锛屽叾浣欐儏鍐垫棩浠诲姟閮戒负姝ｅ湪鎵ц
else if (subtask.status != daytaskVo.runingstatus){
@@ -442,30 +441,6 @@
//****************************************************************************************
subtaskMapper.updateByPrimaryKeySelective(subtask)
}
-
- //鍒ゆ柇瀵瑰簲椤跺眰浠诲姟鐨勬墽琛岀姸鎬�
-// val daytaskVolist = taskService.getDayTaskByTaskID(toptaskVo.tguid!!)
-// val iterator: Iterator<TaskVo> = daytaskVolist.iterator()
-// if (daytaskVo.runingstatus == Constant.TaskProgress.RUNINGSTATUS3.text
-// && toptaskVo.runingstatus == Constant.TaskProgress.RUNINGSTATUS2.text) {
-// var bool = false
-// while (iterator.hasNext()) {
-// val tmp = iterator.next()
-// if (tmp.runingstatus != Constant.TaskProgress.RUNINGSTATUS3.text) {
-// bool = true
-// break
-// }
-// }
-// if (!bool){
-// toptaskVo.runingstatus = Constant.TaskProgress.RUNINGSTATUS3.text
-// }
-// }
-// else if (daytaskVo.runingstatus != toptaskVo.runingstatus){
-// toptaskVo.runingstatus = Constant.TaskProgress.RUNINGSTATUS2.text
-// }
-// val toptask = Task()
-// BeanUtils.copyProperties(toptaskVo, toptask)
-// taskMapper.updateByPrimaryKeySelective(toptask)
//瀵瑰凡缁撴潫鐨勫瓙浠诲姟杩涜鑷姩璇勫垎
if (subtask.status == Constant.TaskProgress.RUNINGSTATUS3.text) {
@@ -540,7 +515,7 @@
cal.set(Calendar.MILLISECOND, 0)
cal.time
} else {
- DateUtil().StringToDate(startTime!!)
+ DateUtil.StringToDate(startTime!!)
}
val _endTime = if (endTime.isNullOrBlank()) {
@@ -551,7 +526,7 @@
cal.set(Calendar.MILLISECOND, 999)
cal.time
} else {
- DateUtil().StringToDate(endTime!!)?.apply {
+ DateUtil.StringToDate(endTime!!)?.apply {
time += 24 * 60 * 60 * 1000
}
}
@@ -616,7 +591,7 @@
}
val time = if (updateTime != null) {
- DateUtil().StringToDate(updateTime)
+ DateUtil.StringToDate(updateTime)
} else {
null
}
@@ -635,7 +610,7 @@
cal.set(Calendar.MILLISECOND, 0)
cal.time
} else {
- DateUtil().StringToDate(startTime!!)
+ DateUtil.StringToDate(startTime!!)
}
val _endTime = if (endTime.isNullOrBlank()) {
@@ -646,7 +621,7 @@
cal.set(Calendar.MILLISECOND, 999)
cal.time
} else {
- DateUtil().StringToDate(endTime!!)?.apply {
+ DateUtil.StringToDate(endTime!!)?.apply {
this.time += 24 * 60 * 60 * 1000
}
}
@@ -767,7 +742,7 @@
}
val time = if (updateTime != null) {
- DateUtil().StringToDate(updateTime)
+ DateUtil.StringToDate(updateTime)
} else {
null
}
@@ -786,7 +761,7 @@
cal.set(Calendar.MILLISECOND, 0)
cal.time
} else {
- DateUtil().StringToDate(startTime!!)
+ DateUtil.StringToDate(startTime!!)
}
val _endTime = if (endTime.isNullOrBlank()) {
@@ -797,7 +772,7 @@
cal.set(Calendar.MILLISECOND, 999)
cal.time
} else {
- DateUtil().StringToDate(endTime!!)?.apply {
+ DateUtil.StringToDate(endTime!!)?.apply {
this.time += 24 * 60 * 60 * 1000
}
}
@@ -918,7 +893,7 @@
}
override fun findByDate(date: String, userId: String): List<SubtaskVo> {
- val time = DateUtil().StringToDate(date)
+ val time = DateUtil.StringToDate(date)
val resultList = mutableListOf<SubtaskVo>()
--
Gitblit v1.9.3