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

@@ -10,7 +10,7 @@ import java.util.List;
 public interface ICmWorkflowService {
     List<ProcessTaskDTO> startBatch(ActWorkflowBatchDTO params);
 
-    ProcessTaskDTO complete(String taskId, TaskResultDTO data);
+    ProcessTaskDTO completeOrReject(String taskId, TaskResultDTO data, String operate);
 
     ProcessTaskDTO rollBack(String processInstanceId);
 }

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

@@ -12,7 +12,6 @@ import com.yeejoin.amos.feign.workflow.model.ProcessTaskDTO;
 import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
-import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import java.util.List;
 
@@ -23,6 +22,12 @@ import java.util.List;
 @Slf4j
 public class CmWorkflowServiceImpl implements ICmWorkflowService {
 
+    public static String PASS_OPERATE = "0";
+
+    public static String REJECT_OPERATE = "1";
+
+
+
     @Override
     public List<ProcessTaskDTO> startBatch(ActWorkflowBatchDTO params) {
         List<ProcessTaskDTO> processTasks;
@@ -43,11 +48,19 @@ public class CmWorkflowServiceImpl implements ICmWorkflowService {
     }
 
     @Override
-    public ProcessTaskDTO complete(String taskId, TaskResultDTO data) {
-        ProcessTaskDTO processTaskDTO;
+    public ProcessTaskDTO completeOrReject(String taskId, TaskResultDTO data, String operate) {
+        ProcessTaskDTO processTaskDTO = null;
         try {
+            if(PASS_OPERATE.equals(operate)){
                 log.info("开始请求工作流完成任务接口:/complete/standard/{taskId},请求参数：{},{}", taskId, JSONObject.toJSONString(data));
                 processTaskDTO = Workflow.taskV2Client.completeByTaskFroStandard(taskId, data).getResult();
+            } else if(REJECT_OPERATE.equals(operate)) {
+               // todo 需要工作流适配调整后 进行切换 Workflow.taskV2Client.reject(taskId, data);
+                log.info("开始请求工作流驳回任务接口:/reject/{taskId},请求参数：{},{}", taskId, JSONObject.toJSONString(data));
+                processTaskDTO = Workflow.taskV2Client.completeByTaskFroStandard(taskId, data).getResult();
+            } else {
+                throw new RuntimeException("不支持的操作类型！");
+            }
         } catch (InnerInvokException e) {
             //拦截无审核人异常信息
             String devMessage = e.getDevMessage();

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

@@ -408,7 +408,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         HashMap<String, Object> map = new HashMap<>();
         map.put("approvalStatus", operate);
         dto.setVariable(map);
-        return cmWorkflowService.complete(jgChangeRegistrationName.getNextTaskId(), dto);
+        return cmWorkflowService.completeOrReject(jgChangeRegistrationName.getNextTaskId(), dto, operate);
     }
 
     private void convertField(JgChangeRegistrationNameDto model) {
@@ -514,7 +514,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         }
         dto.setVariable(map);
         //执行流程
-        ProcessTaskDTO processTaskDTO = cmWorkflowService.complete(taskId, dto);
+        ProcessTaskDTO processTaskDTO = cmWorkflowService.completeOrReject(taskId, dto, operate);
         // 更新下一步执行人、创建待办
         updateExecuteIds(instanceId, id, operate, processTaskDTO);
     }

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

@@ -373,7 +373,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         dto.setVariable(map);
         dto.setNextExecuteUserCompanyCode(getNextUserOrgCode(operate, jgChangeRegistrationReform));
         //执行流程
-        processTaskDTO = iCmWorkflowService.complete(taskId, dto);
+        processTaskDTO = iCmWorkflowService.completeOrReject(taskId, dto, operate);
         // 更新下一步执行人
         updateExecuteIds(instanceId, jgChangeRegistrationReform, operate, processTaskDTO);
 

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

@@ -51,8 +51,6 @@ import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.io.Resource;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.Bean;
@@ -415,7 +413,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             map.put("approvalStatus", "提交");
         }
         //执行流程
-        ProcessTaskDTO complete = icmWorkflowService.complete(taskId, dto);
+        ProcessTaskDTO complete = icmWorkflowService.completeOrReject(taskId, dto, operate);
         workflowResult = commonService.buildWorkFlowInfo(Collections.singletonList(complete)).get(0);
         // 更新下一步执行人
         this.updateExecuteIds(instanceId, transfer, operate, workflowResult);

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

 package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.map.MapUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.aspose.words.SaveFormat;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
@@ -21,8 +18,6 @@ import com.yeejoin.amos.boot.module.jg.api.mapper.*;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgChangeRegistrationUnitService;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
-import com.yeejoin.amos.boot.module.jg.biz.utils.ImageUtils;
-import com.yeejoin.amos.boot.module.jg.biz.utils.WordTemplateUtils;
 import com.yeejoin.amos.boot.module.jg.flc.api.fegin.WorkFlowFeignService;
 import com.yeejoin.amos.boot.module.ymt.api.entity.*;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
@@ -30,21 +25,16 @@ import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
-import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
-import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
 import com.yeejoin.amos.feign.workflow.Workflow;
 import com.yeejoin.amos.feign.workflow.model.*;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
-import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
-import org.typroject.tyboot.core.foundation.exception.BaseException;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
@@ -55,11 +45,8 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.IOException;
-import java.nio.file.Files;
 import java.time.LocalDate;
 import java.util.*;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -279,7 +266,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                 task.setVariable(map);
                 //执行流程
                 task.setNextExecuteUserCompanyCode(noticeDto.getReceiveOrgCode());
-                ProcessTaskDTO processTaskDTO = cmWorkflowService.complete(taskId, task);
+                ProcessTaskDTO processTaskDTO = cmWorkflowService.completeOrReject(taskId, task, operate);
                 JgChangeRegistrationUnit bean = new JgChangeRegistrationUnit();
                 BeanUtils.copyProperties(noticeDto, bean);
                 String taskCode = FlowStatusEnum.TO_BE_FINISHED.getName();
@@ -776,7 +763,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         }
         task.setVariable(map);
         //执行流程
-        ProcessTaskDTO processTaskDTO = cmWorkflowService.complete(taskId, task);
+        ProcessTaskDTO processTaskDTO = cmWorkflowService.completeOrReject(taskId, task, operate);
         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

 package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
-import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
-import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.TaskMessageDto;
@@ -24,7 +22,6 @@ import com.yeejoin.amos.boot.module.jg.api.dto.JgEnableDisableDto;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICmWorkflowService;
 import com.yeejoin.amos.boot.module.jg.flc.api.fegin.WorkFlowFeignService;
-import com.yeejoin.amos.boot.module.ymt.api.entity.RegistrationInfo;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.RegistrationInfoMapper;
@@ -44,7 +41,6 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import java.text.ParseException;
 import java.util.*;
 
 /**
@@ -135,7 +131,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
                 }
 
                 dto.setVariable(commMap);
-                ProcessTaskDTO processTaskDTO = iCmWorkflowService.complete(jgEnableDisable.getNextTaskId(), dto);
+                ProcessTaskDTO processTaskDTO = iCmWorkflowService.completeOrReject(jgEnableDisable.getNextTaskId(), dto, operate);
                 processTaskDTOS.add(processTaskDTO);
                 // 提取节点等信息
                 workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
@@ -500,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.complete(jgEnableDisable.getNextTaskId(), workDto);
+        processTaskDTO = iCmWorkflowService.completeOrReject(jgEnableDisable.getNextTaskId(), workDto, operate);
         // 提取节点等信息
         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.complete(transfer.getNextTaskId(), dto);
+                ProcessTaskDTO processTaskDTO = cmWorkflowService.completeOrReject(transfer.getNextTaskId(), dto, operate);
                 // 提取节点等信息
                 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.complete(jgEquipTransfer.getNextTaskId(), workDto);
+        ProcessTaskDTO processTaskDTO = cmWorkflowService.completeOrReject(jgEquipTransfer.getNextTaskId(), workDto, operate);
         // 提取节点等信息
         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

@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.dao.mapper.DataDictionaryMapper;
@@ -274,7 +273,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                 dto.setVariable(commMap);
                 //下一节点执行人单位（下节点接收机构code）
                 dto.setNextExecuteUserCompanyCode(notice.getReceiveOrgCreditCode());
-                processTaskDTO = iCmWorkflowService.complete(notice.getNextTaskId(), dto);
+                processTaskDTO = iCmWorkflowService.completeOrReject(notice.getNextTaskId(), dto, operate);
                 // 提取节点等信息
                 workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
                 BeanUtils.copyProperties(noticeDto, notice);
@@ -954,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.complete(jgTransferNotice.getNextTaskId(), workDto);
+        processTaskDTO = iCmWorkflowService.completeOrReject(jgTransferNotice.getNextTaskId(), workDto, operate);
         // 提取节点等信息
         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

@@ -17,7 +17,6 @@ import com.yeejoin.amos.boot.module.jg.api.dto.JgMaintainNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.TaskMessageDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.TaskModelDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.WorkflowResultDto;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgEnableDisableEq;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintainNotice;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintainNoticeEq;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
@@ -219,7 +218,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                 //下一节点执行人单位（下节点接收机构code）
                 dto.setNextExecuteUserCompanyCode(notice.getReceiveCompanyCode());
                 dto.setVariable(commMap);
-                processTaskDTO = cmWorkflowService.complete(notice.getNextTaskId(), dto);
+                processTaskDTO = cmWorkflowService.completeOrReject(notice.getNextTaskId(), dto, operate);
                 // 提取节点等信息
                 workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
                 BeanUtils.copyProperties(noticeDto, notice);
@@ -744,7 +743,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
         }
         //组装信息
         TaskResultDTO taskResultDTO = assembleData(jgMaintainNotice, op, opinion);
-        ProcessTaskDTO processTaskDTO = cmWorkflowService.complete(jgMaintainNotice.getNextTaskId(), taskResultDTO);
+        ProcessTaskDTO processTaskDTO = cmWorkflowService.completeOrReject(jgMaintainNotice.getNextTaskId(), taskResultDTO, operate);
 
         // 提取节点等信息
         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

@@ -177,7 +177,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         dto.setVariable(map);
         //下一节点执行人单位（下节点接收机构code）
         dto.setNextExecuteUserCompanyCode(getNextUserOrgCode(operate, contract));
-        ProcessTaskDTO complete = workflowService.complete(taskId, dto);
+        ProcessTaskDTO complete = workflowService.completeOrReject(taskId, dto, operate);
         // 更新下一步执行人、创建待办
         updateExecuteIds(instanceId, id, operate, complete);
     }
@@ -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.complete(contract.getNextTaskId(), dto);
+        return workflowService.completeOrReject(contract.getNextTaskId(), dto, operate);
     }
 
     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.complete(notice.getNextTaskId(), dto);
+                ProcessTaskDTO processTaskDTO = cmWorkflowService.completeOrReject(notice.getNextTaskId(), dto, operate);
                 // 提取节点等信息
                 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.complete(jgReformNotice.getNextTaskId(), workDto);
+        ProcessTaskDTO processTaskDTO = cmWorkflowService.completeOrReject(jgReformNotice.getNextTaskId(), workDto, operate);
         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

@@ -500,7 +500,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         map.put("approvalStatus", "提交");
         dto.setNextExecuteUserCompanyCode(model.getReceiveOrgCode());
         dto.setVariable(map);
-        return cmWorkflowService.complete(jgScrapCancelDto.getNextTaskId(), dto);
+        return cmWorkflowService.completeOrReject(jgScrapCancelDto.getNextTaskId(), dto, operate);
     }
 
     public Map<String, Object> queryBySequenceNbr(Long sequenceNbr) {
@@ -601,7 +601,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         // 下一节点执行人单位（下节点接收机构code）
         dto.setNextExecuteUserCompanyCode(this.getNextUserOrgCode(operate, jgScrapCancel));
         // 执行流程
-        ProcessTaskDTO processTaskDTO = cmWorkflowService.complete(taskId, dto);
+        ProcessTaskDTO processTaskDTO = cmWorkflowService.completeOrReject(taskId, dto, operate);
         // 更新下一步执行人、创建待办
         updateExecuteIds(equList, instanceId, id, operate, processTaskDTO);
     }

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

@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
@@ -15,7 +14,6 @@ import com.yeejoin.amos.boot.module.jg.api.dto.JgTransferNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.TaskMessageDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.TaskModelDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.WorkflowResultDto;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNoticeEq;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgTransferNotice;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgTransferNoticeEq;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
@@ -319,7 +317,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 }
                 dto.setVariable(commMap);
                 dto.setNextExecuteUserCompanyCode(notice.getReceiveOrgCode());
-                processTaskDTO = iCmWorkflowService.complete(notice.getNextTaskId(), dto);
+                processTaskDTO = iCmWorkflowService.completeOrReject(notice.getNextTaskId(), dto, operate);
                 // 提取节点等信息
                 workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
                 BeanUtils.copyProperties(noticeDto, notice);
@@ -804,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.complete(jgTransferNotice.getNextTaskId(), workDto);
+        processTaskDTO = iCmWorkflowService.completeOrReject(jgTransferNotice.getNextTaskId(), workDto, operate);
         // 提取节点等信息
         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/JgUseRegistrationServiceImpl.java

@@ -492,7 +492,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         } else {
             dto.setNextExecuteUserCompanyCode(jgUseRegistration.getReceiveCompanyCode());
         }
-        ProcessTaskDTO complete = cmWorkflowService.complete(jgUseRegistration.getNextTaskId(), dto);
+        ProcessTaskDTO complete = cmWorkflowService.completeOrReject(jgUseRegistration.getNextTaskId(), dto, operate);
         ArrayList<ProcessTaskDTO> processTaskDTOS = new ArrayList<>();
         processTaskDTOS.add(complete);
         List<WorkflowResultDto> resultDto = commonServiceImpl.buildWorkFlowInfo(processTaskDTOS);