危险作业实际开始/结束时间修改

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/hazard/service/impl/THazardWorkPlanServiceImpl.java

@@ -541,6 +541,12 @@ public class THazardWorkPlanServiceImpl extends SuperServiceImpl<THazardWorkPlan
         if (WorkPlanStatusEnum.TECHNICAL_EXPLANATION.getValue().equals(workStatus)) {
             //流转到安全许可证关闭
             executionWorkProcess(id, tHazardWorkPlanDTO.getTaskId(), WorkPlanStatusEnum.TO_BE_CLOSED.getValue(), tHazardWorkPlanDTO.getMap(), tHazardWorkPlan);
+
+            THazardWorkPlan updWorkPlan = new THazardWorkPlan();
+            updWorkPlan.setId(id);
+            //更新实际开始时间
+            updWorkPlan.setActualStartTime(new Date());
+            this.updateById(updWorkPlan);
         }
 
         //如果为安全许可证关闭

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/hazard/task/DynamicCandidateUsersListener.java

@@ -86,13 +86,8 @@ public class DynamicCandidateUsersListener implements TaskListener {
         if ("安全技术交底".equals(name)){
             //修改交底状态
             String bizId = delegateTask.getVariable("bizKeyId").toString();
-            //是否驳回
-            String rejected = delegateTask.getVariable("rejected").toString();
             THazardWorkPlan byId = tHazardWorkPlanService.getById(bizId);
             if (byId != null){
-                if("0".equals(rejected)){
-                    byId.setActualStartTime(new Date());
-                }
                 byId.setWorkStatus(WorkPlanStatusEnum.TECHNICAL_EXPLANATION.getValue());
                 tHazardWorkPlanService.updateById(byId);
             }
@@ -101,8 +96,6 @@ public class DynamicCandidateUsersListener implements TaskListener {
         if ("安全许可证关闭".equals(name)){
             //修改交底状态
             String bizId = delegateTask.getVariable("bizKeyId").toString();
-            //是否驳回
-            String rejected = delegateTask.getVariable("rejected").toString();
             THazardWorkPlan byId = tHazardWorkPlanService.getById(bizId);
             if (byId != null){
                 /*安全技术交底时设置实际开始时间
@@ -118,9 +111,6 @@ public class DynamicCandidateUsersListener implements TaskListener {
                 byId.setActualStartTime(new Date());
                 byId.setActualEndTime(actualEndTime);*/
 
-                if("0".equals(rejected)){
-                    byId.setActualEndTime(new Date());
-                }
                 byId.setWorkStatus(WorkPlanStatusEnum.TO_BE_CLOSED.getValue());
                 tHazardWorkPlanService.updateById(byId);
                 //发送消息通知