Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

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

@@ -122,13 +122,19 @@ public class JgChangeRegistrationTransfer extends BaseEntity {
     /**
      * 创建人ID
      */
-    @TableField(value = "create_user_id", fill = FieldFill.INSERT_UPDATE)
+    @TableField(value = "create_user_id")
     private String createUserId;
 
     /**
+     * 创建人名称
+     */
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
      * 创建时间
      */
-	@TableField(value = "create_date", fill = FieldFill.INSERT_UPDATE)
+	@TableField(value = "create_date")
     private Date createDate;
 
     /**
@@ -198,8 +204,32 @@ public class JgChangeRegistrationTransfer extends BaseEntity {
     private String promoter;
 
     /**
+     * 使用登记证书附件
+     */
+    @TableField("use_registration_certificate")
+    private String useRegistrationCertificate;
+
+    /**
+     * 流程状态
+     */
+    @TableField("instance_status")
+    private String instanceStatus;
+
+    /**
      *工作流下一节点任务id
      */
     @TableField(value = "next_task_id")
     private String nextTaskId;
+
+    /**
+     * 创建单位名称
+     */
+    @TableField(value = "create_user_company_name")
+    private String createUserCompanyName;
+
+    /**
+     * 设备种类名称
+     */
+    @TableField(value = "equip_list_name")
+    private String equipListName;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgChangeRegistrationTransferMapper.java

@@ -5,6 +5,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationTransferDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationTransfer;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 import java.util.Map;
@@ -20,4 +21,7 @@ public interface JgChangeRegistrationTransferMapper extends BaseMapper<JgChangeR
     void updatePromoter(@Param ("id")Long id);
 
     Page<Map<String, Object>> getListPage(@Param("page")Page<Map<String, Object>> page, @Param("dto") JgChangeRegistrationTransferDto dto , @Param("roleIds") List<String> roleIds);
+
+    @Select("select name from tz_equipment_category  where code=#{code}")
+    String getEquiplistNameByEquiplist(String code);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgChangeRegistrationTransferController.java

@@ -55,7 +55,7 @@ public class JgChangeRegistrationTransferController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增移装变更登记登记", notes = "新增移装变更登记登记")
-	public ResponseModel<Boolean> save(@RequestParam(value = "submitType", required = false) String submitType,
+	public ResponseModel<Boolean> save(@RequestParam(value = "submitType") String submitType,
 									   @RequestBody JSONObject map) {
 		Map<String, Object> tableData = (Map<String, Object>) map.get(TABLE_PAGE_ID);
 		if(ValidationUtil.isEmpty(tableData)){
@@ -78,7 +78,7 @@ public class JgChangeRegistrationTransferController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PutMapping(value = "/update")
 	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新移装变更登记登记", notes = "根据sequenceNbr更新移装变更登记登记")
-	public ResponseModel<Boolean> updateBySequenceNbr(@RequestParam(value = "submitType", required = false) String submitType,
+	public ResponseModel<Boolean> updateBySequenceNbr(@RequestParam(value = "submitType") String submitType,
 													 @RequestBody JSONObject map) {
 		Map<String, Object> tableData = (Map<String, Object>) map.get(TABLE_PAGE_ID);
 		if(ValidationUtil.isEmpty(tableData)){

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

@@ -661,7 +661,7 @@ public class CommonServiceImpl implements ICommonService {
       // TaskV2Model model = result.stream().filter(e->e.getFlowCode().equals(params.get("flowCode").toString())).sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r2.getSequenceNbr())) // 按时间降序排序
       //         .findFirst()
       //         .orElse(null);
-        TaskV2Model model =  result.stream().sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r2.getSequenceNbr())) // 按时间降序排序
+        TaskV2Model model =  result.stream().sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r1.getSequenceNbr())) // 按时间降序排序
                 .findFirst()
                 .orElse(null);
         if (model == null) {

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

@@ -270,8 +270,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             resultMap.putAll(equipInfoMap);
         }
         //设备参数
-        if (equIpClassMap.containsKey("EQU_LIST") && !ValidationUtil.isEmpty(equIpClassMap.get("EQU_LIST").toString())) {
-            Map<String, Object> equipParamsMap = this.getEquipParamsMap(record, "CamelCase", equIpClassMap.get("EQU_LIST").toString());
+        if (equIpClassMap.containsKey("equList") && !ValidationUtil.isEmpty(equIpClassMap.get("equList").toString())) {
+            Map<String, Object> equipParamsMap = this.getEquipParamsMap(record, "CamelCase", equIpClassMap.get("equList").toString());
             if (!ValidationUtil.isEmpty(equipParamsMap)) {
                 resultMap.putAll(equipParamsMap);
             }

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

@@ -31,7 +31,6 @@ import com.yeejoin.amos.boot.module.ymt.flc.api.feign.AccessFeignService;
 import com.yeejoin.amos.boot.module.ymt.flc.api.mapper.RegUnitInfoMapper;
 import com.yeejoin.amos.component.feign.config.InnerInvokException;
 import com.yeejoin.amos.feign.privilege.Privilege;
-import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
 import com.yeejoin.amos.feign.workflow.model.*;
 import org.springframework.beans.BeanUtils;
@@ -297,7 +296,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
                 jgChangeRegistrationName.setNextExecutorIds(String.join(",", roleListNext));
                 jgChangeRegistrationName.setAuditStatus(String.valueOf(WorkFlowStatusEnum.UNIT_RENAME_RECEIVE.getPass()));
                 jgChangeRegistrationName.setNextTaskId(nextTaskId);
-                executeOneStep(jgChangeRegistrationName, taskName, nextUserIds);
+                executeOneStep(jgChangeRegistrationName, taskName, nextUserIds, op);
             }
             BeanUtils.copyProperties(jgChangeRegistrationNameDto, jgChangeRegistrationName);
 
@@ -310,9 +309,9 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         return jgChangeRegistrationNameDto;
     }
 
-    private void executeOneStep(JgChangeRegistrationName jgChangeRegistrationName, String taskName, String nextUserIds) {
+    private void executeOneStep(JgChangeRegistrationName jgChangeRegistrationName, String taskName, String nextUserIds, String operate) {
         // 先更新之前的待办
-        TaskV2Model taskV2Model = updateTaskModel(jgChangeRegistrationName);
+        TaskV2Model taskV2Model = updateTaskModel(jgChangeRegistrationName, operate);
         // 再插入新代办、数据待定
         taskV2Model.setTaskName(taskName);
         taskV2Model.setExecuteUserIds(nextUserIds);
@@ -384,8 +383,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         jgChangeRegistrationName.setNextTaskId(nextTaskId);
         this.update(jgChangeRegistrationName, lambda);
         // 删除待办
-        commonService.deleteTaskModel(jgChangeRegistrationName.getInstanceId());
-        commonService.rollbackTask(jgChangeRegistrationName.getInstanceId());
+        commonService.rollbackTask(instanceId);
     }
 
 
@@ -449,25 +447,39 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
                 jgChangeRegistrationName.setPromoter(null);
             }
             // 更新上一步待办、创建待办
-            executeOneStep(jgChangeRegistrationName, taskName, nextUserIds);
+            executeOneStep(jgChangeRegistrationName, taskName, nextUserIds, operate);
         } else {
             jgChangeRegistrationName.setAuditStatus(FlowStatusEnum.TO_BE_FINISHED.getName());
             jgChangeRegistrationName.setAuditPassDate(new Date());
             // 修改业务信息
             updateInfoOther(jgChangeRegistrationName);
-            updateTaskModel(jgChangeRegistrationName);
+            // 更新代办
+            updateTaskModel(jgChangeRegistrationName, operate);
         }
         this.getBaseMapper().updateById(jgChangeRegistrationName);
     }
 
-    private TaskV2Model updateTaskModel(JgChangeRegistrationName jgChangeRegistrationName) {
+    private TaskV2Model updateTaskModel(JgChangeRegistrationName jgChangeRegistrationName, String operate) {
         Map<String, Object> params = new HashMap<>();
+        FlowStatusEnum flowStatusEnum = this.getTaskStatus(operate);
         params.put("relationId",jgChangeRegistrationName.getInstanceId());
-        params.put("taskStatus",this.getTaskStatusByName(jgChangeRegistrationName.getAuditStatus()));
-        params.put("taskStatusLabel",jgChangeRegistrationName.getAuditStatus());
+        params.put("taskStatus", flowStatusEnum.getCode());
+        params.put("taskStatusLabel", flowStatusEnum.getName());
+        params.put("flowStatus",this.getTaskStatusByName(jgChangeRegistrationName.getAuditStatus()));
+        params.put("flowStatusLabel",jgChangeRegistrationName.getAuditStatus());
         return commonService.updateTaskModel(params);
     }
 
+
+    private FlowStatusEnum getTaskStatus(String operate) {
+        if("0".equals(operate)){
+            return FlowStatusEnum.TO_BE_FINISHED;
+        } else {
+            return FlowStatusEnum.REJECTED;
+        }
+    }
+
+
     private Integer getTaskStatusByName(String auditStatus) {
         return commonService.getDictionaryCodeByName(auditStatus);
     }

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

@@ -9,9 +9,13 @@ import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 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.TaskModelDto;
+import com.yeejoin.amos.boot.module.jg.api.dto.WorkflowResultDto;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationReform;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationTransfer;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationTransferEq;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgRegistrationHistory;
+import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.EquipTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.UseStatusEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.WorkFlowStatusEnum;
@@ -26,6 +30,7 @@ import com.yeejoin.amos.boot.module.jg.api.service.IJgChangeRegistrationTransfer
 import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationTransferDto;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgRegistrationHistoryService;
 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.biz.service.ICommonService;
 import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgUseInfoService;
 import com.yeejoin.amos.boot.module.jg.flc.api.fegin.WorkFlowFeignService;
@@ -38,10 +43,12 @@ import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgOtherInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgRegisterInfoMapper;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
 import com.yeejoin.amos.feign.workflow.Workflow;
-import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
-import com.yeejoin.amos.feign.workflow.model.AjaxResult;
-import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
+import com.yeejoin.amos.feign.workflow.model.*;
+import fr.opensagres.xdocreport.core.io.IOUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
@@ -50,8 +57,12 @@ import org.elasticsearch.client.RestHighLevelClient;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 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.springframework.util.StringUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
@@ -62,18 +73,15 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletResponse;
-import java.io.File;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.alibaba.fastjson.JSON.parseArray;
+import static com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum.JG_CHANGE_REGISTRATION;
+
 /**
  * 移装变更登记登记服务实现类
  *
@@ -131,11 +139,18 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
     private IdxBizJgRegisterInfoMapper idxBizJgRegisterInfoMapper;
 
     @Autowired
-    ICommonService commonService;
+    ICommonService iCommonService;
 
     @Autowired
     TzsServiceFeignClient tzsServiceFeignClient;
 
+    @Autowired
+    ICmWorkflowService icmWorkflowService;
+    @Autowired
+    CommonServiceImpl commonService;
+    @Value("classpath:/json/urlInfo.json")
+    private Resource bizTypeInfo;
+
     /**
      * 新增移装变更登记
      *
@@ -146,11 +161,11 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
     public boolean createTransfer(String submitType, JSONObject map, ReginParams reginParams) {
 
         Map<String, Object> tableData = (Map<String, Object>) map.get(TABLE_PAGE_ID);
-        if(ValidationUtil.isEmpty(tableData)){
+        if (ValidationUtil.isEmpty(tableData)) {
             throw new BadRequest("参数校验失败.");
         }
         String equIds = (String) tableData.get("record");
-        if(ValidationUtil.isEmpty(equIds)){
+        if (ValidationUtil.isEmpty(equIds)) {
             throw new BadRequest("参数校验失败.");
         }
         CompanyBo company = reginParams.getCompany();
@@ -207,7 +222,8 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
         oldTransfer.setUseUnitName(company.getCompanyName());
         //录入单位统一信用代码
         oldTransfer.setInputUnitNo(company.getCompanyCode());
-
+        // 创建人ID
+        oldTransfer.setCreateUserId(reginParams.getUserModel().getUserId());
 
         //登记机构代码
         //登记机构公司代码
@@ -298,21 +314,25 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             if (map.containsKey("instanceId")) {
                 instanceId = map.get("instanceId").toString();
             } else {
-                // 启动并执行流程
-                instanceId = startByVariable();
-                this.updateExecuteIds(instanceId, oldTransfer.getSequenceNbr(), "0");
+                // 如果是新启动的流程开启自动访问
+                String equipListName = this.getBaseMapper().getEquiplistNameByEquiplist(Optional.ofNullable(map.get("equList").toString()).orElse(" "));
+                oldTransfer.setEquipListName(equipListName);
+                oldTransfer.setCreateUserId(reginParams.getUserModel().getUserId());
+                oldTransfer.setCreateUserName(reginParams.getUserModel().getRealName());
+                oldTransfer.setCreateUserCompanyName(reginParams.getCompany().getCompanyName());
+                //启动流程
+                WorkflowResultDto workflowResult = this.startWorkFlork();
+
+                this.updateExecuteIds(instanceId, oldTransfer, "startWorkfow", workflowResult);
+                //生成代办
+                this.createToDoTask(Arrays.asList(workflowResult), oldTransfer, reginParams.getUserModel().getUserName());
             }
 
             if (!ObjectUtils.isEmpty(instanceId)) {
                 // 修改数据信息
-                this.updateExecuteIds(instanceId, oldTransfer.getSequenceNbr(), "0");
-                // 默认执行流程
-                String status = oldTransfer.getStatus();
-                String operate = "0";
-                if(ValidationUtil.equals(status,WorkFlowStatusEnum.TRANSFER_SUBMIT.getRollBack()) || ValidationUtil.equals(status,WorkFlowStatusEnum.TRANSFER_SUBMIT.getReject())){
-                    operate="提交";
-                }
-                this.flowExecute(oldTransfer.getSequenceNbr(), instanceId, operate, "", false);
+//                this.updateExecuteIds(oldTransfer.getSequenceNbr(), "0");
+
+                this.flowExecute(oldTransfer.getSequenceNbr(), instanceId, "0", "", false);
             }
         }
         return true;
@@ -338,26 +358,29 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
      * @param update
      */
     public void flowExecute(Long id, String instanceId, String operate, String comment, boolean update) {
+        WorkflowResultDto workflowResult = new WorkflowResultDto();
+        JgChangeRegistrationTransfer transfer = this.getById(id);
         try {
-            JSONObject task = workFlowFeginService.getTaskNoAuth(instanceId);
-            JSONObject taskMessage = JSON.parseObject(JSON.toJSONString(task.get("data")));
-            String taskId = taskMessage.getString("id");
             //组装信息
             TaskResultDTO dto = new TaskResultDTO();
             dto.setResultCode("approvalStatus");
-            dto.setTaskId(taskId);
+            dto.setTaskId(transfer.getNextTaskId());
             dto.setComment(comment);
             HashMap<String, Object> map = new HashMap<>();
             map.put("approvalStatus", operate);
             dto.setVariable(map);
+            if (!ObjectUtils.isEmpty(transfer) && (transfer.getStatus().equals(WorkFlowStatusEnum.TRANSFER_SUBMIT.getRollBack()) || transfer.getStatus().equals(WorkFlowStatusEnum.TRANSFER_SUBMIT.getReject()))) {
+                map.put("approvalStatus", "提交");
+            }
             //执行流程
-            Workflow.taskClient.completeByTask(taskId, dto);
+            ProcessTaskDTO complete = icmWorkflowService.complete(instanceId, dto);
+            workflowResult = commonService.buildWorkFlowInfo(Collections.singletonList(complete)).get(0);
+
         } catch (Exception e) {
             e.printStackTrace();
         }
         // 更新下一步执行人
-        this.updateExecuteIds(instanceId, id, operate);
-
+        this.updateExecuteIds(instanceId, transfer, operate, workflowResult);
     }
 
     /**
@@ -367,40 +390,24 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
      */
     public void revocation(String instanceId) {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
-        String taskCode = "";
+
         JgChangeRegistrationTransfer jgTransfer = new JgChangeRegistrationTransfer();
         LambdaQueryWrapper<JgChangeRegistrationTransfer> lambda = new QueryWrapper<JgChangeRegistrationTransfer>().lambda();
         lambda.eq(JgChangeRegistrationTransfer::getInstanceId, instanceId);
-        ArrayList<String> roleList = new ArrayList<>();
-        try {
-            workFlowFeginService.rollBack(instanceId);
-            JSONObject taskNoAuth = workFlowFeginService.getTaskNoAuth(instanceId);
-            JSONObject nextTask = JSON.parseObject(JSON.toJSONString(taskNoAuth.get("data")));
-
-            if (!ObjectUtils.isEmpty(taskNoAuth.get("data"))) {
-                String nextTaskId = nextTask.getString("id");
-                FeignClientResult<JSONObject> nodeInfo = workFlowFeginService.getNodeInfo(nextTaskId);
-                JSONObject result = nodeInfo.getResult();
-                Map<String, Object> taskInfo = (Map<String, Object>) result.get("taskInfo");
-                taskCode = String.valueOf(taskInfo.get("taskDefinitionKey"));
-                AjaxResult taskGroupName = Workflow.taskClient.getTaskGroupName(nextTaskId);
-                JSONArray data = JSON.parseArray(JSON.toJSONString(taskGroupName.get("data")));
-                for (Object datum : data) {
-                    if (((Map<?, ?>) datum).containsKey("groupId")) {
-                        roleList.add(((Map<?, ?>) datum).get("groupId").toString());
-                    }
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+
+        ProcessTaskDTO processTask = icmWorkflowService.rollBack(instanceId);
+        WorkflowResultDto workflowResult = commonService.buildWorkFlowInfo(Collections.singletonList(processTask)).get(0);
+        String taskCode = Optional.ofNullable(workflowResult.getNextTaskCode()).orElse("");
+        String role = Optional.ofNullable(workflowResult.getNextExecutorRoleIds()).orElse("");
         if (!ObjectUtils.isEmpty(taskCode)) {
+            jgTransfer.setAuditStatus(WorkFlowStatusEnum.getMessage(taskCode).getRollBack());
             jgTransfer.setStatus(WorkFlowStatusEnum.getMessage(taskCode).getRollBack());
         }
-        String join = String.join(",", roleList);
-        jgTransfer.setPromoter("");
-        jgTransfer.setNextExecutorIds(join);
+        jgTransfer.setPromoter(reginParams.getUserModel().getUserId());
+        jgTransfer.setNextExecutorIds(role);
         this.update(jgTransfer, lambda);
+        //待办 撤回
+        commonService.rollbackTask(instanceId);
     }
 
 
@@ -537,7 +544,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             resultDataMap.put("receiveOrgCode", transferById.getReceiveOrgCode() + "_" + transferById.getReceiveOrgName());
         }
         //查询设备详情
-        if(!ValidationUtil.isEmpty(record)){
+        if (!ValidationUtil.isEmpty(record)) {
             Map<String, Object> equipDetailMap = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(record);
             resultDataMap.putAll(equipDetailMap);
         }
@@ -556,13 +563,13 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
      */
     public Page<Map<String, Object>> queryListForPage(Page<Map<String, Object>> page, JgChangeRegistrationTransferDto params) {
         Page<Map<String, Object>> listPage = this.baseMapper.getListPage(page, params, params.getRoleIds());
-        listPage.getRecords().stream().forEach(item->{
+        listPage.getRecords().stream().forEach(item -> {
             // 流程未走完时，移装地址需从 历史表中获取
             if (item.containsKey("status") && !FlowStatusEnum.TO_BE_FINISHED.getName().equals(item.get("status").toString())) {
                 String fullAddress = "";
-                if(item.containsKey("equipId") && item.containsKey("applyNo")){
+                if (item.containsKey("equipId") && item.containsKey("applyNo")) {
                     JgRegistrationHistory history = jgRegistrationHistoryService.getDteailByRecord(item.get("equipId").toString(), item.get("applyNo").toString());
-                    if(!ValidationUtil.isEmpty(history)){
+                    if (!ValidationUtil.isEmpty(history)) {
                         JSONObject newPosition = JSON.parseObject(history.getChangeData());
                         String province = newPosition.getString("province");
                         String city = newPosition.getString("city");
@@ -606,80 +613,91 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
         return listPage;
     }
 
-    //启动流程
-    public String startByVariable() {
-        String instanceId = "";
-        //启动流程
-        try {
-            ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
-            dto.setProcessDefinitionKey(PROCESS_DEFINITION_KEY);
-            dto.setBusinessKey("submit");
-            AjaxResult ajaxResult = Workflow.taskClient.startByVariable(dto);
-            instanceId = ((Map) ajaxResult.get("data")).get("id").toString();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return instanceId;
-    }
 
-    public void updateExecuteIds(String instanceId, Long sequenceNbr, String operate) {
+    public void updateExecuteIds(String instanceId, JgChangeRegistrationTransfer jgChangeRegistrationTransfer, String operate, WorkflowResultDto workflowResult) {
+        Boolean updateTodoAndCreate = Boolean.TRUE;
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
-        String role = "";
+
         String taskCode = FlowStatusEnum.TO_BE_FINISHED.getName();
-        ArrayList<String> roleList = new ArrayList<>();
-        JgChangeRegistrationTransfer jgChangeRegistrationTransfer = this.getBaseMapper().selectById(sequenceNbr);
-        try {
-            // 查询下节点任务
-            JSONObject taskNoAuth = workFlowFeginService.getTaskNoAuth(instanceId);
-            if (!ObjectUtils.isEmpty(taskNoAuth.get("data"))) {
-                JSONObject nextTask = JSON.parseObject(JSON.toJSONString(taskNoAuth.get("data")));
-                String nextTaskId = nextTask.getString("id");
-                FeignClientResult<JSONObject> nodeInfo = workFlowFeginService.getNodeInfo(nextTaskId);
-                JSONObject result = nodeInfo.getResult();
-                Map<String, Object> taskInfo = (Map<String, Object>) result.get("taskInfo");
-                taskCode = String.valueOf(taskInfo.get("taskDefinitionKey"));
-                AjaxResult taskGroupName = Workflow.taskClient.getTaskGroupName(nextTaskId);
-                JSONArray data = JSON.parseArray(JSON.toJSONString(taskGroupName.get("data")));
-                for (Object datum : data) {
-                    if (((Map) datum).containsKey("groupId")) {
-                        roleList.add(((Map) datum).get("groupId").toString());
-                    }
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
+        if (!ObjectUtils.isEmpty(workflowResult.getNextTaskCode())) {
+            taskCode = Optional.ofNullable(workflowResult.getNextTaskCode()).orElse("");
         }
+        String role = Optional.ofNullable(workflowResult.getNextExecutorRoleIds()).orElse("");
+
+        if (operate.equals("startWorkfow")) {
+            role = Optional.ofNullable(workflowResult.getExecutorRoleIds()).orElse("") + "," + Optional.ofNullable(workflowResult.getNextExecutorRoleIds()).orElse("");
+            operate = "0";
+            instanceId = workflowResult.getInstanceId();
+            updateTodoAndCreate = Boolean.FALSE;
+        }
+
         if (!FlowStatusEnum.TO_BE_FINISHED.getName().equals(taskCode)) {
-            role = String.join(",", roleList);
-            jgChangeRegistrationTransfer.setNextExecutorIds(role);
 
             jgChangeRegistrationTransfer.setInstanceId(instanceId);
-            if (!ObjectUtils.isEmpty(jgChangeRegistrationTransfer.getExecuteSequence())) {
-                jgChangeRegistrationTransfer.setExecuteSequence(jgChangeRegistrationTransfer.getExecuteSequence() + "," + role);
+            jgChangeRegistrationTransfer.setNextTaskId(workflowResult.getNextTaskId());
+            jgChangeRegistrationTransfer.setNextExecutorIds(role);
+
+            if (!ObjectUtils.isEmpty(jgChangeRegistrationTransfer.getInstanceStatus())) {
+                jgChangeRegistrationTransfer.setInstanceStatus(jgChangeRegistrationTransfer.getInstanceStatus() + "," + role);
             } else {
-                jgChangeRegistrationTransfer.setExecuteSequence(role);
+                jgChangeRegistrationTransfer.setInstanceStatus(role);
             }
-            jgChangeRegistrationTransfer.setAuditStatus(WorkFlowStatusEnum.getMessage(taskCode).getPass());
-            jgChangeRegistrationTransfer.setStatus(WorkFlowStatusEnum.getMessage(taskCode).getPass());
+
+//            if (!ObjectUtils.isEmpty(jgChangeRegistrationTransfer.getExecuteSequence())) {
+//                jgChangeRegistrationTransfer.setExecuteSequence(jgChangeRegistrationTransfer.getExecuteSequence() + "," + role);
+//
+//            } else {
+//                jgChangeRegistrationTransfer.setExecuteSequence(role);
+//            }
+
             if ("0".equals(operate)) {
                 // 通过操作
                 jgChangeRegistrationTransfer.setPromoter(reginParams.getUserModel().getUserId());
+                jgChangeRegistrationTransfer.setAuditStatus(WorkFlowStatusEnum.getMessage(taskCode).getPass());
+                jgChangeRegistrationTransfer.setStatus(WorkFlowStatusEnum.getMessage(taskCode).getPass());
             } else {
                 // 驳回操作
+                jgChangeRegistrationTransfer.setAuditStatus(WorkFlowStatusEnum.getMessage(taskCode).getReject());
+                jgChangeRegistrationTransfer.setStatus(WorkFlowStatusEnum.getMessage(taskCode).getReject());
                 jgChangeRegistrationTransfer.setPromoter("");
             }
 
+            if (updateTodoAndCreate) {
+                // 上个代办改为已办
+                HashMap<String, Object> map = new HashMap<>();
+                map.put("taskStatus", commonService.getDictionaryCodeByName(jgChangeRegistrationTransfer.getStatus()));
+                map.put("taskStatusLabel", jgChangeRegistrationTransfer.getStatus());
+                map.put("relationId", jgChangeRegistrationTransfer.getInstanceId());
+                TaskV2Model taskV2Model = commonService.updateTaskModel(map);
+                TaskModelDto taskModelDto = new TaskModelDto();
+                BeanUtils.copyProperties(taskV2Model, taskModelDto);
+                // 创建新的代办
+                taskModelDto.setModel(jgChangeRegistrationTransfer);
+                taskModelDto.setTaskName(workflowResult.getNextTaskName());
+                taskModelDto.setExecuteUserIds(workflowResult.getNextExecutorUserIds());
+                taskModelDto.setTaskStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode());
+                taskModelDto.setTaskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
+                taskModelDto.setNextExecuteUser(workflowResult.getNextExecutorRoleIds());
+                commonService.buildTaskModel(Collections.singletonList(taskModelDto));
+            }
+
         } else {
-            jgChangeRegistrationTransfer.setAuditStatus(taskCode);
-            jgChangeRegistrationTransfer.setStatus(taskCode);
+            jgChangeRegistrationTransfer.setAuditPassDate(new Date());
+            jgChangeRegistrationTransfer.setAuditStatus(FlowStatusEnum.TO_BE_FINISHED.getName());
+            jgChangeRegistrationTransfer.setStatus(FlowStatusEnum.TO_BE_FINISHED.getName());
             //流程执行完成后，更新设备使用信息
-            this.updateByFlowEnd(sequenceNbr.toString(), jgChangeRegistrationTransfer.getSupervisoryCode());
+            this.updateByFlowEnd(jgChangeRegistrationTransfer.getSequenceNbr().toString(), jgChangeRegistrationTransfer.getSupervisoryCode());
+            HashMap<String, Object> map = new HashMap<>();
+            map.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
+            map.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
+            map.put("relationId", jgChangeRegistrationTransfer.getInstanceId());
+            TaskV2Model taskV2Model = commonService.updateTaskModel(map);
+
         }
         this.getBaseMapper().updateById(jgChangeRegistrationTransfer);
 
     }
 
-
     /**
      * 流程结束后需要更新的数据
      *
@@ -861,22 +879,22 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
         exportParamsMap.put("isInvalid", transferEq.getIsInvalid());
         JgRegistrationHistory transferHistory = jgRegistrationHistoryService.getDteailByRecord(transferEq.getEquId(), transfer.getApplyNo());
         //登记机关
-        if(ValidationUtil.isEmpty(transfer.getReceiveOrgName())){
+        if (ValidationUtil.isEmpty(transfer.getReceiveOrgName())) {
             throw new BadRequest("使用登记证导出失败,登记机关为空!");
         }
         exportParamsMap.put("receiveOrgName", transfer.getReceiveOrgName());
         //使用登记证编号
-        if(ValidationUtil.isEmpty(transfer.getUseRegistrationCode())){
+        if (ValidationUtil.isEmpty(transfer.getUseRegistrationCode())) {
             throw new BadRequest("使用登记证导出失败,使用登记证编号为空!");
         }
         exportParamsMap.put("useRegistrationCode", transfer.getUseRegistrationCode());
         //使用单位名称
-        if(ValidationUtil.isEmpty(transfer.getUseUnitName())){
+        if (ValidationUtil.isEmpty(transfer.getUseUnitName())) {
             throw new BadRequest("使用登记证导出失败,使用单位名称为空!");
         }
         exportParamsMap.put("useUnitName", transfer.getUseUnitName());
         //监管码
-        if(ValidationUtil.isEmpty(transfer.getSupervisoryCode())){
+        if (ValidationUtil.isEmpty(transfer.getSupervisoryCode())) {
             throw new BadRequest("使用登记证导出失败,监管码为空!");
         }
         exportParamsMap.put("supervisoryCode", transfer.getSupervisoryCode());
@@ -886,8 +904,8 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
         exportParamsMap.put("giveOutMonth", today.getMonthValue());
         exportParamsMap.put("giveOutDay", today.getDayOfMonth());
         //设备使用地址
-        if(!ValidationUtil.isEmpty(transferHistory)){
-            String fullAddress="";
+        if (!ValidationUtil.isEmpty(transferHistory)) {
+            String fullAddress = "";
             JSONObject newPosition = JSON.parseObject(transferHistory.getChangeData());
             String province = newPosition.getString("province");
             String city = newPosition.getString("city");
@@ -923,7 +941,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             if (!ObjectUtils.isEmpty(address)) {
                 fullAddress += address;
             }
-            if(ValidationUtil.isEmpty(fullAddress)){
+            if (ValidationUtil.isEmpty(fullAddress)) {
                 throw new BadRequest("使用登记证导出失败,设备使用地址为空!");
             }
             exportParamsMap.put("fullAddress", fullAddress);
@@ -931,34 +949,34 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
 
         //查询设备注册信息
         IdxBizJgRegisterInfo registerInfo = idxBizJgRegisterInfoService.getOne(new QueryWrapper<IdxBizJgRegisterInfo>().eq("RECORD", transferEq.getEquId()));
-        if(!ValidationUtil.isEmpty(registerInfo)){
+        if (!ValidationUtil.isEmpty(registerInfo)) {
             //设备种类、类别、品种
             String equList = registerInfo.getEquList();//设备种类
             String equCategory = registerInfo.getEquCategory();//设备类别
             String equDefine = registerInfo.getEquDefine();//设备品种
-            List<EquipmentCategory> categoryList0 = commonService.getEquipmentCategoryList(equList, null);
-            List<EquipmentCategory> categoryList1 = commonService.getEquipmentCategoryList(equCategory, null);
-            List<EquipmentCategory> categoryList2 = commonService.getEquipmentCategoryList(equDefine, null);
+            List<EquipmentCategory> categoryList0 = iCommonService.getEquipmentCategoryList(equList, null);
+            List<EquipmentCategory> categoryList1 = iCommonService.getEquipmentCategoryList(equCategory, null);
+            List<EquipmentCategory> categoryList2 = iCommonService.getEquipmentCategoryList(equDefine, null);
             if (CollectionUtils.isNotEmpty(categoryList0)) {
-                if(ValidationUtil.isEmpty(categoryList0.get(0).getName())){
+                if (ValidationUtil.isEmpty(categoryList0.get(0).getName())) {
                     throw new BadRequest("使用登记证导出失败,设备种类为空!");
                 }
                 exportParamsMap.put("equList", categoryList0.get(0).getName());
             }
             if (CollectionUtils.isNotEmpty(categoryList1)) {
-                if(ValidationUtil.isEmpty(categoryList1.get(0).getName())){
+                if (ValidationUtil.isEmpty(categoryList1.get(0).getName())) {
                     throw new BadRequest("使用登记证导出失败,设备类别为空!");
                 }
                 exportParamsMap.put("equCategory", categoryList1.get(0).getName());
             }
             if (CollectionUtils.isNotEmpty(categoryList2)) {
-                if(ValidationUtil.isEmpty(categoryList2.get(0).getName())){
+                if (ValidationUtil.isEmpty(categoryList2.get(0).getName())) {
                     throw new BadRequest("使用登记证导出失败,设备品种为空!");
                 }
                 exportParamsMap.put("equDefine", categoryList2.get(0).getName());
             }
             //设备代码
-            if(ValidationUtil.isEmpty(registerInfo.getEquCode())){
+            if (ValidationUtil.isEmpty(registerInfo.getEquCode())) {
                 throw new BadRequest("使用登记证导出失败,设备代码为空!");
             }
             exportParamsMap.put("equCode", registerInfo.getEquCode());
@@ -966,21 +984,106 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
 
         //单位内部编码
         IdxBizJgUseInfo useInfo = idxBizJgUseInfoService.getOneData(transferEq.getEquId());
-        if(!ValidationUtil.isEmpty(useInfo)){
-            if(ValidationUtil.isEmpty(useInfo.getUseInnerCode())){
+        if (!ValidationUtil.isEmpty(useInfo)) {
+            if (ValidationUtil.isEmpty(useInfo.getUseInnerCode())) {
                 throw new BadRequest("使用登记证导出失败,设备单位内部编码为空!");
             }
             exportParamsMap.put("useInnerCode", useInfo.getUseInnerCode());
         }
         IdxBizJgFactoryInfo factoryInfo = idxBizJgFactoryInfoService.getOneData(transferEq.getEquId());
         //产品编号(出厂编号)
-        if(!ValidationUtil.isEmpty(factoryInfo)){
-            if(ValidationUtil.isEmpty(factoryInfo.getFactoryNum())){
+        if (!ValidationUtil.isEmpty(factoryInfo)) {
+            if (ValidationUtil.isEmpty(factoryInfo.getFactoryNum())) {
                 throw new BadRequest("使用登记证导出失败,产品编号为空!");
             }
             exportParamsMap.put("factoryNum", factoryInfo.getFactoryNum());
         }
         //调用生成使用登记证
-        commonService.generateCertificateReport(exportParamsMap, response);
+        iCommonService.generateCertificateReport(exportParamsMap, response);
+    }
+
+
+    /**
+     * 启动工作流
+     */
+    private WorkflowResultDto startWorkFlork() {
+        try {
+            ActWorkflowBatchDTO workflowBatchParams = new ActWorkflowBatchDTO();
+            List<ActWorkflowStartDTO> workflowList = new ArrayList<>();
+            ActWorkflowStartDTO workflow = new ActWorkflowStartDTO();
+            workflow.setProcessDefinitionKey(PROCESS_DEFINITION_KEY);
+            workflow.setBusinessKey("submit");
+            workflow.setCompleteFirstTask(Boolean.TRUE);
+            workflowList.add(workflow);
+            workflowBatchParams.setProcess(workflowList);
+            List<ProcessTaskDTO> processTasks = icmWorkflowService.startBatch(workflowBatchParams);
+            // 组装工作流返回的数据
+            return commonService.buildWorkFlowInfo(processTasks).get(0);
+        } catch (Exception e) {
+            log.error("提交失败：{}", e);
+            throw new BadRequest("提交失败" + e.getMessage());
+        }
+    }
+
+    /**
+     * 新增代办任务
+     */
+    private void createToDoTask(List<WorkflowResultDto> sorkflows, JgChangeRegistrationTransfer transfer, String userName) {
+        if (!ValidationUtil.isEmpty(sorkflows)) {
+            List<TaskModelDto> toDoTasklist = new ArrayList<>();
+            for (WorkflowResultDto sorkflow : sorkflows) {
+                TaskModelDto toDoTask = new TaskModelDto();
+                toDoTask.setTaskName(sorkflow.getTaskName());
+                toDoTask.setFlowCreateDate(transfer.getCreateDate());
+                toDoTask.setTaskCode(transfer.getApplyNo());
+                toDoTask.setTaskContent(this.getSummaryInfo(transfer));
+//                toDoTask.setTaskDesc();
+                toDoTask.setTaskType(BusinessTypeEnum.JG_CHANGE_REGISTRATION.getCode());
+                toDoTask.setTaskTypeLabel(BusinessTypeEnum.JG_CHANGE_REGISTRATION.getName());
+                toDoTask.setRelationId(transfer.getInstanceId());
+                toDoTask.setExecuteUserIds(sorkflow.getNextExecutorUserIds());
+                toDoTask.setTaskStatus(commonService.getDictionaryCodeByName(transfer.getStatus()));
+                toDoTask.setTaskStatusLabel(transfer.getStatus());
+                String url = this.getUrl(JG_CHANGE_REGISTRATION.getCode(), "look");
+                String format = String.format(url, transfer.getSequenceNbr(), transfer.getNextExecutorIds(), transfer.getNextExecutorIds(),
+                        transfer.getAuditStatus(), transfer.getInstanceId());
+                toDoTask.setRoutePath(format);
+                toDoTask.setModel(transfer);
+                toDoTask.setStartUserId(transfer.getCreateUserId());
+                toDoTask.setStartUser(transfer.getCreateUserName());
+                toDoTask.setStartUserCompanyName(transfer.getCreateUserCompanyName());
+                toDoTask.setStartDate(new Date());
+                toDoTasklist.add(toDoTask);
+            }
+            commonService.buildTaskModel(toDoTasklist);
+        }
+    }
+
+    //获取流程跳转页面的url
+    private String getUrl(String type, String pageType) {
+        String json = null;
+        try {
+            json = IOUtils.toString(bizTypeInfo.getInputStream(), java.lang.String.valueOf(StandardCharsets.UTF_8));
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        List<Map> list = parseArray(json, Map.class);
+        String url = null;
+        for (Map map : list) {
+            if (map.get("type").equals(type) && pageType.equals(map.get("pageType"))) {
+                url = map.get("url").toString();
+                break;
+            }
+        }
+        return url;
+    }
+
+    /**
+     * @return String
+     * @deprecated 动态获取
+     */
+    public String getSummaryInfo(JgChangeRegistrationTransfer transfer) {
+        String result = "来自%s【%s】的业务办理，【申请单号：%s】";
+        return String.format(result, transfer.getEquipListName(), transfer.getSupervisoryCode(), transfer.getApplyNo());
     }
 }
\ No newline at end of file

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

@@ -36,6 +36,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
@@ -81,8 +82,10 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
      */
     public Page<JgMaintenanceContractVo> queryForPage(Page<JgMaintenanceContract> page, int phase,
                                                       Map<String, Object> map, ReginParams reginParams) {
-        JgMaintenanceContractDto dto = JSON.parseObject(JSON.toJSONString(map.get("jgMaintenanceContractDto")), JgMaintenanceContractDto.class);
-
+        JgMaintenanceContractDto dto = new JgMaintenanceContractDto();
+        if(map.containsKey("jgMaintenanceContractDto")){
+            dto = JSON.parseObject(JSON.toJSONString(map.get("jgMaintenanceContractDto")), JgMaintenanceContractDto.class);
+        }
         Page<JgMaintenanceContractDto> contractList = new Page<>();
         Page<JgMaintenanceContractVo> result = new Page<>();
         CompanyBo company = reginParams.getCompany();
@@ -213,8 +216,6 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         JgMaintenanceContractDto contractDto = JSON.parseObject(JSON.toJSONString(map), JgMaintenanceContractDto.class);
         List<Map<String, Object>> equipmentLists = (List<Map<String, Object>>) map.get("equipmentLists");
         CompanyBo company = reginParams.getCompany();
-//        JgMaintenanceContract contract = new JgMaintenanceContract();
-//        BeanUtils.copyProperties(contractDto, contract);
         contractDto.setCreateDate(new Date());
         contractDto.setPromoter(reginParams.getUserModel().getUserId());
         //获取维保备案编号
@@ -228,46 +229,61 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         contractDto.setUseUnitCode(company.getCompanyCode());
         contractDto.setUseUnitName(company.getCompanyName());
         //管理员信息
-        String[] MaintenanceManager = contractDto.getMaintenanceManagerId().split("_");
-        contractDto.setMaintenanceManagerId(MaintenanceManager[0]);
-        contractDto.setMaintenanceManagerName(MaintenanceManager[1]);
+        if (!StringUtils.isEmpty(contractDto.getMaintenanceManagerId())) {
+            String[] MaintenanceManager = contractDto.getMaintenanceManagerId().split("_");
+            contractDto.setMaintenanceManagerId(MaintenanceManager[0]);
+            contractDto.setMaintenanceManagerName(MaintenanceManager[1]);
+        }
         //接收机构信息
-        String[] splitReceiveOrgCode = contractDto.getReceiveOrgCode().split("_");
-        contractDto.setReceiveOrgCode(splitReceiveOrgCode[0]);
-        contractDto.setReceiveOrgName(splitReceiveOrgCode[1]);
+        if (!StringUtils.isEmpty(contractDto.getReceiveOrgCode())) {
+            String[] splitReceiveOrgCode = contractDto.getReceiveOrgCode().split("_");
+            contractDto.setReceiveOrgCode(splitReceiveOrgCode[0]);
+            contractDto.setReceiveOrgName(splitReceiveOrgCode[1]);
+        }
         //维保单位信息
-        String[] splitMaintenanceUnitCode = contractDto.getMaintenanceUnitCode().split("_");
-        contractDto.setMaintenanceUnitCode(splitMaintenanceUnitCode[0]);
-        contractDto.setMaintenanceUnitName(splitMaintenanceUnitCode[1]);
+        if (!StringUtils.isEmpty(contractDto.getMaintenanceUnitCode())) {
+            String[] splitMaintenanceUnitCode = contractDto.getMaintenanceUnitCode().split("_");
+            contractDto.setMaintenanceUnitCode(splitMaintenanceUnitCode[0]);
+            contractDto.setMaintenanceUnitName(splitMaintenanceUnitCode[1]);
+        }
         contractDto.setApplyStatus(FlowStatusEnum.TO_BE_SUBMITTED.getName());
-        contractDto.setEquNum(equipmentLists.size());
-        JgMaintenanceContract contract = getById(contractDto.getSequenceNbr());
-        BeanUtils.copyProperties(contractDto, contract);
-        if (!"add".equals(String.valueOf(map.get("pageType")))) {
-            //编辑
+        JgMaintenanceContract contract = new JgMaintenanceContract();
+        boolean hasId = StringUtils.isEmpty(contractDto.getSequenceNbr());//没有id说明是新增
+        if (hasId) {
+            BeanUtils.copyProperties(contractDto, contract);
+            contract.setCreateUserId(reginParams.getUserModel().getUserId());
+            contract.setCreateUserName(reginParams.getUserModel().getRealName());
+            contract.setStatus(SUBMIT_DATA.equals(submit) ? WorkFlowStatusEnum.MAIN_SUBMIT.getPass() : WorkFlowStatusEnum.MAIN_RECEIVE.getPass());
+            this.save(contract);
+        } else {
+            //删除以前设备关联关系
             this.getBaseMapper().updateById(contract);
             LambdaQueryWrapper<JgMaintenanceContractEq> lambda = new QueryWrapper<JgMaintenanceContractEq>().lambda();
             lambda.eq(JgMaintenanceContractEq::getEquipTransferId, contract.getSequenceNbr());
             jgMaintenanceContractEqService.getBaseMapper().delete(lambda);
         }
-        //关联设备信息
-        List<JgMaintenanceContractEq> equipList = new ArrayList<>();
-        equipmentLists.forEach(x -> {
-            JgMaintenanceContractEq equip = new JgMaintenanceContractEq();
-            equip.setEquId(String.valueOf(x.get("SEQUENCE_NBR")));
-            equip.setEquipTransferId(contract.getSequenceNbr().toString());
-            equipList.add(equip);
-        });
-        // 保存维保关联设备信息
-        jgMaintenanceContractEqService.saveBatch(equipList);
+        // 更新关联设备信息
+        if (!CollectionUtils.isEmpty(equipmentLists)) {
+            contractDto.setEquNum(equipmentLists.size());
+            List<JgMaintenanceContractEq> equipList = new ArrayList<>();
+            equipmentLists.forEach(x -> {
+                JgMaintenanceContractEq equip = new JgMaintenanceContractEq();
+                equip.setEquId(String.valueOf(x.get("SEQUENCE_NBR")));
+                equip.setEquipTransferId(contract.getSequenceNbr().toString());
+                equipList.add(equip);
+            });
+            // 保存关联设备信息
+            jgMaintenanceContractEqService.saveBatch(equipList);
+        }
+
         // 判断当前是否为提交
-        List<String> roleListNext = new ArrayList<>();
-        List<String> roleListAll = new ArrayList<>();
         if (SUBMIT_TYPE_FLOW.equals(submit)) {
-            if (!StringUtils.isEmpty(contract.getInstanceId())) {
-                // 发起流程
+            List<String> roleListNext = new ArrayList<>();
+            List<String> roleListAll = new ArrayList<>();
+            //新增提交
+            if (StringUtils.isEmpty(contract.getInstanceId())) {
+                //没有InstanceId需要发起流程
                 try {
-                    List<ProcessTaskDTO> processTasks = new ArrayList<>();
                     ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
                     List<ActWorkflowStartDTO> list = new ArrayList<>();
                     ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
@@ -276,7 +292,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
                     dto.setCompleteFirstTask(true);
                     list.add(dto);
                     actWorkflowBatchDTO.setProcess(list);
-                    processTasks = workflowService.startBatch(actWorkflowBatchDTO);
+                    List<ProcessTaskDTO> processTasks  = workflowService.startBatch(actWorkflowBatchDTO);
                     String instanceId = processTasks.get(0).getProcessInstance().getId();
                     String nextTaskId = processTasks.get(0).getNextTask().get(0).getId();
                     String taskName = processTasks.get(0).getNextTask().get(0).getName();
@@ -296,7 +312,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
                     throw new BadRequest("提交失败" + e.getMessage());
                 }
             } else {
-                // 执行一步
+                // 有InstanceId，执行一步
                 ProcessTaskDTO processTaskDTO = this.submit("0", contract.getNextTaskId());
                 String nextTaskId = processTaskDTO.getNextTask().get(0).getId();
                 String taskName = processTaskDTO.getNextTask().get(0).getName();
@@ -315,12 +331,8 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
                 contract.setNextTaskId(nextTaskId);
                 executeOneStep(contract, taskName, nextUserIds);
             }
-            updateById(contract);
-        } else {
-            // 新增
-            contract.setStatus(SUBMIT_DATA.equals(submit) ? WorkFlowStatusEnum.MAIN_SUBMIT.getPass() : WorkFlowStatusEnum.MAIN_RECEIVE.getPass());
-            this.save(contract);
         }
+        updateById(contract);
         return true;
     }
 

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

 package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -137,7 +136,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             }
         }
         Map<String, Object> map = equipmentInfos.get(0);
-        BeanUtil.copyProperties(transferNotice, map);
+        BeanUtil.copyProperties(transferNotice, map, "equList", "supervisoryCode");
         return new HashMap<String, Map<String, Object>>() {{
             this.put("transferNoticeInfo", map);
         }};
@@ -313,9 +312,11 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 jgTransferNoticeMapper.updateById(notice);
                 // 上个代办改为已办
                 HashMap<String, Object> map = new HashMap<>();
-                map.put("taskStatus", commonService.getDictionaryCodeByName(notice.getNoticeStatus()));
-                map.put("taskStatusLabel", notice.getNoticeStatus());
+                map.put("taskStatus", FlowStatusEnum.TO_BE_PROCESSED.getCode());
+                map.put("taskStatusLabel", FlowStatusEnum.TO_BE_PROCESSED.getName());
                 map.put("relationId", notice.getInstanceId());
+                map.put("flowStatus", FlowStatusEnum.TO_BE_PROCESSED.getCode());
+                map.put("flowStatusLabel", FlowStatusEnum.TO_BE_PROCESSED.getName());
                 TaskV2Model taskV2Model = commonService.updateTaskModel(map);
                 TaskModelDto taskModelDto = new TaskModelDto();
                 BeanUtils.copyProperties(taskV2Model, taskModelDto);
@@ -323,8 +324,9 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 taskModelDto.setModel(notice);
                 taskModelDto.setTaskName(workflowResultDto.getNextTaskName());
                 taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
-                taskModelDto.setTaskStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode());
-                taskModelDto.setTaskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
+                taskModelDto.setFlowStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode());
+                taskModelDto.setFlowStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
+                taskModelDto.setFlowCode(notice.getNextTaskId());
                 taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
                 commonService.buildTaskModel(Collections.singletonList(taskModelDto));
             }
@@ -379,13 +381,30 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         if (CollectionUtils.isEmpty(responseModel.getResult())) {
             return;
         }
-
-
         // 启动工作流并返回信息
         List<WorkflowResultDto> workflowResultList = workFlowInfo(submitType, deviceList);
-
         List<JgTransferNotice> list = new ArrayList<>();
         List<JgTransferNoticeEq> equipList = new ArrayList<>();
+        //业务数据组装等
+        businessData(submitType, reginParams, model, deviceList, responseModel, workflowResultList, list, equipList);
+        jgTransferNoticeMapper.insertBatchSomeColumn(list);
+        // 如果为保存并提交，则创建代办
+        if (SUBMIT_TYPE_FLOW.equals(submitType)) {
+            buildTask(list, workflowResultList);
+        }
+        List<JgTransferNoticeEq> jgRelationEquipList = equipList.stream().map(jgRelationEquip -> {
+            List<JgTransferNotice> collect = list.stream().filter(JgTransferNotice -> jgRelationEquip.getEquipTransferId().equals(JgTransferNotice.getApplyNo())).collect(Collectors.toList());
+            Long sequenceNbr = collect.get(0).getSequenceNbr();
+            return jgRelationEquip.setEquipTransferId(String.valueOf(sequenceNbr));
+        }).collect(Collectors.toList());
+
+        jgTransferNoticeEqMapper.insertBatchSomeColumn(jgRelationEquipList);
+    }
+
+    /**
+     * 组装业务数据
+     */
+    private void businessData(String submitType, ReginParams reginParams, JgTransferNoticeDto model, List<Map<String, Object>> deviceList, ResponseModel<List<String>> responseModel, List<WorkflowResultDto> workflowResultList, List<JgTransferNotice> list, List<JgTransferNoticeEq> equipList) {
         deviceList.forEach(obj -> {
             JgTransferNoticeEq jgRelationEquip = new JgTransferNoticeEq();
             JgTransferNotice dto = new JgTransferNotice();
@@ -419,20 +438,6 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             list.add(dto);
             equipList.add(jgRelationEquip);
         });
-
-        jgTransferNoticeMapper.insertBatchSomeColumn(list);
-        // 如果为保存并提交，则创建代办
-        if (SUBMIT_TYPE_FLOW.equals(submitType)) {
-            buildTask(list, workflowResultList);
-        }
-
-        List<JgTransferNoticeEq> jgRelationEquipList = equipList.stream().map(jgRelationEquip -> {
-            List<JgTransferNotice> collect = list.stream().filter(JgTransferNotice -> jgRelationEquip.getEquipTransferId().equals(JgTransferNotice.getApplyNo())).collect(Collectors.toList());
-            Long sequenceNbr = collect.get(0).getSequenceNbr();
-            return jgRelationEquip.setEquipTransferId(String.valueOf(sequenceNbr));
-        }).collect(Collectors.toList());
-
-        jgTransferNoticeEqMapper.insertBatchSomeColumn(jgRelationEquipList);
     }
 
 
@@ -451,8 +456,10 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             taskModelDto.setTaskTypeLabel(BusinessTypeEnum.JG_ADVICE_REMOVAL.getName());
             taskModelDto.setRelationId(item.getInstanceId());
             taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds()); // 工作流API返回
-            taskModelDto.setTaskStatus(commonService.getDictionaryCodeByName(FlowStatusEnum.TO_BE_PROCESSED.getName())); // 流程状态枚举
             taskModelDto.setTaskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
+            taskModelDto.setFlowStatus(commonService.getDictionaryCodeByName(FlowStatusEnum.TO_BE_PROCESSED.getName())); // 流程状态枚举
+            taskModelDto.setFlowStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
+            taskModelDto.setFlowCode(item.getNextTaskId());
             taskModelDto.setStartUserId(item.getCreateUserId());
             taskModelDto.setStartUser(item.getCreateUserName());
             taskModelDto.setStartUserCompanyName(item.getCreateUserCompanyName()); // 任务发起人所在单位
@@ -465,6 +472,12 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         commonService.buildTaskModel(taskModelDtoList);
     }
 
+    /**
+     * 工作流启动并执行
+     * @param submitType 是否提交
+     * @param deviceList 设备信息
+     * @return 工作流返回相关数据
+     */
     private List<WorkflowResultDto> workFlowInfo(String submitType, List<Map<String, Object>> deviceList) {
         if (SUBMIT_TYPE_FLOW.equals(submitType)) {
             ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
@@ -477,9 +490,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 list.add(dto);
             });
             actWorkflowBatchDTO.setProcess(list);
-            System.out.println("============== " + DateUtil.now());
             List<ProcessTaskDTO> processTaskDTOS = iCmWorkflowService.startBatch(actWorkflowBatchDTO);
-            System.out.println("============== " + DateUtil.now());
             // 组装工作流返回的数据
             return commonService.buildWorkFlowInfo(processTaskDTOS);
         }
@@ -487,6 +498,9 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
     }
 
 
+    /**
+     * 页面数据转换
+     */
     private void convertField(JgTransferNoticeDto model) {
         // 处理图片
         if (!ValidationUtil.isEmpty(model.getConstructionContractList())) {
@@ -495,7 +509,6 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         if (!ValidationUtil.isEmpty(model.getPowerOfAttorneyList())) {
             model.setPowerOfAttorney(JSON.toJSONString(model.getPowerOfAttorneyList()));
         }
-
         // 分割省市区字段
         String province = model.getProvince();
         if (!ObjectUtils.isEmpty(province)) {
@@ -505,7 +518,6 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 model.setProvinceName(provinceList[1]);
             }
         }
-
         String city = model.getCity();
         if (!ObjectUtils.isEmpty(city)) {
             String[] cityList = city.split("_");
@@ -514,7 +526,6 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 model.setCityName(cityList[1]);
             }
         }
-
         String county = model.getCounty();
         if (!ObjectUtils.isEmpty(county)) {
             String[] countyList = county.split("_");
@@ -523,7 +534,6 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 model.setCountyName(countyList[1]);
             }
         }
-
         // 分割单位
         String useUnitId = model.getUseUnitCreditCode();
         if (!ObjectUtils.isEmpty(useUnitId)) {
@@ -533,7 +543,6 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 model.setUseUnitName(useUnitList[1]);
             }
         }
-
         String receiveOrgId = model.getReceiveOrgCode();
         if (!ObjectUtils.isEmpty(receiveOrgId)) {
             String[] receiveOrgIdList = receiveOrgId.split("_");
@@ -588,26 +597,8 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         } catch (ParseException e) {
             log.error("日期转换失败：{}", e);
         }
-
-
-        ProcessTaskDTO processTaskDTO = new ProcessTaskDTO();
-        WorkflowResultDto workflowResultDto = new WorkflowResultDto();
-        // 只调用执行API，返回下个节点信息，用于填充业务字段
-        //组装信息
-        TaskResultDTO workDto = new TaskResultDTO();
-        workDto.setResultCode("approvalStatus");
-        workDto.setTaskId(jgTransferNotice.getNextTaskId());
-        HashMap<String, Object> commMap = new HashMap<>();
-        if (jgTransferNotice.getNoticeStatus().equals("6614") || jgTransferNotice.getNoticeStatus().equals("6615")) {
-            commMap.put("approvalStatus", "提交");
-        } else {
-            commMap.put("approvalStatus", op);
-        }
-        workDto.setVariable(commMap);
-        workDto.setComment(opinion);
-        processTaskDTO = iCmWorkflowService.complete(jgTransferNotice.getNextTaskId(), workDto);
-        // 提取节点等信息
-        workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
+        // 执行工作流并返回组装好的工作流信息
+        WorkflowResultDto workflowResultDto = getWorkflowResultDto(op, opinion, jgTransferNotice);
 
         jgTransferNotice.setPromoter(reginParams.getUserModel().getUserId());
         TaskV2Model taskV2Model = new TaskV2Model();
@@ -620,10 +611,6 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 queryWrapper2.eq(RegistrationInfo::getRecord, jgTransferNoticeEq.getEquId());
                 RegistrationInfo tzsJgRegistrationInfo = tzsJgRegistrationInfoMapper.selectOne(queryWrapper2);
                 stringBuffer.append(tzsJgRegistrationInfo.getEquCategory()).append(jgTransferNotice.getCity()).append(ym);
-                Map<String, Object> map = new HashMap<>();
-                map.put("cityCode", jgTransferNotice.getCity());
-                map.put("countyCode", jgTransferNotice.getCounty());
-                map.put("equCategory", tzsJgRegistrationInfo.getEquCategory());
                 jgTransferNotice.setPromoter("");
                 jgTransferNotice.setHandleDate(new Date());
                 jgTransferNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
@@ -633,6 +620,8 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 taskMap.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
                 taskMap.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
                 taskMap.put("relationId", jgTransferNotice.getInstanceId());
+                taskMap.put("flowStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
+                taskMap.put("flowStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
                 taskV2Model = commonService.updateTaskModel(taskMap);
             } else {
                 jgTransferNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
@@ -646,6 +635,8 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 HashMap<String, Object> taskMap = new HashMap<>();
                 taskMap.put("taskStatus", FlowStatusEnum.TO_BE_PROCESSED.getCode());
                 taskMap.put("taskStatusLabel", FlowStatusEnum.TO_BE_PROCESSED.getName());
+                taskMap.put("flowStatus", FlowStatusEnum.TO_BE_PROCESSED.getCode());
+                taskMap.put("flowStatusLabel", FlowStatusEnum.TO_BE_PROCESSED.getName());
                 taskMap.put("relationId", jgTransferNotice.getInstanceId());
                 taskV2Model = commonService.updateTaskModel(taskMap);
                 TaskModelDto taskModelDto = new TaskModelDto();
@@ -654,7 +645,9 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 taskModelDto.setModel(jgTransferNotice);
                 taskModelDto.setTaskName(workflowResultDto.getNextTaskName());
                 taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
-                taskModelDto.setTaskStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode());
+                taskModelDto.setFlowStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode());
+                taskModelDto.setFlowStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
+                taskModelDto.setFlowCode(jgTransferNotice.getNextTaskId());
                 taskModelDto.setTaskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
                 taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
                 commonService.buildTaskModel(Collections.singletonList(taskModelDto));
@@ -667,6 +660,8 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             taskMap.put("taskStatus", jgTransferNotice.getNoticeStatus());
             taskMap.put("taskStatusLabel", FlowStatusEnum.REJECTED.getName());
             taskMap.put("relationId", jgTransferNotice.getInstanceId());
+            taskMap.put("flowStatus", FlowStatusEnum.REJECTED.getCode());
+            taskMap.put("flowStatusLabel", FlowStatusEnum.REJECTED.getName());
             taskV2Model = commonService.updateTaskModel(taskMap);
             TaskModelDto taskModelDto = new TaskModelDto();
             BeanUtils.copyProperties(taskV2Model, taskModelDto);
@@ -674,8 +669,9 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             taskModelDto.setModel(jgTransferNotice);
             taskModelDto.setTaskName(workflowResultDto.getNextTaskName());
             taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
-            taskModelDto.setTaskStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode());
-            taskModelDto.setTaskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
+            taskModelDto.setFlowStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode());
+            taskModelDto.setFlowStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
+            taskModelDto.setFlowCode(jgTransferNotice.getNextTaskId());
             taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
             commonService.buildTaskModel(Collections.singletonList(taskModelDto));
         }
@@ -683,4 +679,33 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
 
     }
 
+    /**
+     * 执行工作流并返回组装好的工作流信息
+     * @param op 是否通过
+     * @param opinion 备注信息
+     * @param jgTransferNotice 业务信息
+     * @return 返回组装好的工作流信息
+     */
+    private WorkflowResultDto getWorkflowResultDto(String op, String opinion, JgTransferNotice jgTransferNotice) {
+        ProcessTaskDTO processTaskDTO = new ProcessTaskDTO();
+        WorkflowResultDto workflowResultDto = new WorkflowResultDto();
+        // 只调用执行API，返回下个节点信息，用于填充业务字段
+        //组装信息
+        TaskResultDTO workDto = new TaskResultDTO();
+        workDto.setResultCode("approvalStatus");
+        workDto.setTaskId(jgTransferNotice.getNextTaskId());
+        HashMap<String, Object> commMap = new HashMap<>();
+        if (jgTransferNotice.getNoticeStatus().equals("6614") || jgTransferNotice.getNoticeStatus().equals("6615")) {
+            commMap.put("approvalStatus", "提交");
+        } else {
+            commMap.put("approvalStatus", op);
+        }
+        workDto.setVariable(commMap);
+        workDto.setComment(opinion);
+        processTaskDTO = iCmWorkflowService.complete(jgTransferNotice.getNextTaskId(), workDto);
+        // 提取节点等信息
+        workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
+        return workflowResultDto;
+    }
+
 }
\ No newline at end of file