#检修工作票:签发、延期不通过修改

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/accessTicket/service/impl/AccessTicketServiceImpl.java

@@ -130,9 +130,14 @@ public class AccessTicketServiceImpl extends ServiceImpl<AccessTicketMapper, Acc
             }
 
             // 审批签发 reversal = 5
-            if("5".equals(reversal) && variables.containsKey("issuePersonnel")){
-                entity.setIssueTime(new Date());
-                entity.setIssuePersonnel(variables.get("issuePersonnel").toString());
+            if("5".equals(reversal)){
+                if("pass".equals(variables.get("issue"))){
+                    entity.setIssueTime(new Date());
+                    entity.setIssuePersonnel(variables.get("issuePersonnel").toString());
+                }else if("notPass".equals(variables.get("issue"))){
+                    entity.setTaskName("签发不通过");
+                    entity.setNextStepOperator("流程结束，无需人员处理");
+                }
             }
 
             // 实际检修 reversal = 6
@@ -148,7 +153,6 @@ public class AccessTicketServiceImpl extends ServiceImpl<AccessTicketMapper, Acc
                         }
                     }else{
                         if(variables.containsKey("extensionTime")){
-
                             entity.setExtensionTime(DateUtil.parse(variables.get("extensionTime").toString(),DateUtil.PATTERN_DATETIME));
                         }
                     }
@@ -156,8 +160,12 @@ public class AccessTicketServiceImpl extends ServiceImpl<AccessTicketMapper, Acc
             }
 
             // 检修延期 reversal = 7
-            if("7".equals(reversal) && variables.containsKey("extensionPersonnel")){
-                entity.setExtensionPersonnel(variables.get("extensionPersonnel").toString());
+            if("7".equals(reversal)){
+                if(variables.containsKey("extensionPersonnel")){
+                    entity.setExtensionPersonnel(variables.get("extensionPersonnel").toString());
+                }else{
+                    entity.setExtensionTime(null);
+                }
             }
 
             // 检修验收 reversal = 8
@@ -170,7 +178,7 @@ public class AccessTicketServiceImpl extends ServiceImpl<AccessTicketMapper, Acc
 
         }
         // 消息推送
-        if(!"流程结束".equals(entity.getTaskName())){
+        if(!"流程结束".equals(entity.getTaskName()) && !"签发不通过".equals(entity.getTaskName())){
             String countent = "您有一条检修报单流程待处理！单据名称:".concat(DateUtil.format(entity.getCreateTime(),DateUtil.PATTERN_DATETIME) + "_"  + entity.getDeviceName() + "_检修工作票")
                     .concat("，当前环节：")
                     .concat(processWorkFlowResponse.getTaskName());