feiyu02
2024-07-19 4e20a1aaaba1bb843820fca844c20055a33febce
src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/SubtaskServiceImpl.kt
@@ -431,6 +431,7 @@
                if (!bool){
                    daytaskVo.runingstatus = Constant.TaskProgress.RUNINGSTATUS3.text
                }
            }
            //两者状态相同时不做修改,其余情况日任务都为正在执行
            else if (subtask.status != daytaskVo.runingstatus){
@@ -442,30 +443,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) {