Merge branch 'develop_tzs_register' of…

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

@@ -256,7 +256,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
             dto.setChangeCertificate(null);
             taskModelDto.setModel(dto);
             //摘要 按原有规则组装
-            taskModelDto.setTaskContent("来自"+dto.getUseUnitCreditCode()+"【"+dto.getReceiveOrgName()+"】的业务办理,【申请单号:"+dto.getApplyNo()+"】");
+            taskModelDto.setTaskContent(buildTaskContent(dto) + "待提交");
             //申请单号
             taskModelDto.setTaskCode(dto.getApplyNo());
             //业务类型枚举code值

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgChangeRegistrationReformServiceImpl.java

@@ -205,7 +205,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
 
         if (!ObjectUtils.isEmpty(map.get("submit"))) {
             String instanceId = "";
-            if (!ObjectUtils.isEmpty(jgChangeRegistrationReform.getSequenceNbr())&&!ObjectUtils.isEmpty(jgChangeRegistrationReform.getInstanceId())) {
+            if (!ObjectUtils.isEmpty(jgChangeRegistrationReform.getSequenceNbr()) && !ObjectUtils.isEmpty(jgChangeRegistrationReform.getInstanceId())) {
                 // 如果是旧流程则执行一步
                 flowExecute(jgChangeRegistrationReform.getSequenceNbr(), jgChangeRegistrationReform.getInstanceId(), "0", "");
 //                updateExecuteIds(instanceId, jgChangeRegistrationReform.getSequenceNbr(), "0");
@@ -260,15 +260,15 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         jgChangeRegistrationReform.setNextExecutorIds(workflowResultDto.getNextExecutorRoleIds());
         jgChangeRegistrationReform.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
         String nextTaskid = Optional.ofNullable(workflowResultDto.getNextTaskId()).orElse("");
-        String taskCode =FlowStatusEnum.TO_BE_FINISHED.getName();
-        if(!ObjectUtils.isEmpty(workflowResultDto.getNextTaskCode())){
-           taskCode = Optional.ofNullable(workflowResultDto.getNextTaskCode()).orElse("");
+        String taskCode = FlowStatusEnum.TO_BE_FINISHED.getName();
+        if (!ObjectUtils.isEmpty(workflowResultDto.getNextTaskCode())) {
+            taskCode = Optional.ofNullable(workflowResultDto.getNextTaskCode()).orElse("");
         }
-        String role =Optional.ofNullable(workflowResultDto.getNextExecutorRoleIds()).orElse("");
-        if(operate.equals("startWorkfow")){
-            role =Optional.ofNullable(workflowResultDto.getExecutorRoleIds()).orElse("")+","+Optional.ofNullable(workflowResultDto.getNextExecutorRoleIds()).orElse("");
+        String role = Optional.ofNullable(workflowResultDto.getNextExecutorRoleIds()).orElse("");
+        if (operate.equals("startWorkfow")) {
+            role = Optional.ofNullable(workflowResultDto.getExecutorRoleIds()).orElse("") + "," + Optional.ofNullable(workflowResultDto.getNextExecutorRoleIds()).orElse("");
             operate = "0";
-            instanceId =workflowResultDto.getInstanceId();
+            instanceId = workflowResultDto.getInstanceId();
             updateTodoAndCreate = Boolean.FALSE;
         }
         if (!FlowStatusEnum.TO_BE_FINISHED.getName().equals(taskCode)) {
@@ -291,13 +291,13 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
                 jgChangeRegistrationReform.setStatus(WorkFlowStatusEnum.getMessage(taskCode).getReject());
                 jgChangeRegistrationReform.setPromoter("");
             }
-            if(updateTodoAndCreate) {
+            if (updateTodoAndCreate) {
                 // 上个代办改为已办
                 HashMap<String, Object> map = new HashMap<>();
-                if("0".equals(operate)){
+                if ("0".equals(operate)) {
                     map.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
                     map.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
-                }else {
+                } else {
                     map.put("taskStatus", FlowStatusEnum.REJECTED.getCode());
                     map.put("taskStatusLabel", FlowStatusEnum.REJECTED.getName());
                 }
@@ -307,7 +307,13 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
                 TaskV2Model taskV2Model = commonServiceImpl.updateTaskModel(map);
                 TaskModelDto taskModelDto = new TaskModelDto();
                 BeanUtils.copyProperties(taskV2Model, taskModelDto);
+                taskModelDto.setTaskName(workflowResultDto.getNextTaskName());
+                taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
+                taskModelDto.setTaskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
                 taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
+                if (WorkFlowStatusEnum.CHANGE_SUBMIT.getCode().equals(taskCode) && "1".equals(operate)) {
+                    taskModelDto.setPageType("edit");
+                }
                 // 创建新的代办
                 taskModelDto.setModel(conveterTaskMessageDTO(jgChangeRegistrationReform));
                 commonServiceImpl.buildTaskModel(Collections.singletonList(taskModelDto));
@@ -327,7 +333,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             map.put("flowStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
             map.put("relationId", jgChangeRegistrationReform.getInstanceId());
             jgChangeRegistrationReform.setNextExecuteUserIds("");
-            map.put("model",conveterTaskMessageDTO(jgChangeRegistrationReform));
+            map.put("model", conveterTaskMessageDTO(jgChangeRegistrationReform));
             commonServiceImpl.updateTaskModel(map);
         }
         this.getBaseMapper().updateById(jgChangeRegistrationReform);
@@ -352,7 +358,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
                 map.put("approvalStatus", "提交");
             }
             dto.setVariable(map);
-            dto.setNextExecuteUserCompanyCode(getNextUserOrgCode(operate,jgChangeRegistrationReform));
+            dto.setNextExecuteUserCompanyCode(getNextUserOrgCode(operate, jgChangeRegistrationReform));
             //执行流程
             processTaskDTO = iCmWorkflowService.complete(taskId, dto);
         } catch (Exception e) {
@@ -365,8 +371,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
 
     public void withdraw(String instanceId) {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
-        JgChangeRegistrationReform jgChangeRegistrationReform = this.getBaseMapper().selectOne(new QueryWrapper<JgChangeRegistrationReform>().eq("instance_id",instanceId));
-        ArrayList<String> roleList = new ArrayList<>();
+        JgChangeRegistrationReform jgChangeRegistrationReform = this.getBaseMapper().selectOne(new QueryWrapper<JgChangeRegistrationReform>().eq("instance_id", instanceId));
         ProcessTaskDTO processTaskDTO = iCmWorkflowService.rollBack(instanceId);
         WorkflowResultDto workflowResultDto = conveterProcessTaskDTO2WorkflowResultDto(processTaskDTO);
         String taskCode = Optional.ofNullable(workflowResultDto.getNextTaskCode()).orElse("");
@@ -386,16 +391,14 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         jsonObject.put("flowStatusLabel", jgChangeRegistrationReform.getAuditStatus());
         jsonObject.put("nextTaskId", jgChangeRegistrationReform.getNextTaskId());
         jsonObject.put("nextExecuteUser", jgChangeRegistrationReform.getNextExecutorIds());
-        jsonObject.put("taskType",BusinessTypeEnum.JG_RENOVATION_REGISTRATION.getCode());
-        jsonObject.put("taskCode",taskCode);
-        jsonObject.put("instanceId",instanceId);
-        jsonObject.put("pageType","look");
+        jsonObject.put("taskType", BusinessTypeEnum.JG_RENOVATION_REGISTRATION.getCode());
+        jsonObject.put("pageType", "look");
         //如果创建人等于当前人则打开编辑页面
-        if(taskCode.equals(WorkFlowStatusEnum.CHANGE_SUBMIT.getCode())){
-            jsonObject.put("pageType","edit");
+        if (taskCode.equals(WorkFlowStatusEnum.CHANGE_SUBMIT.getCode())) {
+            jsonObject.put("pageType", "edit");
         }
-        jsonObject.put("model",conveterTaskMessageDTO(jgChangeRegistrationReform));
-        commonServiceImpl.rollbackTask(instanceId,jsonObject);
+        jsonObject.put("model", conveterTaskMessageDTO(jgChangeRegistrationReform));
+        commonServiceImpl.rollbackTask(instanceId, jsonObject);
     }
 
     public void deleteBatch(List<Long> ids) {
@@ -427,7 +430,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             originalData = idxBizJgRegisterInfoService.getDetailByRecord(equipId);
             originalDataOther = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(equipId);
             detail.putAll(originalDataOther);
-            detail.put("techInfo",originalData);
+            detail.put("techInfo", originalData);
         } else {
             JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryMapper.selectOne(new QueryWrapper<JgRegistrationHistory>()
                     .eq("equ_id", equipId)
@@ -484,7 +487,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             String newData = jgRegistrationHistory.getChangeData();
             //将历史数据更新到技术参数表中
             JSONObject allData = JSONObject.parseObject(newData);
-            Map<String,Object> techInfo = (Map<String, Object>) allData.get("techInfo");
+            Map<String, Object> techInfo = (Map<String, Object>) allData.get("techInfo");
             IdxBizJgTechParamsElevator idxBizJgTechParamsElevatorNew = JSONObject.parseObject(JSONObject.toJSONString(techInfo), IdxBizJgTechParamsElevator.class);
             BeanUtil.copyProperties(idxBizJgTechParamsElevatorNew, idxBizJgTechParamsElevator, "sequenceNbr", "record");
             idxBizJgTechParamsElevatorMapper.updateById(idxBizJgTechParamsElevator);
@@ -659,27 +662,37 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
      */
     public String getSummaryInfo(JgChangeRegistrationReform jgChangeRegistrationReform) {
         String result = "来自%s【%s】的业务办理，【申请单号：%s】";
-        return String.format(result,Optional.ofNullable(jgChangeRegistrationReform.getEquipListName()).orElse("无"), jgChangeRegistrationReform.getSupervisoryCode(), jgChangeRegistrationReform.getApplyNo());
+        return String.format(result, Optional.ofNullable(jgChangeRegistrationReform.getEquipListName()).orElse("无"), jgChangeRegistrationReform.getSupervisoryCode(), jgChangeRegistrationReform.getApplyNo());
     }
 
     /**
      * 构建工作台待办实体类
+     *
      * @param jgChangeRegistrationReform
      * @param processTaskDTO
      * @return
      */
     public TaskModelDto getTaskModelDtoList(JgChangeRegistrationReform jgChangeRegistrationReform, ProcessTaskDTO processTaskDTO) {
         //设置实体无需字段为空
-        jgChangeRegistrationReform.setTransformationQualityCertificate(null);
-        jgChangeRegistrationReform.setRenovationSupervisioninspectionCertificate(null);
-        jgChangeRegistrationReform.setRegDate(null);
-        jgChangeRegistrationReform.setCreateDate(null);
-        jgChangeRegistrationReform.setAuditPassDate(null);
-        jgChangeRegistrationReform.setInputUnitNo(null);
         TaskModelDto taskModelDto = new TaskModelDto();
-        if(ObjectUtils.isEmpty(processTaskDTO)){
+        if (ObjectUtils.isEmpty(processTaskDTO)) {
+
+            //taskCode 使用申请单编号
+            taskModelDto.setTaskCode(jgChangeRegistrationReform.getApplyNo());
+            //摘要
+            taskModelDto.setTaskContent(getSummaryInfo(jgChangeRegistrationReform));
+            //任务类型
+            taskModelDto.setTaskType(BusinessTypeEnum.JG_RENOVATION_REGISTRATION.getCode());
+            //工作流实例id
+            taskModelDto.setRelationId(String.valueOf(jgChangeRegistrationReform.getSequenceNbr()));
+            taskModelDto.setModel(conveterTaskMessageDTO(jgChangeRegistrationReform));
+        } else {
+            List<WorkflowResultDto> workflowResultDtoList = commonServiceImpl.buildWorkFlowInfo(Arrays.asList(processTaskDTO));
+            WorkflowResultDto workflowResultDto = conveterProcessTaskDTO2WorkflowResultDto(processTaskDTO);
             //工作流创建时间
             taskModelDto.setFlowCreateDate(jgChangeRegistrationReform.getCreateDate());
+            //工作流返回节点名称
+            taskModelDto.setTaskName(workflowResultDto.getNextTaskName());
             //taskCode 使用申请单编号
             taskModelDto.setTaskCode(jgChangeRegistrationReform.getApplyNo());
             //摘要
@@ -691,7 +704,9 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             //任务类型名称
             taskModelDto.setTaskTypeLabel(BusinessTypeEnum.JG_RENOVATION_REGISTRATION.getName());
             //工作流实例id
-            taskModelDto.setRelationId(String.valueOf(jgChangeRegistrationReform.getSequenceNbr()));
+            taskModelDto.setRelationId(jgChangeRegistrationReform.getInstanceId());
+            //执行人id
+            taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
             //任务状态code
             taskModelDto.setTaskStatus(commonServiceImpl.getDictionaryCodeByName(jgChangeRegistrationReform.getStatus()));
             taskModelDto.setFlowStatus(taskModelDto.getTaskStatus());
@@ -705,49 +720,11 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             //任务发起人所在单位
             taskModelDto.setStartUserCompanyName(jgChangeRegistrationReform.getCreateUserCompanyName());
             //任务发起人发起时间
+            taskModelDto.setStartDate(new Date());
             taskModelDto.setNextExecuteUser(jgChangeRegistrationReform.getNextExecutorIds());
             //跳转路径
 //        taskModelDto.setRoutePath();
             taskModelDto.setModel(conveterTaskMessageDTO(jgChangeRegistrationReform));
-        }else{
-        List<WorkflowResultDto> workflowResultDtoList = commonServiceImpl.buildWorkFlowInfo(Arrays.asList(processTaskDTO));
-        WorkflowResultDto workflowResultDto = conveterProcessTaskDTO2WorkflowResultDto(processTaskDTO);
-        //工作流创建时间
-        taskModelDto.setFlowCreateDate(jgChangeRegistrationReform.getCreateDate());
-        //工作流返回节点名称
-        taskModelDto.setTaskName(workflowResultDto.getNextTaskName());
-        //taskCode 使用申请单编号
-        taskModelDto.setTaskCode(jgChangeRegistrationReform.getApplyNo());
-        //摘要
-        taskModelDto.setTaskContent(getSummaryInfo(jgChangeRegistrationReform));
-        //任务描述-非必填
-        taskModelDto.setTaskDesc(null);
-        //任务类型
-        taskModelDto.setTaskType(BusinessTypeEnum.JG_RENOVATION_REGISTRATION.getCode());
-        //任务类型名称
-        taskModelDto.setTaskTypeLabel(BusinessTypeEnum.JG_RENOVATION_REGISTRATION.getName());
-        //工作流实例id
-        taskModelDto.setRelationId(jgChangeRegistrationReform.getInstanceId());
-        //执行人id
-        taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
-        //任务状态code
-        taskModelDto.setTaskStatus(commonServiceImpl.getDictionaryCodeByName(jgChangeRegistrationReform.getStatus()));
-        taskModelDto.setFlowStatus(taskModelDto.getTaskStatus());
-        //任务状态名称
-        taskModelDto.setTaskStatusLabel(jgChangeRegistrationReform.getStatus());
-        taskModelDto.setFlowStatusLabel(jgChangeRegistrationReform.getStatus());
-        //任务创建人id
-        taskModelDto.setStartUserId(jgChangeRegistrationReform.getCreateUserId());
-        //任务创建人名称
-        taskModelDto.setStartUser(jgChangeRegistrationReform.getCreateUserName());
-        //任务发起人所在单位
-        taskModelDto.setStartUserCompanyName(jgChangeRegistrationReform.getCreateUserCompanyName());
-        //任务发起人发起时间
-        taskModelDto.setStartDate(new Date());
-        taskModelDto.setNextExecuteUser(jgChangeRegistrationReform.getNextExecutorIds());
-        //跳转路径
-//        taskModelDto.setRoutePath();
-        taskModelDto.setModel(conveterTaskMessageDTO(jgChangeRegistrationReform));
         }
         return taskModelDto;
     }
@@ -769,34 +746,35 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
 
     /**
      * 将jgChangeRegistrationReform转换成TaskModelDto
+     *
      * @param jgChangeRegistrationReform
      * @return
      */
-   public TaskMessageDto conveterTaskMessageDTO(JgChangeRegistrationReform jgChangeRegistrationReform) {
-       TaskMessageDto taskMessageDto = new TaskMessageDto();
-       taskMessageDto.setInstanceId(jgChangeRegistrationReform.getInstanceId());
-       taskMessageDto.setStatus(jgChangeRegistrationReform.getStatus());
-       taskMessageDto.setAuditStatus(jgChangeRegistrationReform.getStatus());
-       taskMessageDto.setPromoter(jgChangeRegistrationReform.getPromoter());
-       taskMessageDto.setNextExecuteUserIds(jgChangeRegistrationReform.getNextExecuteUserIds());
-       taskMessageDto.setSequenceNbr(jgChangeRegistrationReform.getSequenceNbr());
-       taskMessageDto.setNextExecuteIds(jgChangeRegistrationReform.getNextExecutorIds());
-       return taskMessageDto;
-   }
+    public TaskMessageDto conveterTaskMessageDTO(JgChangeRegistrationReform jgChangeRegistrationReform) {
+        TaskMessageDto taskMessageDto = new TaskMessageDto();
+        taskMessageDto.setInstanceId(jgChangeRegistrationReform.getInstanceId());
+        taskMessageDto.setStatus(jgChangeRegistrationReform.getStatus());
+        taskMessageDto.setAuditStatus(jgChangeRegistrationReform.getStatus());
+        taskMessageDto.setPromoter(jgChangeRegistrationReform.getPromoter());
+        taskMessageDto.setNextExecuteUserIds(jgChangeRegistrationReform.getNextExecuteUserIds());
+        taskMessageDto.setSequenceNbr(jgChangeRegistrationReform.getSequenceNbr());
+        taskMessageDto.setNextExecuteIds(jgChangeRegistrationReform.getNextExecutorIds());
+        return taskMessageDto;
+    }
 
 
     private String getNextUserOrgCode(String operate, JgChangeRegistrationReform jgChangeRegistrationReform) {
-        if("0".equals(operate)){
+        if ("0".equals(operate)) {
             // 执行通过节点，单位code为接收机构单位信息
             return jgChangeRegistrationReform.getReceiveOrgCode();
         }
-        if(jgChangeRegistrationReform.getAuditStatus().equals(WorkFlowStatusEnum.CHANGE_RECEIVE.getPass())
+        if (jgChangeRegistrationReform.getAuditStatus().equals(WorkFlowStatusEnum.CHANGE_RECEIVE.getPass())
                 || jgChangeRegistrationReform.getAuditStatus().equals(WorkFlowStatusEnum.CHANGE_RECEIVE.getReject())
-                || jgChangeRegistrationReform.getAuditStatus().equals(WorkFlowStatusEnum.CHANGE_RECEIVE.getRollBack())){
+                || jgChangeRegistrationReform.getAuditStatus().equals(WorkFlowStatusEnum.CHANGE_RECEIVE.getRollBack())) {
             // 驳回且当前节点为一键节点时，单位code为发起人单位信息
             return jgChangeRegistrationReform.getUseUnitCreditCode();
         }
         // 2、3级驳回时，单位code为接收单位code
-        return  jgChangeRegistrationReform.getReceiveOrgCode();
+        return jgChangeRegistrationReform.getReceiveOrgCode();
     }
 }
\ 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/JgEnableDisableServiceImpl.java

@@ -179,7 +179,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
         // 仅保存
         if ("add".equals(pageType)) {
             this.save(jgEnableDisable);
-            buildTask(Arrays.asList(jgEnableDisable),businessCode, workflowResultList,Boolean.FALSE);
+            buildTask(Arrays.asList(jgEnableDisable), businessCode, workflowResultList, Boolean.FALSE);
             if(!SUBMIT_TYPE_FLOW.equals(submit)){
                 // 暂存任务
                 buildTaskDraft(jgEnableDisable);
@@ -215,11 +215,11 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
             BeanUtils.copyProperties(jgEnableDisable, taskMessageDto);
             dto.setModel(taskMessageDto);
             //摘要 按原有规则组装
-            dto.setTaskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", jgEnableDisable.getEquList(), jgEnableDisable.getSequenceNbr(), jgEnableDisable.getApplyNo()));
+            dto.setTaskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", jgEnableDisable.getEquList(), jgEnableDisable.getSupervisoryCode(), jgEnableDisable.getApplyNo()));
             //申请单号
             dto.setTaskCode(jgEnableDisable.getApplyNo());
             //业务类型枚举code值
-            dto.setTaskType(BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getCode());
+            dto.setTaskType(BusinessTypeEnum.JG_EQUIPMENT_START.getCode());
             ////业务主键
             dto.setRelationId(jgEnableDisable.getSequenceNbr() + "");
             modelDtos.add(dto);
@@ -242,22 +242,21 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
         jgEnableDisable.setApplyType(map.getString("applyType"));
         jgEnableDisable.setCreateUserCompanyName(reginParams.getCompany().getCompanyName());
         jgEnableDisable.setPromoter(reginParams.getUserModel().getUserId());
-        jgEnableDisable.setInstanceId(workflowResultList.get(0).getInstanceId());
-        jgEnableDisable.setNextExecuteUserIds(workflowResultList.get(0).getNextExecutorUserIds());
         if (SUBMIT_TYPE_FLOW.equals(submitType)) {
-            jgEnableDisable.setNextExecutorIds(workflowResultList.get(0).getNextExecutorRoleIds());
-            jgEnableDisable.setExecuteSequence(workflowResultList.get(0).getNextExecutorRoleIds() + "," + workflowResultList.get(0).getExecutorRoleIds());
-            jgEnableDisable.setPromoter(reginParams.getUserModel().getUserId());
-            jgEnableDisable.setNextTaskId(workflowResultList.get(0).getNextTaskId());
-        }
-        jgEnableDisable.setEquList(map.get("equListDesc").toString());
-        jgEnableDisable.setSupervisoryCode(map.get("supervisoryCode").toString());
-        if (!CollectionUtils.isEmpty(workflowResultList)) {
-            jgEnableDisable.setInstanceId(workflowResultList.get(0).getInstanceId());
-            jgEnableDisable.setAuditStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getName()));
+            if (!CollectionUtils.isEmpty(workflowResultList)) {
+                jgEnableDisable.setNextExecuteUserIds(workflowResultList.get(0).getNextExecutorUserIds());
+                jgEnableDisable.setInstanceId(workflowResultList.get(0).getInstanceId());
+                jgEnableDisable.setAuditStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getName()));
+                jgEnableDisable.setNextExecutorIds(workflowResultList.get(0).getNextExecutorRoleIds());
+                jgEnableDisable.setExecuteSequence(workflowResultList.get(0).getNextExecutorRoleIds() + "," + workflowResultList.get(0).getExecutorRoleIds());
+                jgEnableDisable.setPromoter(reginParams.getUserModel().getUserId());
+                jgEnableDisable.setNextTaskId(workflowResultList.get(0).getNextTaskId());
+            }
         } else {
             jgEnableDisable.setAuditStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getName()));
         }
+        jgEnableDisable.setEquList(String.valueOf(map.get("equListDesc")));
+        jgEnableDisable.setSupervisoryCode(String.valueOf(map.get("supervisoryCode")));
         jgEnableDisable.setCreateUserName(reginParams.getUserModel().getRealName());
         jgEnableDisable.setCreateUserId(reginParams.getUserModel().getUserId());
     }
@@ -270,16 +269,17 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
         String  taskType = businessCode.equals(ApplicationFormTypeEnum.SBQY.getBusinessCode())?BusinessTypeEnum.JG_EQUIPMENT_START.getCode():BusinessTypeEnum.JG_EQUIPMENT_STOP.getCode();
         String  taskTypeLabel = businessCode.equals(ApplicationFormTypeEnum.SBQY.getBusinessCode())?BusinessTypeEnum.JG_EQUIPMENT_START.getName():BusinessTypeEnum.JG_EQUIPMENT_STOP.getName();
         List<TaskModelDto> taskModelDtoList = new ArrayList<>();
-        WorkflowResultDto workflowResultDto = workflowResultList.get(0);
         list.forEach(item -> {
             TaskModelDto taskModelDto = new TaskModelDto();
             taskModelDto.setFlowCreateDate(item.getCreateDate());
-            taskModelDto.setTaskName(workflowResultDto.getNextTaskName()); // 工作流API返回
+            if(workflowResultList.size()>0){
+                taskModelDto.setTaskName(workflowResultList.get(0).getNextTaskName()); // 工作流API返回
+                taskModelDto.setExecuteUserIds(workflowResultList.get(0).getNextExecutorUserIds()); // 工作流API返回
+            }
             taskModelDto.setTaskCode(item.getApplyNo());
             taskModelDto.setTaskType(taskType);
             taskModelDto.setTaskTypeLabel(taskTypeLabel);
             taskModelDto.setRelationId(item.getInstanceId());
-            taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds()); // 工作流API返回
             taskModelDto.setTaskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
             taskModelDto.setFlowStatus(commonService.getDictionaryCodeByName(FlowStatusEnum.TO_BE_PROCESSED.getName())); // 流程状态枚举
             taskModelDto.setFlowStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
@@ -299,7 +299,9 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
                 commonService.deleteTaskModel(item.getSequenceNbr()+"");
             }
         });
-        commonService.buildTaskModel(taskModelDtoList);
+        if(bool){
+            commonService.buildTaskModel(taskModelDtoList);
+        }
     }
 
 
@@ -560,17 +562,19 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
     public Map<String, Object> getDetail(Long sequenceNbr) {
         Map<String,Object> resultMap = this.baseMapper.getDetail(sequenceNbr);
         JgEnableDisableEq jgEnableDisableEq = jgEnableDisableEqMapper.selectOne(new LambdaQueryWrapper<JgEnableDisableEq>().eq(JgEnableDisableEq::getEnableDisableApplyId, sequenceNbr));
-        Map<String, Object> map = jgMaintainNoticeMapper.getEquipInfoByRecord(jgEnableDisableEq.getEquId());
-        map.put("equListDesc",map.get("equList"));
-        map.put("equCategoryDesc",map.get("equCategory"));
-        map.put("equDefineDesc",map.get("equDefine"));
-        String[] fields = {"productPhoto", "designDoc", "designStandard", "factoryStandard", "productQualityYieldProve",
-                "insUseMaintainExplain", "inspectReport", "proxyStatementAttachment", "installContractAttachment"};
-        for (String s : fields) {
-            if (map.containsKey(s) && !ObjectUtils.isEmpty(map.get(s)))
-                map.put(s, JSON.parseArray(map.get(s).toString()));
+        if(!ObjectUtils.isEmpty(jgEnableDisableEq)){
+            Map<String, Object> map = jgMaintainNoticeMapper.getEquipInfoByRecord(jgEnableDisableEq.getEquId());
+            map.put("equListDesc",map.get("equList"));
+            map.put("equCategoryDesc",map.get("equCategory"));
+            map.put("equDefineDesc",map.get("equDefine"));
+            String[] fields = {"productPhoto", "designDoc", "designStandard", "factoryStandard", "productQualityYieldProve",
+                    "insUseMaintainExplain", "inspectReport", "proxyStatementAttachment", "installContractAttachment"};
+            for (String s : fields) {
+                if (map.containsKey(s) && !ObjectUtils.isEmpty(map.get(s)))
+                    map.put(s, JSON.parseArray(map.get(s).toString()));
+            }
+            resultMap.putAll(map);
         }
-        resultMap.putAll(map);
         return resultMap;
 
     }

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

@@ -329,11 +329,18 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
     }
 
     public void deleteBatch(List<Long> ids) {
-        JgScrapCancel jgScrapCancel = new JgScrapCancel();
-        jgScrapCancel.setIsDelete(true);
-        LambdaQueryWrapper<JgScrapCancel> lambda = new QueryWrapper<JgScrapCancel>().lambda();
-        lambda.in(JgScrapCancel::getSequenceNbr, ids);
-        this.update(jgScrapCancel, lambda);
+        if (!ids.isEmpty()) {
+            for (Long id : ids) {
+                LambdaQueryWrapper<JgScrapCancel> lambda = new QueryWrapper<JgScrapCancel>().lambda();
+                lambda.eq(JgScrapCancel::getSequenceNbr, id);
+                JgScrapCancel jgScrapCancel = this.baseMapper.selectOne(lambda);
+                //删除代办消息
+                commonService.deleteTaskModel(jgScrapCancel.getInstanceId());
+                //更新jgScrapCancel数据
+                jgScrapCancel.setIsDelete(true);
+                this.updateById(jgScrapCancel);
+            }
+        }
     }
 
     public JgScrapCancelDto updateInfo(String submitType, JgScrapCancelDto jgScrapCancelDto, String op) {

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationServiceImpl.java

@@ -132,6 +132,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     }
 
     public void updateHistory(JSONObject map, String equipId, String currentDocumentId, String supervisoryCode) {
+        map.remove("submit");
         JgRegistrationHistory jgRegistrationHistory = new JgRegistrationHistory();
         LambdaQueryWrapper<JgRegistrationHistory> lambda = new QueryWrapper<JgRegistrationHistory>().lambda();
         lambda.eq(JgRegistrationHistory::getEquId, equipId);
@@ -207,8 +208,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             jgRelationEquipMapper.insert(jgRelationEquip);
         }
         // 暂存历史表
+        Object submit = map.get("submit");
         updateHistory(map, map.get("equipId").toString(), String.valueOf(jgUseRegistration.getSequenceNbr()), jgUseRegistration.getSupervisoryCode());
-        if (!ObjectUtils.isEmpty(map.get("submit"))) {
+        if (!ObjectUtils.isEmpty(submit)) {
             // 删除暂存代办
             commonServiceImpl.deleteTaskModel(String.valueOf(jgUseRegistration.getSequenceNbr()));
             String instanceId = "";

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

@@ -171,7 +171,7 @@
     "type": "111",
     "name": "改造变更登记",
     "pageType": "draft",
-    "url": "/mixuap?appId=1742358052905971713&id=1737029146837544962&roleIds={roleIds}&userId={userId}&pageType=look"
+    "url": "/mixuap?appId=1742358052905971713&id=1737029146837544962&roleIds={roleIds}&userId={userId}&pageType=edit"
   },
   {
     "type": "111",