Merge branch 'develop_tzs_register' of…

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgEnableDisable.java

@@ -136,4 +136,15 @@ public class JgEnableDisable extends BaseEntity {
      */
     @TableField(value = "next_task_id")
     private String nextTaskId;
+
+
+    @TableField(value = "create_user_company_name")
+    private String createUserCompanyName;
+
+    @TableField(exist = false)
+    private String equList;
+
+    @TableField(exist = false)
+    private String supervisoryCode;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/BusinessTypeEnum.java

@@ -32,8 +32,8 @@ public enum BusinessTypeEnum {
 
     JG_RENOVATION_REGISTRATION("111", "改造变更登记"),
 
-    JG_EQUIPMENT_STOP("112-1", "设备启用"),
-    JG_EQUIPMENT_START("112-2", "设备停用"),
+    JG_EQUIPMENT_START("112-1", "设备启用"),
+    JG_EQUIPMENT_STOP("112-2", "设备停用"),
 
     JG_EQUIPMENT_MOVE("113-1", "移装报废"),
     JG_EQUIPMENT_CANCEL("113-2", "注销报废"),

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgChangeRegistrationReformServiceImpl.java

@@ -372,6 +372,8 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         this.update(jgChangeRegistrationReform, lambda);
 //        commonServiceImpl.deleteTaskModel(instanceId);
         JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(jgChangeRegistrationReform));
+        jsonObject.put("flowStatus", commonServiceImpl.getDictionaryCodeByName(jgChangeRegistrationReform.getAuditStatus()));
+        jsonObject.put("flowStatusLabel", jgChangeRegistrationReform.getAuditStatus());
         jsonObject.put("nextTaskId", jgChangeRegistrationReform.getNextTaskId());
         jsonObject.put("nextExecuteUser", jgChangeRegistrationReform.getNextExecutorIds());
         jsonObject.put("taskType",BusinessTypeEnum.JG_RENOVATION_REGISTRATION.getCode());

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgScrapCancelServiceImpl.java

@@ -528,7 +528,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         String nextUserIds = workflowResultDtos.get(0).getNextExecutorUserIds();
         jgScrapCancel.setNextExecuteUserIds(nextUserIds);
         jgScrapCancel.setPromoter(reginParams.getUserModel().getUserId());
-        jgScrapCancel.setNextExecuteIds(Objects.isNull(workflowResultDto) ? null : workflowResultDto.getNextExecutorRoleIds());
+        jgScrapCancel.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
         this.update(jgScrapCancel, lambda);
 
         // 删除待办
@@ -536,9 +536,15 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         jsonObject.put("nextTaskId", jgScrapCancel.getNextTaskId());
         jsonObject.put("nextExecuteUser", jgScrapCancel.getNextExecuteIds());
         jsonObject.put("taskType", businessTypeJudgment(jgScrapCancel.getCancelType()).getCode());
+        jsonObject.put("flowStatus", this.getTaskCodeByName(jgScrapCancel.getAuditStatus()));
+        jsonObject.put("flowStatusLabel", jgScrapCancel.getAuditStatus());
         commonService.rollbackTask(instanceId, jsonObject);
     }
 
+    private Integer getTaskCodeByName(String auditStatus) {
+        return commonService.getDictionaryCodeByName(auditStatus);
+    }
+
     @Transactional
     public void flowExecute(Long id, String instanceId, String operate, String comment) {
         try {