启用停用修改

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

@@ -88,23 +88,28 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
     @Transactional(rollbackFor = Exception.class)
     public void saveOrUpdate(JSONObject map, ReginParams reginParams) {
         JgEnableDisable jgEnableDisable = new JgEnableDisable();
-        if(!"null".equals(String.valueOf(map.get("sequenceNbr")))){
+        if (!"null".equals(String.valueOf(map.get("sequenceNbr")))) {
             jgEnableDisable = this.baseMapper.selectById(String.valueOf(map.get("sequenceNbr")));
+        } else {
+            // 获取申请编号
+            ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.getCode.get(String.valueOf(map.get("businessCode"))), 1);
+            jgEnableDisable.setApplyNo(listResponseModel.getResult().get(0));
         }
         jgEnableDisable.setCreateDate(new Date());
         String submit = String.valueOf(map.get("submit"));
         String pageType = String.valueOf(map.get("formType"));
         String record = String.valueOf(map.get("record"));
-        String businessCode = String.valueOf(map.get("businessCode"));
+        String businessCode = ObjectUtils.isEmpty(map.get("applyType"))?String.valueOf(map.get("businessCode")):String.valueOf(map.get("applyType"));
         // 接收机构
         String[] receiveOrgCode = String.valueOf(map.getString("receiveOrgCode")).split("_");
         List<WorkflowResultDto> workflowResultList = new ArrayList<>();
 
-        ProcessTaskDTO processTaskDTO = new ProcessTaskDTO();
         WorkflowResultDto workflowResultDto = new WorkflowResultDto();
+        List<ProcessTaskDTO> processTaskDTOS = new ArrayList<>();
 
         String instanceId = "";
-        if (map.containsKey("instanceId")) {
+        if (SUBMIT_TYPE_FLOW.equals(submit)) {
+            if (map.containsKey("instanceId") && !ObjectUtils.isEmpty(map.get("instanceId"))){
                 // 只调用执行API，返回下个节点信息，用于填充业务字段
                 //组装信息
                 TaskResultDTO dto = new TaskResultDTO();
@@ -114,18 +119,19 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
                 if (FlowStatusEnum.REJECTED.getName().equals(jgEnableDisable.getAuditStatus()) || FlowStatusEnum.ROLLBACK.getName().equals(jgEnableDisable.getAuditStatus())) {
                     commMap.put("approvalStatus", "提交");
                     //下一节点执行人单位（下节点接收机构code）
-                dto.setNextExecuteUserCompanyCode(jgEnableDisable.getUseUnitCreditCode());
+                    dto.setNextExecuteUserCompanyCode(jgEnableDisable.getReceiveCompanyCode());
                 } else {
                     commMap.put("approvalStatus", submit);
                     //下一节点执行人单位（下节点接收机构code）
-                dto.setNextExecuteUserCompanyCode(jgEnableDisable.getReceiveCompanyCode());
+                    dto.setNextExecuteUserCompanyCode(jgEnableDisable.getUseUnitCreditCode());
                 }
 
                 dto.setVariable(commMap);
-            processTaskDTO = iCmWorkflowService.complete(jgEnableDisable.getNextTaskId(), dto);
+                ProcessTaskDTO processTaskDTO = iCmWorkflowService.complete(jgEnableDisable.getNextTaskId(), dto);
+                processTaskDTOS.add(processTaskDTO);
                 // 提取节点等信息
                 workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
-
+                workflowResultList.add(workflowResultDto);
                 if (!ObjectUtils.isEmpty(jgEnableDisable.getExecuteSequence())) {
                     jgEnableDisable.setExecuteSequence(jgEnableDisable.getExecuteSequence() + "," + workflowResultDto.getNextExecutorRoleIds());
                 } else {
@@ -148,9 +154,6 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
                 map1.put("flowStatusLabel", FlowStatusEnum.TO_BE_PROCESSED.getName());
                 TaskV2Model taskV2Model = commonService.updateTaskModel(map1);
                 if (ObjectUtils.isEmpty(taskV2Model)) {
-                // 如果为保存并提交，则创建代办
-                buildTask(Collections.singletonList(jgEnableDisable), businessCode, Collections.singletonList(workflowResultDto),Boolean.TRUE);
-            } else {
                     TaskModelDto taskModelDto = new TaskModelDto();
                     BeanUtils.copyProperties(taskV2Model, taskModelDto);
                     // 创建新的代办
@@ -166,24 +169,16 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
                     commonService.buildTaskModel(Collections.singletonList(taskModelDto));
                 }
             } else {
-            // 获取申请编号
-            ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.getCode.get(String.valueOf(map.get("businessCode"))), 1);
-            jgEnableDisable.setApplyNo(listResponseModel.getResult().get(0));
                 // 启动工作流并返回信息
                 workflowResultList = workFlowInfo(submit, record,receiveOrgCode[0]);
                 //业务数据组装等
                 businessData(submit, reginParams, jgEnableDisable, map, workflowResultList);
             }
-
-
+        }
         // 仅保存
+        this.saveOrUpdate(jgEnableDisable);
         if ("add".equals(pageType)) {
-            this.save(jgEnableDisable);
             buildTask(Arrays.asList(jgEnableDisable), businessCode, workflowResultList, Boolean.FALSE);
-            if(!SUBMIT_TYPE_FLOW.equals(submit)){
-                // 暂存任务
-                buildTaskDraft(jgEnableDisable);
-            }
         } else {
             // 编辑
             jgEnableDisable.setSequenceNbr(Long.valueOf(String.valueOf(map.get("sequenceNbr"))));
@@ -192,12 +187,18 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
             lambda.eq(JgEnableDisableEq::getEnableDisableApplyId, String.valueOf(map.get("sequenceNbr")));
             jgEnableDisableEqService.getBaseMapper().delete(lambda);
         }
+        if(!SUBMIT_TYPE_FLOW.equals(submit)){
+            // 暂存任务
+            buildTaskDraft(jgEnableDisable);
+        } else {
+            buildTask(Arrays.asList(jgEnableDisable), businessCode, workflowResultList, Boolean.TRUE);
+        }
         if(!"null".equals(record)){
             // 关联设备表
             JgEnableDisableEq jgEnableDisableEq = new JgEnableDisableEq();
             jgEnableDisableEq.setEquId(record);
             jgEnableDisableEq.setEnableDisableApplyId(jgEnableDisable.getSequenceNbr().toString());
-            jgEnableDisableEqService.save(jgEnableDisableEq);
+            jgEnableDisableEqService.saveOrUpdate(jgEnableDisableEq);
         }
 
     }
@@ -497,6 +498,8 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
         JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(jgEnableDisable));
         jsonObject.put("nextExecuteUser", jgEnableDisable.getNextExecutorIds());
         jsonObject.put("taskType", BusinessTypeEnum.JG_MAINTENANCE_NOTIFICATION.getCode());
+        jsonObject.put("flowStatusLabel", FlowStatusEnum.ROLLBACK.getName());
+        jsonObject.put("flowStatus", FlowStatusEnum.ROLLBACK.getCode());
         commonService.rollbackTask(jgEnableDisable.getInstanceId(), jsonObject);
     }