停用启用修改

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/JgEnableDisableServiceImpl.java

@@ -108,6 +108,8 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
         List<ProcessTaskDTO> processTaskDTOS = new ArrayList<>();
 
         String instanceId = "";
+        jgEnableDisable.setEquList("null".equals(record) ? "null" : map.get("equListDesc").toString());
+        jgEnableDisable.setSupervisoryCode("null".equals(record) ? "null" : map.get("supervisoryCode").toString());
         if (SUBMIT_TYPE_FLOW.equals(submit)) {
             if (map.containsKey("instanceId") && !ObjectUtils.isEmpty(map.get("instanceId"))){
                 // 只调用执行API，返回下个节点信息，用于填充业务字段
@@ -137,8 +139,6 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
                 } else {
                     jgEnableDisable.setExecuteSequence(workflowResultDto.getNextExecutorRoleIds());
                 }
-                jgEnableDisable.setEquList("null".equals(record) ? "null" : map.get("equListDesc").toString());
-                jgEnableDisable.setSupervisoryCode("null".equals(record) ? "null" : map.get("supervisoryCode").toString());
                 jgEnableDisable.setPromoter(RequestContext.getExeUserId());
                 jgEnableDisable.setNextExecutorIds(String.join(",", workflowResultDto.getNextExecutorRoleIds()));
                 jgEnableDisable.setAuditStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getName()));
@@ -174,6 +174,13 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
                 //业务数据组装等
                 businessData(submit, reginParams, jgEnableDisable, map, workflowResultList);
             }
+        } else {
+            jgEnableDisable.setReceiveCompanyCode(receiveOrgCode[0]);
+            jgEnableDisable.setReceiveOrgName(receiveOrgCode[1]);
+            jgEnableDisable.setRemark(map.get("remark") == null ? "" : map.get("remark").toString());
+            jgEnableDisable.setApplyDate(new Date());
+            jgEnableDisable.setApplyType(String.valueOf(map.get("applyType")));
+            jgEnableDisable.setAuditStatus(FlowStatusEnum.TO_BE_SUBMITTED.getName());
         }
         // 仅保存
         this.saveOrUpdate(jgEnableDisable);