设备注销

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgScrapCancelDto.java

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
-import com.alibaba.excel.annotation.ExcelIgnore;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -78,10 +77,15 @@ public class JgScrapCancelDto extends BaseDto {
     @ApiModelProperty(value = "设备ID")
     private String SEQUENCE_NBR;
 
+    @ApiModelProperty(value = "任务发起人id")
+    private String promoter;
 
     @ApiModelProperty(value = "终审通过时间")
     private Date auditPassDate;
 
+    @ApiModelProperty(value = "下一步任务ID")
+    private String nextTaskId;
+
 
     private List<String> roleIds;
 

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

@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+
 import java.util.Date;
 
 /**
@@ -25,91 +26,91 @@ public class JgScrapCancel extends BaseEntity {
     /**
      * 注销类型（1报废注销，2移装注销）
      */
-	@TableField("cancel_type")
+    @TableField("cancel_type")
     private String cancelType;
 
     /**
      * 申请编号
      */
-	@TableField("apply_no")
+    @TableField("apply_no")
     private String applyNo;
 
     /**
      * 流程实例id
      */
-	@TableField("instance_id")
+    @TableField("instance_id")
     private String instanceId;
 
     /**
      * 办理状态
      */
-	@TableField("audit_status")
+    @TableField("audit_status")
     private String auditStatus;
 
     /**
      * 状态
      */
-	@TableField("status")
+    @TableField("status")
     private String status;
 
     /**
      * 备注
      */
-	@TableField("remark")
+    @TableField("remark")
     private String remark;
 
     /**
      * 创建人ID
      */
-	@TableField("create_user_id")
+    @TableField("create_user_id")
     private String createUserId;
 
     /**
      * 创建时间
      */
-	@TableField("create_date")
+    @TableField("create_date")
     private Date createDate;
 
     /**
      * 流程状态
      */
-	@TableField("instance_status")
+    @TableField("instance_status")
     private String instanceStatus;
 
     /**
      * 下一执行节点ids
      */
-	@TableField("next_execute_ids")
+    @TableField("next_execute_ids")
     private String nextExecuteIds;
 
     /**
      * 接收机构代码
      */
-	@TableField("receive_org_code")
+    @TableField("receive_org_code")
     private String receiveOrgCode;
 
     /**
      * 接收机构
      */
-	@TableField("receive_org_name")
+    @TableField("receive_org_name")
     private String receiveOrgName;
 
     /**
      * 接收机构公司代码
      */
-	@TableField("receive_company_code")
+    @TableField("receive_company_code")
     private String receiveCompanyCode;
 
     /**
      * 注销证明
      */
-	@TableField("cancel_certificate")
+    @TableField("cancel_certificate")
     private String cancelCertificate;
 
     /**
      * 终审通过时间
      */
-	@TableField("audit_pass_date")
+    @TableField("audit_pass_date")
     private Date auditPassDate;
 
 
@@ -129,5 +130,11 @@ public class JgScrapCancel extends BaseEntity {
     @TableField(value = "use_unit_name")
     private String useUnitName;
 
+    /**
+     * 下一步任务ID
+     */
+    @TableField(value = "next_task_id")
+    private 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/controller/JgScrapCancelController.java

@@ -50,7 +50,9 @@ public class JgScrapCancelController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/updateInfo")
     @ApiOperation(httpMethod = "POST", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
-    public ResponseModel<JgScrapCancelDto> updateInfo(@RequestParam String submitType, @RequestBody Map<String, Object> model, @RequestParam(value = "op", required = false) String op) {
+    public ResponseModel<JgScrapCancelDto> updateInfo(@RequestParam String submitType,
+                                                      @RequestBody Map<String, Object> model,
+                                                      @RequestParam(value = "op", required = false) String op) {
         JgScrapCancelDto jgScrapCancelDto = BeanUtil.mapToBean(((LinkedHashMap) model.get("jgScrapCancelAdd")), JgScrapCancelDto.class, true);
         if (Objects.isNull(jgScrapCancelDto)) {
             throw new IllegalArgumentException("参数jgScrapCancelAdd不能为空");
@@ -66,8 +68,8 @@ public class JgScrapCancelController extends BaseController {
     @ApiOperation(httpMethod = "POST", value = "执行流程", notes = "执行流程")
     public ResponseModel<Object> flowExecute(@RequestBody JSONObject map) {
 
-        LinkedHashMap model1 = (LinkedHashMap) map.get("model");
-        LinkedHashMap jgScrapCancelInfo = (LinkedHashMap) model1.get("jgScrapCancelAdd");
+        LinkedHashMap<?, ?> model1 = (LinkedHashMap<?, ?>) map.get("model");
+        LinkedHashMap<?, ?> jgScrapCancelInfo = (LinkedHashMap<?, ?>) model1.get("jgScrapCancelAdd");
         jgScrapCancelInfo.remove("SEQUENCE_NBR");
         JgScrapCancelDto jgScrapCancelDto = JSON.parseObject(JSON.toJSONString(jgScrapCancelInfo), JgScrapCancelDto.class);
 

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

@@ -3,7 +3,6 @@ package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 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;
@@ -13,8 +12,11 @@ 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.JgScrapCancelDto;
+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.JgScrapCancel;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgScrapCancelEq;
+import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.CancelTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.WorkFlowStatusEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgScrapCancelEqMapper;
@@ -33,21 +35,13 @@ import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgOtherInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgRegisterInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgUseInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.SuperviseInfoMapper;
-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.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
-import com.yeejoin.amos.feign.workflow.Workflow;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
-import com.yeejoin.amos.feign.workflow.model.AjaxResult;
+import com.yeejoin.amos.feign.workflow.model.ProcessTaskDTO;
 import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
-import fr.opensagres.xdocreport.core.io.IOUtils;
 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.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -57,10 +51,9 @@ import org.springframework.util.StringUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -76,32 +69,36 @@ import static com.alibaba.fastjson.JSON.parseArray;
 public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgScrapCancel, JgScrapCancelMapper> implements IJgScrapCancelService {
 
 
-    @Autowired
-    private JgScrapCancelEqServiceImpl jgScrapCancelEqService;
-
-    @Autowired
-    private JgScrapCancelEqMapper jgScrapCancelEqMapper;
+    private static final String SUBMIT_TYPE_FLOW = "1";
+    private static final String PAGE_KEY = "jgScrapCancelAdd";
     @Autowired
     WorkFlowFeignService workFlowFeginService;
-
     @Autowired
     TzsServiceFeignClient tzsServiceFeignClient;
-
-    @Autowired
-    private IdxBizJgUseInfoMapper idxBizJgUseInfoMapper;
-
     @Autowired
     IdxBizJgOtherInfoMapper idxBizJgOtherInfoMapper;
-
     @Autowired
     SuperviseInfoMapper superviseInfoMapper;
     @Autowired
+    CommonServiceImpl commonService;
+    @Autowired
+    CmWorkflowServiceImpl cmWorkflowService;
+    @Autowired
     RedisUtils redisUtils;
-    @Value("classpath:/json/urlInfo.json")
-    private Resource bizTypeInfo;
+    @Autowired
+    IdxBizJgRegisterInfoMapper idxBizJgRegisterInfoMapper;
+    @Autowired
+    IIdxBizJgRegisterInfoService idxBizJgRegisterInfoService;
+    @Autowired
+    private JgScrapCancelEqServiceImpl jgScrapCancelEqService;
+    @Autowired
+    private JgScrapCancelEqMapper jgScrapCancelEqMapper;
+    @Autowired
+    private IdxBizJgUseInfoMapper idxBizJgUseInfoMapper;
+    private static String template = "来自电梯【（%s）】 【（%s）】的业务办理，【申请单号：%s】";
 
     public Page<Map<String, Object>> getList(JgScrapCancelDto dto, Page<Map<String, Object>> page, List<String> roleIds) {
-        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+        ReginParams reginParams = this.getSelectedOrgInfo();
         String orgCode = reginParams.getCompany().getCompanyCode();
         Page<Map<String, Object>> listPage = this.baseMapper.getListPage(page, dto, roleIds, orgCode);
         listPage.getRecords().forEach(item -> {
@@ -115,7 +112,6 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         return listPage;
     }
 
-
     private void convertField(JgScrapCancelDto model) {
         // 处理图片
         if (!ValidationUtil.isEmpty(model.getCancelCertificateList())) {
@@ -131,19 +127,25 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         }
     }
 
+    /**
+     * 获取登录用户信息
+     *
+     * @return
+     */
+    protected ReginParams getSelectedOrgInfo() {
+        return JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+    }
 
     @SuppressWarnings({"Duplicates", "rawtypes"})
     @Transactional(rollbackFor = Exception.class)
-    public void save(String submitType, Map<String, Object> jgInstallationNoticeDtoMap) {
-        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+    public void save(String submitType, Map<String, Object> mapParams) {
+        ReginParams reginParams = this.getSelectedOrgInfo();
+        Map<?, ?> noticeParams = (Map) mapParams.get(PAGE_KEY);
+        String equipId = noticeParams.get("record").toString();
+        noticeParams.remove("record");
         String[] taskName = new String[]{"流程结束"};
-        JSONObject jgScrapCancelAdd = (JSONObject) jgInstallationNoticeDtoMap.get("jgScrapCancelAdd");
-        String equipId = jgScrapCancelAdd.get("record").toString();
-        jgScrapCancelAdd.remove("record");
-
-        JgScrapCancelDto model = JSON.parseObject(jgScrapCancelAdd.toJSONString(), JgScrapCancelDto.class);
+        JgScrapCancelDto model = JSON.parseObject(JSON.toJSONString(noticeParams), JgScrapCancelDto.class);
         model.setSEQUENCE_NBR(equipId);
-//        JgScrapCancelDto model = (JgScrapCancelDto) jgInstallationNoticeDtoMap.get("jgScrapCancelAdd");
         // 字段转换
         convertField(model);
         // 获取告知设备信息
@@ -155,129 +157,88 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         HashMap<String, Object> map1 = new HashMap<>();
         map1.put("SEQUENCE_NBR", model.getSEQUENCE_NBR());
         deviceList.add(map1);
-
         // 获取告知单号
-        ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.SBZX.getCode(), deviceList.size());
+        ResponseModel<List<String>> listResponseModel =
+                tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.SBZX.getCode(), deviceList.size());
         if (!ObjectUtils.isEmpty(listResponseModel) && listResponseModel.getStatus() != HttpStatus.OK.value()) {
             log.error(" 获取告知单号失败");
             throw new RuntimeException();
         }
+        String instanceId = "";
+        String nextTaskId = "";
+        String nextUserIds = "";
+        List<ProcessTaskDTO> processTaskDTOS;
+        List<String> roleListNext = new ArrayList<>();
+        List<String> roleListAll = new ArrayList<>();
         List<String> applyNoList = listResponseModel.getResult();
         if (CollectionUtils.isEmpty(applyNoList)) {
             return;
         }
-
-        ArrayList<String> roleListFirst = new ArrayList<>();
-        ArrayList<String> roleListSecond = new ArrayList<>();
         // 判断当前是否为提交
         List<String> instanceIdList = new ArrayList<>();
-        if ("1".equals(submitType)) {
+        List<WorkflowResultDto> workflowResultDtos = null;
+        if (SUBMIT_TYPE_FLOW.equals(submitType)) {
             // 发起流程
-            // ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
             ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
             List<ActWorkflowStartDTO> list = new ArrayList<>();
             for (int i = 0; i < deviceList.size(); i++) {
                 ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
                 dto.setProcessDefinitionKey("scrapCancelNew");
-                dto.setBusinessKey(String.valueOf(i));
+                dto.setBusinessKey(applyNoList.get(i));
+                dto.setCompleteFirstTask(Boolean.TRUE);
                 list.add(dto);
             }
             actWorkflowBatchDTO.setProcess(list);
             try {
-                FeignClientResult result = Workflow.taskV2Client.startByVariableBatch(actWorkflowBatchDTO);
-                List<Object> returnList = (List<Object>) result.getResult();
-                for (Object obj : returnList) {
-                    JSONObject jsonObject = JSON.parseObject(JSONObject.toJSONString(obj));
-                    String instanceId = jsonObject.getString("id");
-                    instanceIdList.add(instanceId);
-                    // 查询下节点任务
-                    if (returnList.get(0).equals(obj)) {
-                        getNext(roleListFirst, instanceId, taskName);
-                    }
-                    // 推动下一个节点
-                    AjaxResult ajaxResult = Workflow.taskClient.getTask(instanceId);
-                    JSONObject dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
-                    String taskId = dataObject.getString("id");
-                    //组装信息
-                    TaskResultDTO dto = new TaskResultDTO();
-                    dto.setResultCode("approvalStatus");
-                    dto.setTaskId(taskId);
-                    dto.setComment("提交流程");
-                    HashMap<String, Object> map = new HashMap<>();
-                    map.put("approvalStatus", "0");
-                    dto.setVariable(map);
-                    //执行流程
-                    AjaxResult ajaxResult1 = null;
-                    try {
-                        ajaxResult1 = Workflow.taskClient.completeByTask(taskId, dto);
-                        if (ajaxResult1.get("code").equals(200)) {
-                            getNext(roleListSecond, instanceId, taskName);
-                            roleListFirst.addAll(roleListSecond);
-                        } else {
-                            log.error("提交失败");
-                        }
-                    } catch (Exception e) {
-                        log.error("提交失败：{}", e);
-                    }
-                }
+                processTaskDTOS = cmWorkflowService.startBatch(actWorkflowBatchDTO);
+                this.buildRoleList(processTaskDTOS, roleListNext, roleListAll);
+                instanceId = processTaskDTOS.get(0).getProcessInstance().getId();
+                nextTaskId = processTaskDTOS.get(0).getNextTask().get(0).getId();
+                taskName[0] = processTaskDTOS.get(0).getNextTask().get(0).getName();
+                workflowResultDtos = commonService.buildWorkFlowInfo(processTaskDTOS);
+                nextUserIds = workflowResultDtos.get(0).getNextExecutorUserIds();
+                this.buildRoleList(processTaskDTOS, roleListNext, roleListAll);
             } catch (Exception e) {
                 log.error("提交失败：{}", e);
+                throw new BadRequest("提交失败" + e.getMessage());
             }
         }
 
         List<JgScrapCancel> list = new ArrayList<>();
         List<JgScrapCancelEq> equipList = new ArrayList<>();
-        deviceList.forEach(obj -> {
+        for (int i = 0; i < deviceList.size(); i++) {
             JgScrapCancelEq jgRelationEquip = new JgScrapCancelEq();
             JgScrapCancel dto = new JgScrapCancel();
             BeanUtils.copyProperties(model, dto);
-            int i = deviceList.indexOf(obj);
             String applyNo = applyNoList.get(i);
             dto.setApplyNo(applyNo);
             dto.setCreateDate(new Date());
-            dto.setNextExecuteIds(String.join(",", roleListSecond));
-            dto.setInstanceStatus(String.join(",", roleListFirst));
+            dto.setNextExecuteIds(String.join(",", roleListNext));
+            dto.setInstanceStatus(String.join(",", roleListAll));
             dto.setPromoter(reginParams.getUserModel().getUserId());
-//            dto.setStatus(taskName[0]);
-            jgRelationEquip.setEquId(String.valueOf(obj.get("SEQUENCE_NBR")));
+            dto.setNextTaskId(Objects.isNull(workflowResultDtos) ? null : workflowResultDtos.get(i).getNextTaskId());
+            jgRelationEquip.setEquId(String.valueOf(deviceList.get(i).get("SEQUENCE_NBR")));
             jgRelationEquip.setEquipTransferId(applyNo);
-            if (!CollectionUtils.isEmpty(instanceIdList)) {
-                dto.setInstanceId(instanceIdList.get(i));
+            if (!StringUtils.isEmpty(instanceId)) {
+                dto.setInstanceId(instanceId);
+                dto.setNextTaskId(nextTaskId);
                 dto.setAuditStatus(String.valueOf(WorkFlowStatusEnum.CANCEL_RECEIVE.getPass()));
             } else {
                 dto.setAuditStatus(String.valueOf(WorkFlowStatusEnum.CANCEL_SUBMIT.getPass()));
             }
             dto.setUseUnitCode(reginParams.getCompany().getCompanyCode());
             dto.setUseUnitName(reginParams.getCompany().getCompanyName());
+            dto.setCreateUserId(RequestContext.getExeUserId());
             list.add(dto);
             equipList.add(jgRelationEquip);
-        });
+        }
         this.saveBatch(list);
-        list.forEach(item -> {
-            // 代办业务
-            if ("1".equals(submitType)) {
-                TaskV2Model taskV2Model = new TaskV2Model();
-                //获取待办任务执行人
-                List<AgencyUserModel> userList = Privilege.agencyUserClient
-                        .queryByRoleId(item.getNextExecuteIds(), null, Boolean.FALSE).getResult();
-                List<String> userIds = userList.stream().map(AgencyUserModel::getUserId).collect(Collectors.toList());
-                taskV2Model.setExecuteUserIds(CollectionUtils.isEmpty(userIds) ? "" : String.join(",", userIds));
-                taskV2Model.setExtras(JSON.toJSONString(item));
-                taskV2Model.setRelationId(item.getInstanceId());
-                taskV2Model.setTaskType("scrapCancel");
-                taskV2Model.setTaskTypeLabel("注销报废");
-                String url = getUrl(taskV2Model.getTaskType(), "look");
-                String format = String.format(url, item.getSequenceNbr(), item.getNextExecuteIds(), item.getNextExecuteIds(),
-                        item.getAuditStatus(), item.getInstanceId());
-                taskV2Model.setRoutePath(format);
-                taskV2Model.setTaskTitle(item.getStatus());
-                taskV2Model.setTaskName(item.getStatus());
-                taskV2Model.setTaskStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode());
-                taskV2Model.setTaskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
-                taskV2Model.setTaskCode(item.getApplyNo());
-                buildTaskModel(taskV2Model);
+        if (SUBMIT_TYPE_FLOW.equals(submitType)) {
+            // 新增代办
+            for (int i = 0; i < list.size(); i++) {
+                this.createTaskModel(list.get(i), taskName[0], submitType, nextUserIds);
             }
-        });
+        }
         List<JgScrapCancelEq> jgScrapCancelEqList = equipList.stream().map(t -> {
             List<JgScrapCancel> collect = list.stream().filter(item -> t.getEquipTransferId().equals(item.getApplyNo())).collect(Collectors.toList());
             Long sequenceNbr = collect.get(0).getSequenceNbr();
@@ -286,6 +247,69 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         jgScrapCancelEqService.saveBatch(jgScrapCancelEqList);
     }
 
+    /**
+     * 移装移装报废/注销报废判断
+     *
+     * @return
+     */
+    public static BusinessTypeEnum businessTypeJudgment(String type) {
+        return "1".equals(type) ? BusinessTypeEnum.JG_EQUIPMENT_CANCEL : BusinessTypeEnum.JG_EQUIPMENT_MOVE;
+    }
+
+    private void createTaskModel(JgScrapCancel dto, String taskName, String submitType, String nextUserIds) {
+        ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+        if ("1".equals(submitType)) {
+            TaskModelDto taskModelDto = new TaskModelDto();
+            taskModelDto.setFlowCreateDate(dto.getCreateDate());
+            taskModelDto.setTaskName(taskName);
+            taskModelDto.setTaskCode(dto.getApplyNo());
+            taskModelDto.setTaskContent(this.buildTaskContent(dto.getCancelType(), dto.getApplyNo()));
+            taskModelDto.setTaskDesc("");
+            taskModelDto.setTaskType(businessTypeJudgment(dto.getCancelType()).getCode());
+            taskModelDto.setTaskTypeLabel(businessTypeJudgment(dto.getCancelType()).getName());
+            taskModelDto.setRelationId(dto.getInstanceId());
+            taskModelDto.setExecuteUserIds(nextUserIds);
+            FlowStatusEnum flowStatusEnum = this.getTaskStatus(submitType);
+            taskModelDto.setTaskStatus(flowStatusEnum.getCode());
+            taskModelDto.setTaskStatusLabel(flowStatusEnum.getName());
+            taskModelDto.setFlowStatus(this.getTaskStatusByName(dto.getAuditStatus()));
+            taskModelDto.setFlowStatusLabel(dto.getAuditStatus());
+            taskModelDto.setStartUserId(dto.getCreateUserId());
+            taskModelDto.setFlowCode(dto.getNextTaskId());
+            taskModelDto.setStartUser(reginParams.getUserModel().getRealName());
+            taskModelDto.setStartUserCompanyName(dto.getUseUnitName());
+            taskModelDto.setNextExecuteUser(dto.getNextExecuteIds());
+            taskModelDto.setStartDate(dto.getCreateDate());
+            taskModelDto.setModel(dto);
+            commonService.buildTaskModel(Collections.singletonList(taskModelDto));
+        }
+    }
+
+    private void buildRoleList(List<ProcessTaskDTO> processTasks, List<String> roleListNext, List<String> roleListAll) {
+        processTasks.forEach(p -> {
+            p.getNextCandidateGroups().values().forEach(e -> {
+                roleListNext.addAll(e);
+                roleListAll.addAll(e);
+            });
+            roleListAll.addAll(p.getCandidateGroups());
+        });
+    }
+
+    /**
+     * 摘要构建
+     *
+     * @return 摘要
+     */
+    private String buildTaskContent(String cancelType, String applyNo) {
+        //    来自电梯【X3100-123456】【移装注销】的业务办理【申请单号：ABCD0000001】
+        String type = "1".equals(cancelType) ? "报废注销" : "移装注销";
+        return String.format(template, "XXX", type, applyNo);
+    }
+
+
+    private Integer getTaskCodeByName(String auditStatus) {
+        return commonService.getDictionaryCodeByName(auditStatus);
+    }
 
     public void deleteBatch(List<Long> ids) {
         JgScrapCancel jgScrapCancel = new JgScrapCancel();
@@ -295,90 +319,82 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         this.update(jgScrapCancel, lambda);
     }
 
-
     public JgScrapCancelDto updateInfo(String submitType, JgScrapCancelDto jgScrapCancelDto, String op) {
         if (Objects.isNull(jgScrapCancelDto) || StringUtils.isEmpty(submitType)) {
             throw new IllegalArgumentException("参数不能为空");
         }
-        boolean instancedId = ObjectUtils.isEmpty(jgScrapCancelDto.getInstanceId());
-        String[] taskName = new String[]{"流程结束"};
         // 字段转换
         this.convertField(jgScrapCancelDto);
-        ArrayList<String> roleListFirst = new ArrayList<>();
-        ArrayList<String> roleListSecond = new ArrayList<>();
-        if ("1".equals(submitType)) {
-            AjaxResult ajaxResult;
+        WorkflowResultDto workflowResultDto;
+        List<String> roleListNext = new ArrayList<>();
+        List<String> roleListAll = new ArrayList<>();
+        if (SUBMIT_TYPE_FLOW.equals(submitType)) {
+            // 更新并提交
             // 发起流程
             if (!StringUtils.hasText(jgScrapCancelDto.getInstanceId())) {
-                ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
-                dto.setProcessDefinitionKey("scrapCancelNew");
-                dto.setBusinessKey("1");
+                //未进流程直接发起并执行
                 try {
-                    ajaxResult = Workflow.taskClient.startByVariable(dto);
-                    String instanceId = ((Map) ajaxResult.get("data")).get("id").toString();
+                    List<ProcessTaskDTO> processTasks = new ArrayList<>();
+                    ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
+                    List<ActWorkflowStartDTO> list = new ArrayList<>();
+                    ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
+                    dto.setProcessDefinitionKey("unitRename");
+                    dto.setBusinessKey(jgScrapCancelDto.getApplyNo());
+                    dto.setCompleteFirstTask(true);
+                    list.add(dto);
+                    actWorkflowBatchDTO.setProcess(list);
+                    processTasks = cmWorkflowService.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();
+                    this.buildRoleList(processTasks, roleListNext, roleListAll);
+                    List<WorkflowResultDto> workflowResultDtos = commonService.buildWorkFlowInfo(processTasks);
+                    String nextUserIds = workflowResultDtos.get(0).getNextExecutorUserIds();
+                    jgScrapCancelDto.setInstanceStatus(String.join(",", roleListAll));
                     jgScrapCancelDto.setInstanceId(instanceId);
-                    // 查询下节点任务
-                    getNext(roleListFirst, instanceId, taskName);
-                    jgScrapCancelDto.setInstanceStatus(String.join(",", roleListFirst));
+                    jgScrapCancelDto.setNextExecuteIds(String.join(",", roleListNext));
+                    jgScrapCancelDto.setNextTaskId(nextTaskId);
+                    jgScrapCancelDto.setAuditStatus(WorkFlowStatusEnum.CANCEL_RECEIVE.getPass());
+                    // 创建待办
+                    JgScrapCancel bean = new JgScrapCancel();
+                    BeanUtil.copyProperties(jgScrapCancelDto, bean);
+                    createTaskModel(bean, taskName, "1", nextUserIds);
                 } catch (Exception e) {
                     log.error("提交失败：{}", e);
+                    throw new BadRequest("提交失败" + e.getMessage());
                 }
+            } else {
+                // 已经在流程中，执行一步
+                ProcessTaskDTO processTaskDTO = submit(op, jgScrapCancelDto.getNextTaskId());
+                String nextTaskId = processTaskDTO.getNextTask().get(0).getId();
+                String taskName = processTaskDTO.getNextTask().get(0).getName();
+                this.buildRoleList(Collections.singletonList(processTaskDTO), roleListNext, roleListAll);
+                List<WorkflowResultDto> workflowResultDtos = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO));
+                String nextUserIds = workflowResultDtos.get(0).getNextExecutorUserIds();
+                // 查询下节点任务
+                if (!ObjectUtils.isEmpty(jgScrapCancelDto.getInstanceStatus())) {
+                    jgScrapCancelDto.setInstanceStatus(jgScrapCancelDto.getInstanceStatus() + "," + String.join("", roleListNext));
+                } else {
+                    jgScrapCancelDto.setInstanceStatus(String.join(",", roleListAll));
+                }
+                jgScrapCancelDto.setPromoter(RequestContext.getExeUserId());
+                jgScrapCancelDto.setNextExecuteIds(String.join(",", roleListNext));
+                jgScrapCancelDto.setAuditStatus(String.valueOf(WorkFlowStatusEnum.CANCEL_RECEIVE.getPass()));
+                jgScrapCancelDto.setNextTaskId(nextTaskId);
+                executeOneStep(jgScrapCancelDto, taskName, nextUserIds, op);
             }
+            JgScrapCancel cancel = new JgScrapCancel();
+            BeanUtils.copyProperties(jgScrapCancelDto, cancel);
+            this.updateById(cancel);
             JgScrapCancel jgScrapCancel = new JgScrapCancel();
             BeanUtils.copyProperties(jgScrapCancelDto, jgScrapCancel, "useUnitName", "useUnitName");
-            boolean submit = submit(jgScrapCancel, op);
             LambdaUpdateWrapper<JgScrapCancelEq> updateWrapper = new LambdaUpdateWrapper<>();
             updateWrapper.eq(JgScrapCancelEq::getEquipTransferId, jgScrapCancel.getSequenceNbr());
             JgScrapCancelEq jgScrapCancelEq = new JgScrapCancelEq();
             jgScrapCancelEq.setEquId(jgScrapCancelDto.getRecord());
             jgScrapCancelEqMapper.update(jgScrapCancelEq, updateWrapper);
-            if (submit) {
-                // 查询下节点任务
-                getNext(roleListSecond, jgScrapCancel.getInstanceId(), taskName);
-
-                String join = String.join(",", roleListSecond);
-//                jgScrapCancel.setStatus(taskName[0]);
-                if (!ObjectUtils.isEmpty(jgScrapCancel.getInstanceStatus())) {
-                    jgScrapCancel.setInstanceStatus(jgScrapCancel.getInstanceStatus() + "," + join);
-                } else {
-                    jgScrapCancel.setInstanceStatus(String.join(",", roleListSecond));
-                }
-                jgScrapCancel.setPromoter(RequestContext.getExeUserId());
-                jgScrapCancel.setNextExecuteIds(String.join(",", roleListSecond));
-                jgScrapCancel.setAuditStatus(String.valueOf(WorkFlowStatusEnum.CANCEL_RECEIVE.getPass()));
-                this.updateById(jgScrapCancel);
-            }
-            if (!instancedId) {
-                HashMap<String, Object> map = new HashMap<>();
-                map.put("relationId", jgScrapCancelDto.getInstanceId());
-                map.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
-                map.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
-                updateTaskModel(map);
-            }
-
-            TaskV2Model taskV2Model = new TaskV2Model();
-            //获取待办任务执行人
-            List<AgencyUserModel> userList = Privilege.agencyUserClient
-                    .queryByRoleId(jgScrapCancel.getNextExecuteIds(), null, Boolean.FALSE).getResult();
-            List<String> userIds = userList.stream().map(AgencyUserModel::getUserId).collect(Collectors.toList());
-            taskV2Model.setExecuteUserIds(CollectionUtils.isEmpty(userIds) ? "" : String.join(",", userIds));
-            taskV2Model.setExtras(JSON.toJSONString(jgScrapCancel));
-            taskV2Model.setRelationId(jgScrapCancel.getInstanceId());
-            taskV2Model.setTaskType("scrapCancel");
-            taskV2Model.setTaskTypeLabel("注销报废");
-            String url = getUrl(taskV2Model.getTaskType(), "look");
-            String format = String.format(url, jgScrapCancel.getSequenceNbr(), jgScrapCancel.getNextExecuteIds(),
-                    jgScrapCancel.getNextExecuteIds(), jgScrapCancel.getAuditStatus(), jgScrapCancel.getInstanceId());
-            taskV2Model.setRoutePath(format);
-
-
-            taskV2Model.setTaskTitle(jgScrapCancel.getStatus());
-            taskV2Model.setTaskName(jgScrapCancel.getStatus());
-            taskV2Model.setTaskStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode());
-            taskV2Model.setTaskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
-            taskV2Model.setTaskCode(jgScrapCancel.getApplyNo());
-            buildTaskModel(taskV2Model);
         } else {
+            //更新操作
             JgScrapCancel bean = new JgScrapCancel();
             BeanUtils.copyProperties(jgScrapCancelDto, bean);
             this.updateById(bean);
@@ -391,12 +407,61 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         return jgScrapCancelDto;
     }
 
+    private void executeOneStep(JgScrapCancelDto jgScrapCancelDto, String taskName, String nextUserIds, String operate) {
+        ReginParams reginParams = this.getSelectedOrgInfo();
+        // 先更新之前的待办
+        TaskV2Model taskV2Model = updateTaskModel(jgScrapCancelDto, operate);
+        taskV2Model.setTaskDesc("");
+        taskV2Model.setTaskContent(this.buildTaskContent(jgScrapCancelDto.getCancelType(), jgScrapCancelDto.getApplyNo()));
+        taskV2Model.setTaskName(taskName);
+        taskV2Model.setTaskDesc("");
+        taskV2Model.setTaskCode(jgScrapCancelDto.getApplyNo());
+        taskV2Model.setExecuteUserIds(nextUserIds);
+        taskV2Model.setRelationId(jgScrapCancelDto.getInstanceId());
+        FlowStatusEnum flowStatusEnum = this.getTaskStatus(operate);
+        taskV2Model.setTaskStatus(flowStatusEnum.getCode());
+        taskV2Model.setTaskStatusLabel(flowStatusEnum.getName());
+        taskV2Model.setFlowStatus(this.getTaskStatusByName(jgScrapCancelDto.getAuditStatus()));
+        taskV2Model.setFlowStatusLabel(jgScrapCancelDto.getAuditStatus());
+        taskV2Model.setTaskType(BusinessTypeEnum.JG_NAME_CHANGE_REGISTRATION.getCode());
+        taskV2Model.setStartUser(reginParams.getUserModel().getUserName());
+        taskV2Model.setTaskTypeLabel(BusinessTypeEnum.JG_NAME_CHANGE_REGISTRATION.getName());
+        taskV2Model.setStartDate(jgScrapCancelDto.getCreateDate());
+        taskV2Model.setStartUserId(jgScrapCancelDto.getCreateUserId());
+        taskV2Model.setStartUserCompanyName(jgScrapCancelDto.getUseUnitName());
+        taskV2Model.setExecuteUserIds(nextUserIds);
+        TaskModelDto modelDto = new TaskModelDto();
+        BeanUtil.copyProperties(taskV2Model, modelDto);
+        modelDto.setNextExecuteUser(jgScrapCancelDto.getNextExecuteIds());
+        modelDto.setModel(jgScrapCancelDto);
+        // 再插入新代办、数据待定
+        commonService.buildTaskModel(Collections.singletonList(modelDto));
+    }
+
+    private Integer getTaskStatusByName(String auditStatus) {
+        return commonService.getDictionaryCodeByName(auditStatus);
+    }
+
+    private TaskV2Model updateTaskModel(JgScrapCancelDto jgScrapCancelDto, String operate) {
+        Map<String, Object> params = new HashMap<>();
+        FlowStatusEnum flowStatusEnum = this.getTaskStatus(operate);
+        params.put("relationId", jgScrapCancelDto.getInstanceId());
+        params.put("taskStatus", flowStatusEnum.getCode());
+        params.put("taskStatusLabel", flowStatusEnum.getName());
+        params.put("flowStatus", this.getTaskStatusByName(jgScrapCancelDto.getAuditStatus()));
+        params.put("flowStatusLabel", jgScrapCancelDto.getAuditStatus());
+        return commonService.updateTaskModel(params);
+    }
 
-    public boolean submit(JgScrapCancel notice, String op) {
+    private FlowStatusEnum getTaskStatus(String operate) {
+        if ("0".equals(operate)) {
+            return FlowStatusEnum.TO_BE_FINISHED;
+        } else {
+            return FlowStatusEnum.REJECTED;
+        }
+    }
 
-        AjaxResult ajaxResult = Workflow.taskClient.getTask(notice.getInstanceId());
-        JSONObject dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
-        String taskId = dataObject.getString("id");
+    public ProcessTaskDTO submit(String op, String taskId) {
         //组装信息
         TaskResultDTO dto = new TaskResultDTO();
         dto.setResultCode("approvalStatus");
@@ -405,43 +470,9 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         HashMap<String, Object> map = new HashMap<>();
         map.put("approvalStatus", op);
         dto.setVariable(map);
-        //执行流程
-        AjaxResult ajaxResult1 = null;
-        try {
-            ajaxResult1 = Workflow.taskClient.completeByTask(taskId, dto);
-            if (ajaxResult1.get("code").equals(200)) {
-                return true;
-            } else {
-                return false;
-            }
-        } catch (Exception e) {
-            log.error("提交失败：{}", e);
-            return false;
-        }
+        return cmWorkflowService.complete(taskId, dto);
     }
 
-    void getNext(ArrayList<String> roleListFirst, String instanceId, String[] taskName) {
-        AjaxResult aj = Workflow.taskClient.getTaskNoAuth(instanceId);
-        JSONObject taskNoAuth = JSON.parseObject(JSON.toJSONString(aj.get("data")));
-        if (!ObjectUtils.isEmpty(taskNoAuth)) {
-            String nextTaskId = taskNoAuth.getString("id");
-            AjaxResult taskGroupName = Workflow.taskClient.getTaskGroupName(nextTaskId);
-            taskName[0] = taskNoAuth.getString("name");
-            JSONArray data = JSON.parseArray(JSON.toJSONString(taskGroupName.get("data")));
-            for (Object datum : data) {
-                if (((Map) datum).containsKey("groupId")) {
-                    roleListFirst.add(((Map) datum).get("groupId").toString());
-                }
-            }
-        }
-    }
-
-    @Autowired
-    IdxBizJgRegisterInfoMapper idxBizJgRegisterInfoMapper;
-
-    @Autowired
-    IIdxBizJgRegisterInfoService idxBizJgRegisterInfoService;
-
     public Map<String, Object> queryBySequenceNbr(Long sequenceNbr) {
         // 安装告知信息
         JgScrapCancel notice = this.baseMapper.selectById(sequenceNbr);
@@ -450,7 +481,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         }
         Map<String, Object> installationInfo = BeanUtil.beanToMap(notice);
         installationInfo.put("receiveOrgCode", notice.getReceiveOrgCode() + "_" + notice.getReceiveOrgName());
-        installationInfo.put("cancelCertificateList", JSON.parseArray(installationInfo.get("cancelCertificate").toString()));
+        installationInfo.put("cancelCertificateList", parseArray(installationInfo.get("cancelCertificate").toString()));
         LambdaQueryWrapper<JgScrapCancelEq> lambdaEq = new QueryWrapper<JgScrapCancelEq>().lambda();
         lambdaEq.eq(JgScrapCancelEq::getEquipTransferId, sequenceNbr);
         JgScrapCancelEq jgScrapCancelEq = jgScrapCancelEqMapper.selectOne(lambdaEq);
@@ -463,67 +494,42 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         IdxBizJgRegisterInfo one = idxBizJgRegisterInfoMapper.selectOne(queryWrapper);
         installationInfo.put("equCode", one.getEquCode());
         Map<String, Object> detailFieldCamelCaseByRecord = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(jgScrapCancelEq.getEquId());
-//        Map<String, Object> equipmentInfos = this.baseMapper.queryEquipInformation(sequenceNbr);
         BeanUtil.copyProperties(installationInfo, detailFieldCamelCaseByRecord);
         return new HashMap<String, Object>() {{
-            this.put("jgScrapCancelAdd", detailFieldCamelCaseByRecord);
+            this.put(PAGE_KEY, detailFieldCamelCaseByRecord);
         }};
     }
 
 
+    @Transactional
     public void revocation(String instanceId) {
-        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
-//        String taskName = "";
-        String taskCode = FlowStatusEnum.TO_BE_FINISHED.getName();
+        ReginParams reginParams = this.getSelectedOrgInfo();
         JgScrapCancel jgScrapCancel = new JgScrapCancel();
         LambdaQueryWrapper<JgScrapCancel> lambda = new QueryWrapper<JgScrapCancel>().lambda();
         lambda.eq(JgScrapCancel::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")));
-//            taskName = nextTask.getString("name");
-            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 processTaskDTO = cmWorkflowService.rollBack(instanceId);
+        WorkflowResultDto workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
+        if (!FlowStatusEnum.TO_BE_FINISHED.getName().equals(workflowResultDto.getNextTaskName())) {
+            jgScrapCancel.setAuditStatus(WorkFlowStatusEnum.getMessage(workflowResultDto.getNextTaskCode()).getRollBack());
         }
-        if (!FlowStatusEnum.TO_BE_FINISHED.getName().equals(taskCode)) {
-            jgScrapCancel.setAuditStatus(WorkFlowStatusEnum.getMessage(taskCode).getRollBack());
-        }
-
-        HashMap<String, Object> map = new HashMap<>();
-        map.put("relationId", instanceId);
-        map.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
-        map.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
-        map.put("isDelete", Boolean.TRUE);
-        updateTaskModel(map);
-        String join = String.join(",", roleList);
+        jgScrapCancel.setNextTaskId(workflowResultDto.getNextTaskId());
         jgScrapCancel.setPromoter(reginParams.getUserModel().getUserId());
-        jgScrapCancel.setNextExecuteIds(join);
+        jgScrapCancel.setNextExecuteIds(Objects.isNull(workflowResultDto) ? null : workflowResultDto.getNextExecutorRoleIds());
         this.update(jgScrapCancel, lambda);
+
+        // 删除待办
+        JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(jgScrapCancel));
+        jsonObject.put("nextTaskId", jgScrapCancel.getNextTaskId());
+        jsonObject.put("nextExecuteUser", jgScrapCancel.getNextExecuteIds());
+        jsonObject.put("taskType", businessTypeJudgment(jgScrapCancel.getCancelType()).getCode());
+        commonService.rollbackTask(instanceId, jsonObject);
     }
 
 
     public void flowExecute(Long id, String instanceId, String operate, String comment) {
         try {
             JgScrapCancel jgScrapCancel = this.getBaseMapper().selectById(id);
-            JSONObject task = workFlowFeginService.getTaskNoAuth(instanceId);
-            JSONObject taskMessage = JSON.parseObject(JSON.toJSONString(task.get("data")));
-            String taskId = taskMessage.getString("id");
+            String taskId = jgScrapCancel.getNextTaskId();
             //组装信息
             TaskResultDTO dto = new TaskResultDTO();
             dto.setResultCode("approvalStatus");
@@ -538,181 +544,101 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             }
             dto.setVariable(map);
             //执行流程
-            Workflow.taskClient.completeByTask(taskId, dto);
+            ProcessTaskDTO processTaskDTO = cmWorkflowService.complete(taskId, dto);
+            // 更新下一步执行人、创建待办
+            updateExecuteIds(instanceId, id, operate, processTaskDTO);
         } catch (Exception e) {
             e.printStackTrace();
         }
-        // 更新下一步执行人
-        updateExecuteIds(instanceId, id, operate);
-
     }
 
 
-    public void updateExecuteIds(String instanceId, Long sequenceNbr, String operate) {
-        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
-        String role = "";
-//        String taskName = "流程结束";
+    public void updateExecuteIds(String instanceId, Long sequenceNbr, String operate, ProcessTaskDTO processTaskDTO) {
+        List<String> roleListNext = new ArrayList<>();
+        List<String> roleListAll = new ArrayList<>();
         String taskCode = FlowStatusEnum.TO_BE_FINISHED.getName();
-        ArrayList<String> roleList = new ArrayList<>();
+        String taskName = "";
+        String nextTaskId = "";
         JgScrapCancel jgScrapCancel = 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 (processTaskDTO != null && processTaskDTO.getNextTask() != null && processTaskDTO.getNextTask().size() > 0) {
+            taskCode = processTaskDTO.getNextTask().get(0).getKey();
+            taskName = processTaskDTO.getNextTask().get(0).getName();
+            nextTaskId = processTaskDTO.getNextTask().get(0).getId();
         }
         if (!FlowStatusEnum.TO_BE_FINISHED.getName().equals(taskCode)) {
-            role = String.join(",", roleList);
-            jgScrapCancel.setNextExecuteIds(role);
-            jgScrapCancel.setPromoter(reginParams.getUserModel().getUserId());
+            this.buildRoleList(Collections.singletonList(processTaskDTO), roleListNext, roleListAll);
+            List<WorkflowResultDto> workflowResultDtos = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO));
+            String nextUserIds = workflowResultDtos.get(0).getNextExecutorUserIds();
+            jgScrapCancel.setNextExecuteIds(String.join(",", roleListNext));
+            jgScrapCancel.setPromoter(RequestContext.getExeUserId());
             jgScrapCancel.setInstanceId(instanceId);
+            jgScrapCancel.setNextTaskId(nextTaskId);
             if (!ObjectUtils.isEmpty(jgScrapCancel.getInstanceStatus())) {
-                jgScrapCancel.setInstanceStatus(jgScrapCancel.getInstanceStatus() + "," + role);
+                jgScrapCancel.setInstanceStatus(jgScrapCancel.getInstanceStatus() + "," + String.join(",", roleListNext));
             } else {
-                jgScrapCancel.setInstanceStatus(role);
+                jgScrapCancel.setInstanceStatus(String.join(",", roleListNext));
             }
             if ("0".equals(operate)) {
                 // 通过操作
                 jgScrapCancel.setAuditStatus(WorkFlowStatusEnum.getMessage(taskCode).getPass());
-
-                HashMap<String, Object> map = new HashMap<>();
-                map.put("relationId", instanceId);
-                map.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
-                map.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
-                updateTaskModel(map);
             } else {
                 // 驳回操作
                 jgScrapCancel.setAuditStatus(WorkFlowStatusEnum.getMessage(taskCode).getReject());
                 jgScrapCancel.setPromoter(null);
-
-                HashMap<String, Object> map = new HashMap<>();
-                map.put("relationId", instanceId);
-                map.put("taskStatus", FlowStatusEnum.REJECTED.getCode());
-                map.put("taskStatusLabel", FlowStatusEnum.REJECTED.getName());
-                TaskV2Model taskV2ModelOld = updateTaskModel(map);
-                TaskV2Model taskV2Model = new TaskV2Model();
-                //taskV2Model.setExecuteUserIds(taskV2ModelOld.getCreateUserId());
-                taskV2Model.setExtras(JSON.toJSONString(jgScrapCancel));
-                taskV2Model.setRelationId(instanceId);
-                taskV2Model.setTaskType("scrapCancel");
-                taskV2Model.setTaskTypeLabel("注销报废");
-                String url = getUrl(taskV2Model.getTaskType(), "edit");
-                String format = String.format(url, jgScrapCancel.getSequenceNbr(), jgScrapCancel.getNextExecuteIds(),
-                        jgScrapCancel.getNextExecuteIds(), jgScrapCancel.getAuditStatus(), "", instanceId);
-                taskV2Model.setRoutePath(format);
-                taskV2Model.setTaskTitle(jgScrapCancel.getStatus());
-                taskV2Model.setTaskName(jgScrapCancel.getStatus());
-                taskV2Model.setTaskStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode());
-                taskV2Model.setTaskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
-                taskV2Model.setTaskCode(jgScrapCancel.getApplyNo());
-                buildTaskModel(taskV2Model);
             }
+            JgScrapCancelDto scrapCancelDto = new JgScrapCancelDto();
+            BeanUtils.copyProperties(jgScrapCancel, scrapCancelDto);
+            // 更新上一步待办、创建待办
+            executeOneStep(scrapCancelDto, taskName, nextUserIds, operate);
         } else {
-
-            LambdaQueryWrapper<JgScrapCancelEq> lambdaEq = new QueryWrapper<JgScrapCancelEq>().lambda();
-            lambdaEq.eq(JgScrapCancelEq::getEquipTransferId, sequenceNbr);
-            JgScrapCancelEq jgScrapCancelEq = jgScrapCancelEqMapper.selectOne(lambdaEq);
-
-            ResponseModel<String> responseModel = tzsServiceFeignClient.useRegistrationCode(idxBizJgOtherInfoMapper.getSupervisoryCodeByEquipmentCode(jgScrapCancelEq.getEquId()));
-            String newUseRegistrationCertificateNumber = responseModel.getResult().split("-")[0];
-
-            Map<String, Map<String, Object>> resultMap = new HashMap<>();
-            Map<String, Object> map1 = new HashMap<>();
-            map1.put("USE_ORG_CODE", newUseRegistrationCertificateNumber);
-            if (CancelTypeEnum.SCRAPPED.getCode().equals(jgScrapCancel.getCancelType())) {
-                IdxBizJgUseInfo idxBizJgUseInfo = new IdxBizJgUseInfo();
-                idxBizJgUseInfo.setEquState(String.valueOf(EquimentEnum.BAOFEI.getCode()));
-                LambdaQueryWrapper<IdxBizJgUseInfo> wrapper = new LambdaQueryWrapper<>();
-                wrapper.eq(IdxBizJgUseInfo::getRecord, jgScrapCancelEq.getEquId());
-                idxBizJgUseInfoMapper.update(idxBizJgUseInfo, wrapper);
-                map1.put("EQU_STATE", String.valueOf(EquimentEnum.BAOFEI.getCode()));
-            } else {
-                SuperviseInfo superviseInfo = new SuperviseInfo();
-                superviseInfo.setOrgBranchCode("");
-                superviseInfo.setOrgBranchName("");
-                LambdaQueryWrapper<SuperviseInfo> wrapper = new LambdaQueryWrapper<>();
-                wrapper.eq(SuperviseInfo::getRecord, jgScrapCancelEq.getEquId());
-                superviseInfoMapper.update(superviseInfo, wrapper);
-                map1.put("ORG_BRANCH_CODE", "");
-                map1.put("ORG_BRANCH_NAME", "");
-            }
-            resultMap.put(jgScrapCancelEq.getEquId(), map1);
-            try {
-                tzsServiceFeignClient.commonUpdateEsDataByIds(resultMap);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
             jgScrapCancel.setAuditStatus(FlowStatusEnum.TO_BE_FINISHED.getName());
             jgScrapCancel.setAuditPassDate(new Date());
+            // 修改业务信息
+            updateInfoOther(jgScrapCancel);
+            JgScrapCancelDto scrapCancelDto = new JgScrapCancelDto();
+            BeanUtils.copyProperties(jgScrapCancel, scrapCancelDto);
+            // 更新代办
+            updateTaskModel(scrapCancelDto, operate);
         }
         this.getBaseMapper().updateById(jgScrapCancel);
-
     }
 
-    public TaskV2Model updateTaskModel(Map<String, Object> params) {
-        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
-
-        List<TaskV2Model> result = Systemctl.taskV2Client.selectListByRelationId(params.get("relationId").toString()).getResult();
-        TaskV2Model model = result.stream().sorted((r1, r2) -> r2.getCreateDate().compareTo(r1.getCreateDate())) // 按时间降序排序
-                .findFirst()
-                .orElse(null);
-        model.setTaskStatus(Integer.valueOf(params.get("taskStatus").toString()));
-        model.setRoutePath(model.getRoutePath().replace("nextExecuteIds", "nextExecuteIdsOld"));
-        model.setTaskStatusLabel(params.get("taskStatusLabel").toString());
-        model.setEndDate(new Date());
-        //model.setFinishStatus(Boolean.TRUE);
-        model.setEndUserId(reginParams.getUserModel().getUserId());
-        if (params.containsKey("isDelete")) {
-            Systemctl.taskV2Client.delete(model.getSequenceNbr().toString());
+    public void updateInfoOther(JgScrapCancel jgScrapCancel) {
+        LambdaQueryWrapper<JgScrapCancelEq> lambdaEq = new QueryWrapper<JgScrapCancelEq>().lambda();
+        lambdaEq.eq(JgScrapCancelEq::getEquipTransferId, jgScrapCancel.getSequenceNbr());
+        JgScrapCancelEq jgScrapCancelEq = jgScrapCancelEqMapper.selectOne(lambdaEq);
+
+        ResponseModel<String> responseModel = tzsServiceFeignClient.useRegistrationCode(idxBizJgOtherInfoMapper.getSupervisoryCodeByEquipmentCode(jgScrapCancelEq.getEquId()));
+        String newUseRegistrationCertificateNumber = responseModel.getResult().split("-")[0];
+
+        Map<String, Map<String, Object>> resultMap = new HashMap<>();
+        Map<String, Object> map1 = new HashMap<>();
+        map1.put("USE_ORG_CODE", newUseRegistrationCertificateNumber);
+        if (CancelTypeEnum.SCRAPPED.getCode().equals(jgScrapCancel.getCancelType())) {
+            IdxBizJgUseInfo idxBizJgUseInfo = new IdxBizJgUseInfo();
+            idxBizJgUseInfo.setEquState(String.valueOf(EquimentEnum.BAOFEI.getCode()));
+            LambdaQueryWrapper<IdxBizJgUseInfo> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(IdxBizJgUseInfo::getRecord, jgScrapCancelEq.getEquId());
+            idxBizJgUseInfoMapper.update(idxBizJgUseInfo, wrapper);
+            map1.put("EQU_STATE", String.valueOf(EquimentEnum.BAOFEI.getCode()));
         } else {
-            Systemctl.taskV2Client.update(model, model.getSequenceNbr());
+            SuperviseInfo superviseInfo = new SuperviseInfo();
+            superviseInfo.setOrgBranchCode("");
+            superviseInfo.setOrgBranchName("");
+            LambdaQueryWrapper<SuperviseInfo> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(SuperviseInfo::getRecord, jgScrapCancelEq.getEquId());
+            superviseInfoMapper.update(superviseInfo, wrapper);
+            map1.put("ORG_BRANCH_CODE", "");
+            map1.put("ORG_BRANCH_NAME", "");
         }
-        return model;
-    }
-
-    public void buildTaskModel(TaskV2Model model) {
-        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
-        model.setStartDate(new Date());
-        model.setStartUserId(reginParams.getUserModel().getUserId());
-        model.setTaskSource("workFlow");
-        model.setCreateDate(new Date());
-        //model.setFinishStatus(Boolean.FALSE);
-        //model.setCreateUserId(reginParams.getUserModel().getUserId());
-        model.setAgencyCode(reginParams.getUserModel().getAgencyCode());
-        model.setTaskTitle(reginParams.getUserModel().getRealName() + "发起了" + model.getTaskTitle());
-        Systemctl.taskV2Client.create(model);
-    }
-
-    private String getUrl(String type, String pageType) {
-        String json = null;
+        resultMap.put(jgScrapCancelEq.getEquId(), map1);
         try {
-            json = IOUtils.toString(bizTypeInfo.getInputStream(), java.lang.String.valueOf(StandardCharsets.UTF_8));
-        } catch (IOException e) {
+            tzsServiceFeignClient.commonUpdateEsDataByIds(resultMap);
+        } catch (Exception 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;
+        jgScrapCancel.setAuditStatus(FlowStatusEnum.TO_BE_FINISHED.getName());
+        jgScrapCancel.setAuditPassDate(new Date());
     }
+
 }
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/json/urlInfo.json

@@ -165,12 +165,12 @@
     "type": "113-2",
     "pageType": "look",
     "name": "注销报废",
-    "url": "/mixuap?appId=1742358052905971713&id=1737357871097606146&sequenceNbr=%s&roleIds=%s&userId={userId}&nextExecuteIds=%s&formType=detail&noticeStatus=%s&instanceId=%s"
+    "url": "/mixuap?appId=1742358052905971713&id=1737357871097606146&roleIds={roleIds}&userId={userId}&pageType=look"
   },
   {
     "type": "113-2",
     "pageType": "edit",
     "name": "注销报废",
-    "url": "/mixuap?appId=1742358052905971713&id=1737358169170014210&sequenceNbr=%s&roleIds=%s&userId={userId}&nextExecuteIds=%s&formType=edit&noticeStatus=%s&instanceId=%s"
+    "url": "/mixuap?appId=1742358052905971713&id=1737358169170014210&roleIds={roleIds}&userId={userId}&pageType=edit"
   }
 ]
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/enums/ApplicationFormTypeEnum.java

@@ -5,6 +5,7 @@ import lombok.Getter;
 
 /**
  * 申请单枚举
+ *
  * @author LiuLin
  */
 
@@ -14,21 +15,21 @@ public enum ApplicationFormTypeEnum {
     /**
      * 申请单枚举
      */
-    AZGZ("AZGZ","GZ_AZ"),//安装告知
-    WBBA("WBBA","WB_BA"),//维保备案
-    SYDJ("SYDJ","DJ_SY"),//使用登记
-    SBYJ("SBYJ","SB_YJ"),//设备移交
-    GZGZ("GZGZ","GZ_GZ"),//改造告知
-    WXGZ("WXGZ","GZ_WX"),//维修告知
-    YZGZ("YZGZ","GZ_YZ"),//移装告知
-    GZBG("GZBG","DJ_GZ"),//改造变更登记
-    YZBG("YZBG","DJ_YZ"),//移装变更登记
-    DWBG("DWBG","DJ_DW"),//单位变更登记
-    JY("JY",""),
-    JG("JG",""),// 检验结果
-    SBZX("SBZX","BF_YZ"),//电梯（设备）注销
-    GMBG("GMBG","DJ_GM"),//更名变更
-    TYQY("TYQY","SB_QY")//停用启用
+    AZGZ("AZGZ", "GZ_AZ"),//安装告知
+    WBBA("WBBA", "WB_BA"),//维保备案
+    SYDJ("SYDJ", "DJ_SY"),//使用登记
+    SBYJ("SBYJ", "SB_YJ"),//设备移交
+    GZGZ("GZGZ", "GZ_GZ"),//改造告知
+    WXGZ("WXGZ", "GZ_WX"),//维修告知
+    YZGZ("YZGZ", "GZ_YZ"),//移装告知
+    GZBG("GZBG", "DJ_GZ"),//改造变更登记
+    YZBG("YZBG", "DJ_YZ"),//移装变更登记
+    DWBG("DWBG", "DJ_DW"),//单位变更登记
+    JY("JY", ""),
+    JG("JG", ""),// 检验结果
+    SBZX("SBZX", "BF_ZX"),//电梯（设备）注销
+    GMBG("GMBG", "DJ_GM"),//更名变更
+    TYQY("TYQY", "SB_QY")//停用启用
     ;
 
     /**