1.公共接口调整

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

@@ -59,7 +59,8 @@ public class CmWorkflowServiceImpl implements ICmWorkflowService {
                 log.info("开始请求工作流驳回任务接口:/reject/{taskId},请求参数：{},{}", taskId, JSONObject.toJSONString(data));
                 processTaskDTO = Workflow.taskV2Client.completeByTaskFroStandard(taskId, data).getResult();
             } else {
-                throw new RuntimeException("不支持的操作类型！");
+                log.info("开始请求工作流完成任务接口:/complete/standard/{taskId},请求参数：{},{}", taskId, JSONObject.toJSONString(data));
+                processTaskDTO = Workflow.taskV2Client.completeByTaskFroStandard(taskId, data).getResult();
             }
         } catch (InnerInvokException e) {
             //拦截无审核人异常信息

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

@@ -266,7 +266,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                 task.setVariable(map);
                 //执行流程
                 task.setNextExecuteUserCompanyCode(noticeDto.getReceiveOrgCode());
-                ProcessTaskDTO processTaskDTO = cmWorkflowService.completeOrReject(taskId, task, operate);
+                ProcessTaskDTO processTaskDTO = cmWorkflowService.completeOrReject(taskId, task, op);
                 JgChangeRegistrationUnit bean = new JgChangeRegistrationUnit();
                 BeanUtils.copyProperties(noticeDto, bean);
                 String taskCode = FlowStatusEnum.TO_BE_FINISHED.getName();
@@ -763,7 +763,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         }
         task.setVariable(map);
         //执行流程
-        ProcessTaskDTO processTaskDTO = cmWorkflowService.completeOrReject(taskId, task, operate);
+        ProcessTaskDTO processTaskDTO = cmWorkflowService.completeOrReject(taskId, task, op);
         String taskCode = FlowStatusEnum.TO_BE_FINISHED.getName();
         String taskName1 = "";
         String nextTaskId = "";

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

@@ -131,7 +131,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
                 }
 
                 dto.setVariable(commMap);
-                ProcessTaskDTO processTaskDTO = iCmWorkflowService.completeOrReject(jgEnableDisable.getNextTaskId(), dto, operate);
+                ProcessTaskDTO processTaskDTO = iCmWorkflowService.completeOrReject(jgEnableDisable.getNextTaskId(), dto, submit);
                 processTaskDTOS.add(processTaskDTO);
                 // 提取节点等信息
                 workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
@@ -496,7 +496,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
         workDto.setVariable(commMap);
         workDto.setComment(opinion);
         workDto.setNextExecuteUserCompanyCode("1".equals(op) ? jgEnableDisable.getUseUnitCreditCode() : jgEnableDisable.getReceiveCompanyCode());
-        processTaskDTO = iCmWorkflowService.completeOrReject(jgEnableDisable.getNextTaskId(), workDto, operate);
+        processTaskDTO = iCmWorkflowService.completeOrReject(jgEnableDisable.getNextTaskId(), workDto, op);
         // 提取节点等信息
         workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
         return workflowResultDto;

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

@@ -293,7 +293,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
                 }
                 dto.setVariable(commMap);
                 dto.setNextExecuteUserCompanyCode(transfer.getInstallUnitCreditCode());
-                ProcessTaskDTO processTaskDTO = cmWorkflowService.completeOrReject(transfer.getNextTaskId(), dto, operate);
+                ProcessTaskDTO processTaskDTO = cmWorkflowService.completeOrReject(transfer.getNextTaskId(), dto, op);
                 // 提取节点等信息
                 WorkflowResultDto workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
                 BeanUtils.copyProperties(equipTransferDto, transfer);
@@ -346,7 +346,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
         workDto.setNextExecuteUserCompanyCode("1".equals(op) ? jgEquipTransfer.getUseUnitCreditCode() : jgEquipTransfer.getInstallUnitCreditCode());
         workDto.setVariable(commMap);
         workDto.setComment(jgEquipTransferDto.getProcessAdvice());
-        ProcessTaskDTO processTaskDTO = cmWorkflowService.completeOrReject(jgEquipTransfer.getNextTaskId(), workDto, operate);
+        ProcessTaskDTO processTaskDTO = cmWorkflowService.completeOrReject(jgEquipTransfer.getNextTaskId(), workDto, op);
         // 提取节点等信息
         WorkflowResultDto workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
         jgEquipTransfer.setPromoter(reginParams.getUserModel().getUserId());

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

@@ -273,7 +273,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                 dto.setVariable(commMap);
                 //下一节点执行人单位（下节点接收机构code）
                 dto.setNextExecuteUserCompanyCode(notice.getReceiveOrgCreditCode());
-                processTaskDTO = iCmWorkflowService.completeOrReject(notice.getNextTaskId(), dto, operate);
+                processTaskDTO = iCmWorkflowService.completeOrReject(notice.getNextTaskId(), dto, op);
                 // 提取节点等信息
                 workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
                 BeanUtils.copyProperties(noticeDto, notice);
@@ -953,7 +953,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         workDto.setVariable(commMap);
         workDto.setComment(jgTransferNotice.getProcessAdvice());
         workDto.setNextExecuteUserCompanyCode("1".equals(op) ? jgTransferNotice.getInstallUnitCreditCode() : jgTransferNotice.getReceiveOrgCreditCode());
-        processTaskDTO = iCmWorkflowService.completeOrReject(jgTransferNotice.getNextTaskId(), workDto, operate);
+        processTaskDTO = iCmWorkflowService.completeOrReject(jgTransferNotice.getNextTaskId(), workDto, op);
         // 提取节点等信息
         workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
         return workflowResultDto;

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

@@ -218,7 +218,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                 //下一节点执行人单位（下节点接收机构code）
                 dto.setNextExecuteUserCompanyCode(notice.getReceiveCompanyCode());
                 dto.setVariable(commMap);
-                processTaskDTO = cmWorkflowService.completeOrReject(notice.getNextTaskId(), dto, operate);
+                processTaskDTO = cmWorkflowService.completeOrReject(notice.getNextTaskId(), dto, op);
                 // 提取节点等信息
                 workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
                 BeanUtils.copyProperties(noticeDto, notice);
@@ -743,7 +743,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
         }
         //组装信息
         TaskResultDTO taskResultDTO = assembleData(jgMaintainNotice, op, opinion);
-        ProcessTaskDTO processTaskDTO = cmWorkflowService.completeOrReject(jgMaintainNotice.getNextTaskId(), taskResultDTO, operate);
+        ProcessTaskDTO processTaskDTO = cmWorkflowService.completeOrReject(jgMaintainNotice.getNextTaskId(), taskResultDTO, op);
 
         // 提取节点等信息
         WorkflowResultDto workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);

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

@@ -450,7 +450,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         HashMap<String, Object> map = new HashMap<>();
         map.put("approvalStatus", op);
         dto.setVariable(map);
-        return workflowService.completeOrReject(contract.getNextTaskId(), dto, operate);
+        return workflowService.completeOrReject(contract.getNextTaskId(), dto, op);
     }
 
     private void buildRoleList(List<ProcessTaskDTO> processTasks, List<String> roleListNext, List<String> roleListAll) {

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

@@ -202,7 +202,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
                 }
                 dto.setNextExecuteUserCompanyCode(notice.getReceiveCompanyCode());
                 dto.setVariable(commMap);
-                ProcessTaskDTO processTaskDTO = cmWorkflowService.completeOrReject(notice.getNextTaskId(), dto, operate);
+                ProcessTaskDTO processTaskDTO = cmWorkflowService.completeOrReject(notice.getNextTaskId(), dto, op);
                 // 提取节点等信息
                 WorkflowResultDto workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
                 BeanUtils.copyProperties(noticeDto, notice);
@@ -723,7 +723,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
         workDto.setNextExecuteUserCompanyCode("1".equals(op) ? jgReformNotice.getInstallUnitCreditCode() : jgReformNotice.getReceiveOrgCode());
         workDto.setVariable(commMap);
         workDto.setComment(dto.getRemark());
-        ProcessTaskDTO processTaskDTO = cmWorkflowService.completeOrReject(jgReformNotice.getNextTaskId(), workDto, operate);
+        ProcessTaskDTO processTaskDTO = cmWorkflowService.completeOrReject(jgReformNotice.getNextTaskId(), workDto, op);
         WorkflowResultDto workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
         jgReformNotice.setPromoter(reginParams.getUserModel().getUserId());
         jgReformNotice.setRemark(dto.getRemark());

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

@@ -492,14 +492,15 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
     public ProcessTaskDTO submit(JgScrapCancelDto jgScrapCancelDto) {
         JgScrapCancel model = this.getById(jgScrapCancelDto.getSequenceNbr());
         // 组装信息
+        String op = "提交";
         TaskResultDTO dto = new TaskResultDTO();
         dto.setResultCode("approvalStatus");
         dto.setTaskId(jgScrapCancelDto.getNextTaskId());
         HashMap<String, Object> map = new HashMap<>();
-        map.put("approvalStatus", "提交");
+        map.put("approvalStatus", op);
         dto.setNextExecuteUserCompanyCode(model.getReceiveOrgCode());
         dto.setVariable(map);
-        return cmWorkflowService.completeOrReject(jgScrapCancelDto.getNextTaskId(), dto, operate);
+        return cmWorkflowService.completeOrReject(jgScrapCancelDto.getNextTaskId(), dto, op);
     }
 
     public Map<String, Object> queryBySequenceNbr(Long sequenceNbr) {

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

@@ -317,7 +317,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 }
                 dto.setVariable(commMap);
                 dto.setNextExecuteUserCompanyCode(notice.getReceiveOrgCode());
-                processTaskDTO = iCmWorkflowService.completeOrReject(notice.getNextTaskId(), dto, operate);
+                processTaskDTO = iCmWorkflowService.completeOrReject(notice.getNextTaskId(), dto, op);
                 // 提取节点等信息
                 workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
                 BeanUtils.copyProperties(noticeDto, notice);
@@ -802,7 +802,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         workDto.setNextExecuteUserCompanyCode("1".equals(op) ? jgTransferNotice.getInstallUnitCreditCode() : jgTransferNotice.getReceiveOrgCode());
         workDto.setVariable(commMap);
         workDto.setComment(opinion);
-        processTaskDTO = iCmWorkflowService.completeOrReject(jgTransferNotice.getNextTaskId(), workDto, operate);
+        processTaskDTO = iCmWorkflowService.completeOrReject(jgTransferNotice.getNextTaskId(), workDto, op);
         // 提取节点等信息
         workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
         return workflowResultDto;