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

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

@@ -2,10 +2,15 @@ package com.yeejoin.amos.boot.module.jg.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.module.jg.api.common.BizCustomDateSerializer;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.util.Date;
 
 /**
@@ -79,6 +84,8 @@ public class JgChangeRegistrationName extends BaseEntity {
     /**
      * 创建时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonSerialize(using = BizCustomDateSerializer.class)
 	@TableField("create_date")
     private Date createDate;
 

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

@@ -189,8 +189,8 @@ public class CommonController extends BaseController {
 	public ResponseModel<Object> save(@RequestParam(value = "submitType", required = false) String submitType,
 									  @RequestBody Map<String, Object> map) {
 		ReginParams reginParams = getSelectedOrgInfo();
-		commonService.invokeBusinessProcess(submitType, map, reginParams);
-		return ResponseHelper.buildResponse("");
+		Object result = commonService.invokeBusinessProcess(submitType, map, reginParams);
+		return ResponseHelper.buildResponse(result);
 	}
 
 }

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

@@ -42,5 +42,5 @@ public interface ICommonService {
 
     List<Map<String, Object>>  superviseBusinessCategory(String type);
 
-    void invokeBusinessProcess(String submitType, Map<String, Object> obj, ReginParams reginParams);
+    Object invokeBusinessProcess(String submitType, Map<String, Object> obj, ReginParams reginParams);
 }

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

@@ -530,7 +530,7 @@ public class CommonServiceImpl implements ICommonService {
 
 
     @Override
-    public void invokeBusinessProcess(String submitType, Map<String, Object> map, ReginParams reginParams) {
+    public Object invokeBusinessProcess(String submitType, Map<String, Object> map, ReginParams reginParams) {
         Map<String, Object> basicObj = (Map<String, Object>) map.get(basic);
         Map<String, Object> noticeObj = (Map<String, Object>) map.get(notice);
         Map<String, Object> techInfoObj = (Map<String, Object>) map.get(techInfo);
@@ -615,7 +615,7 @@ public class CommonServiceImpl implements ICommonService {
             noticeObj.put("receiveOrgCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
             provideMap.put(GMBG_PAGE_ID, noticeObj);
             JSONObject jsonObject = new JSONObject(provideMap);
-            jgChangeRegistrationNameService.save2(submitType, jsonObject);
+            return jgChangeRegistrationNameService.save2(submitType, jsonObject);
         } else if (type.equals(ApplicationFormTypeEnum.SBQY.getBusinessCode()) || type.equals(ApplicationFormTypeEnum.SBTY.getBusinessCode())) {
             noticeObj.put("submit", submitType);
             noticeObj.put("formType", "add");
@@ -623,6 +623,7 @@ public class CommonServiceImpl implements ICommonService {
             JSONObject jsonObject = new JSONObject(noticeObj);
             jgEnableDisableServiceImpl.saveOrUpdate(jsonObject, reginParams);
         }
+        return null;
     }
 
 

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

@@ -112,13 +112,13 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
 
 
     @Transactional(rollbackFor = Exception.class)
-    public void save2(String submitType, JSONObject requestParam) {
+    public List<JgChangeRegistrationName> save2(String submitType, JSONObject requestParam) {
         Map<String, JSONObject> jgRegistrationInfoMap = (Map<String, JSONObject>) JSONObject.parseObject(JSONObject.toJSONString(requestParam), Map.class);
-        this.save(submitType, jgRegistrationInfoMap);
+        return Collections.singletonList(this.save(submitType, jgRegistrationInfoMap));
     }
 
 
-    public void save(String submitType, Map<String, JSONObject> jgRegistrationInfoMap) {
+    public JgChangeRegistrationName save(String submitType, Map<String, JSONObject> jgRegistrationInfoMap) {
         ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         String[] taskName = new String[]{"流程结束"};
         JSONObject jgRegistrationInfo = jgRegistrationInfoMap.get("jgRegistrationInfo");
@@ -131,7 +131,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         }
         List<String> applyNoList = listResponseModel.getResult();
         if (CollectionUtils.isEmpty(applyNoList)) {
-            return;
+            return null;
         }
         List<ProcessTaskDTO> processTasks = new ArrayList<>();
         // 判断当前是否为提交
@@ -190,6 +190,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         this.save(dto);
         // 创建代办
         this.createTaskModel(dto, taskName[0], submitType, nextUserIds);
+        return dto;
     }
 
     private String getReceiveCompanyCode(JgChangeRegistrationNameDto model) {
@@ -384,10 +385,27 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         TaskMessageDto taskMessageDto = new TaskMessageDto();
         BeanUtil.copyProperties(jgChangeRegistrationName, taskMessageDto);
         modelDto.setModel(taskMessageDto);
+        modelDto.setPageType(this.getPageTypeForReject(operate, jgChangeRegistrationName.getAuditStatus()));
         // 再插入新代办、数据待定
         commonService.buildTaskModel(Collections.singletonList(modelDto));
     }
 
+    private String getPageTypeForReject(String operate, String auditStatus) {
+        // 驳回
+        if("1".equals(operate)){
+            // 且驳回到的节点为使用单位提交 则可编辑
+            if(WorkFlowStatusEnum.UNIT_RENAME_SUBMIT.getPass().equals(auditStatus) ||
+                    WorkFlowStatusEnum.UNIT_RENAME_SUBMIT.getReject().equals(auditStatus) ||
+                    WorkFlowStatusEnum.UNIT_RENAME_SUBMIT.getRollBack().equals(auditStatus)
+            ){
+                // urlInfo.json 文件的 pageType
+                return "edit";
+            }
+            return "look";
+        }
+        return "look";
+    }
+
 
     public ProcessTaskDTO submit(String operate, JgChangeRegistrationName jgChangeRegistrationName) {
         //组装信息

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

@@ -167,6 +167,9 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         jgChangeRegistrationReform.setUseRegistrationCode(jgRegistrationHistory.getUseRegistrationCode());
         String equipListName = this.getBaseMapper().getEquiplistNameByEquiplist(Optional.ofNullable(map.get("equList").toString()).orElse(" "));
         jgChangeRegistrationReform.setEquipListName(equipListName);
+        jgChangeRegistrationReform.setCreateUserId(reginParams.getUserModel().getUserId());
+        jgChangeRegistrationReform.setCreateUserName(reginParams.getUserModel().getRealName());
+        jgChangeRegistrationReform.setCreateUserCompanyName(reginParams.getCompany().getCompanyName());
         jgRegistrationHistory.setStatus("new");
         if (map.containsKey("type") && "edit".equals(String.valueOf(map.get("type")))) {
             jgChangeRegistrationReform.setSequenceNbr(Long.valueOf(String.valueOf(map.get("sequenceNbr"))));
@@ -210,9 +213,6 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
                 // 如果是新启动的流程开启自动访问
                 jgChangeRegistrationReform.setAuditStatus(WorkFlowStatusEnum.CHANGE_RECEIVE.getPass());
                 jgChangeRegistrationReform.setStatus(WorkFlowStatusEnum.CHANGE_RECEIVE.getPass());
-                jgChangeRegistrationReform.setCreateUserId(reginParams.getUserModel().getUserId());
-                jgChangeRegistrationReform.setCreateUserName(reginParams.getUserModel().getRealName());
-                jgChangeRegistrationReform.setCreateUserCompanyName(reginParams.getCompany().getCompanyName());
                 ProcessTaskDTO processTaskDTO = startByVariable(jgChangeRegistrationReform);
                 updateExecuteIds(instanceId, jgChangeRegistrationReform, "startWorkfow", processTaskDTO);
                 List<TaskModelDto> taskModelDtoList = Arrays.asList(getTaskModelDtoList(jgChangeRegistrationReform, processTaskDTO));
@@ -365,9 +365,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 = new JgChangeRegistrationReform();
-        LambdaQueryWrapper<JgChangeRegistrationReform> lambda = new QueryWrapper<JgChangeRegistrationReform>().lambda();
-        lambda.eq(JgChangeRegistrationReform::getInstanceId, instanceId);
+        JgChangeRegistrationReform jgChangeRegistrationReform = this.getBaseMapper().selectOne(new QueryWrapper<JgChangeRegistrationReform>().eq("instance_id",instanceId));
         ArrayList<String> roleList = new ArrayList<>();
         ProcessTaskDTO processTaskDTO = iCmWorkflowService.rollBack(instanceId);
         WorkflowResultDto workflowResultDto = conveterProcessTaskDTO2WorkflowResultDto(processTaskDTO);
@@ -381,7 +379,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         jgChangeRegistrationReform.setNextTaskId(workflowResultDto.getNextTaskId());
         jgChangeRegistrationReform.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
         jgChangeRegistrationReform.setNextExecutorIds(role);
-        this.update(jgChangeRegistrationReform, lambda);
+        this.getBaseMapper().updateById(jgChangeRegistrationReform);
 //        commonServiceImpl.deleteTaskModel(instanceId);
         JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(jgChangeRegistrationReform));
         jsonObject.put("flowStatus", commonServiceImpl.getDictionaryCodeByName(jgChangeRegistrationReform.getAuditStatus()));
@@ -389,9 +387,11 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         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");
         //如果创建人等于当前人则打开编辑页面
-        if(jgChangeRegistrationReform.getCreateUserId().equals(reginParams.getUserModel().getUserId())){
+        if(taskCode.equals(WorkFlowStatusEnum.CHANGE_SUBMIT.getCode())){
             jsonObject.put("pageType","edit");
         }
         jsonObject.put("model",conveterTaskMessageDTO(jgChangeRegistrationReform));

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

@@ -254,7 +254,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                 notice.setNextTaskId(workflowResultDto.getNextTaskId());
                 this.updateById(notice);
                 // 如果为保存并提交，则创建代办
-                buildTask(Collections.singletonList(notice), Collections.singletonList(workflowResultDto));
+                buildTask(Collections.singletonList(notice), Collections.singletonList(workflowResultDto), Boolean.TRUE);
             } else {
                 ProcessTaskDTO processTaskDTO = new ProcessTaskDTO();
                 WorkflowResultDto workflowResultDto = new WorkflowResultDto();
@@ -296,7 +296,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                 TaskV2Model taskV2Model = commonService.updateTaskModel(map);
                 if (ObjectUtils.isEmpty(taskV2Model)) {
                     // 如果为保存并提交，则创建代办
-                    buildTask(Collections.singletonList(notice), Collections.singletonList(workflowResultDto));
+                    buildTask(Collections.singletonList(notice), Collections.singletonList(workflowResultDto), Boolean.FALSE);
                 } else {
                     TaskModelDto taskModelDto = new TaskModelDto();
                     BeanUtils.copyProperties(taskV2Model, taskModelDto);
@@ -503,7 +503,10 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         jgInstallationNoticeMapper.insertBatchSomeColumn(list);
         // 如果为保存并提交，则创建代办
         if (SUBMIT_TYPE_FLOW.equals(submitType)) {
-            buildTask(list, workflowResultList);
+            buildTask(list, workflowResultList, Boolean.TRUE);
+        } else {
+            // 暂存任务
+            buildTaskDraft(list);
         }
 
         List<JgInstallationNoticeEq> jgRelationEquipList = equipList.stream().map(jgRelationEquip -> {
@@ -514,7 +517,32 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         jgInstallationNoticeEqMapper.insertBatchSomeColumn(jgRelationEquipList);
     }
 
-    private void buildTask(List<JgInstallationNotice> list, List<WorkflowResultDto> workflowResultList) {
+    /**
+     * 暂存任务生成待办
+     * @param list 业务信息
+     */
+    private void buildTaskDraft(List<JgInstallationNotice> list) {
+        List<TaskModelDto> modelDtos = new ArrayList<>();
+        list.forEach(obj -> {
+            TaskModelDto dto = new TaskModelDto();
+            //行数据
+            TaskMessageDto taskMessageDto = new TaskMessageDto();
+            BeanUtils.copyProperties(obj, taskMessageDto);
+            dto.setModel(taskMessageDto);
+            //摘要 按原有规则组装
+            dto.setTaskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", obj.getEquList(), StringUtils.isEmpty(obj.getFactoryNum()) ? "" : obj.getFactoryNum(), obj.getApplyNo()));
+            //申请单号
+            dto.setTaskCode(obj.getApplyNo());
+            //业务类型枚举code值
+            dto.setTaskType(BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getCode());
+            ////业务主键
+            dto.setRelationId(obj.getSequenceNbr() + "");
+            modelDtos.add(dto);
+        });
+        commonService.buildTaskModel(modelDtos);
+    }
+
+    private void buildTask(List<JgInstallationNotice> list, List<WorkflowResultDto> workflowResultList, Boolean isDeleteDraft) {
         List<TaskModelDto> taskModelDtoList = new ArrayList<>();
         WorkflowResultDto workflowResultDto = workflowResultList.get(0);
         list.forEach(item -> {
@@ -540,6 +568,10 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             BeanUtils.copyProperties(item, taskMessageDto);
             taskModelDto.setModel(taskMessageDto);
             taskModelDtoList.add(taskModelDto);
+            if (isDeleteDraft) {
+                // 删除暂存时生成的待办
+                commonService.deleteTaskModel(item.getSequenceNbr()+"");
+            }
         });
         commonService.buildTaskModel(taskModelDtoList);
     }
@@ -864,6 +896,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             taskModelDto.setFlowStatusLabel(FlowStatusEnum.REJECTED.getName());
             taskModelDto.setFlowCode(workflowResultDto.getNextTaskId());
             taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
+            taskModelDto.setPageType("edit");
             TaskMessageDto taskMessageDto = new TaskMessageDto();
             BeanUtils.copyProperties(jgInstallationNotice, taskMessageDto);
             taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());

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

@@ -285,7 +285,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 notice.setNextTaskId(workflowResultDto.getNextTaskId());
                 jgTransferNoticeMapper.updateById(notice);
                 // 如果为保存并提交，则创建代办
-                buildTask(Collections.singletonList(notice), Collections.singletonList(workflowResultDto));
+                buildTask(Collections.singletonList(notice), Collections.singletonList(workflowResultDto), Boolean.TRUE);
             } else {
                 ProcessTaskDTO processTaskDTO = new ProcessTaskDTO();
                 WorkflowResultDto workflowResultDto = new WorkflowResultDto();
@@ -326,7 +326,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 TaskV2Model taskV2Model = commonService.updateTaskModel(map);
                 if (ObjectUtils.isEmpty(taskV2Model)) {
                     // 如果为保存并提交，则创建代办
-                    buildTask(Collections.singletonList(notice), Collections.singletonList(workflowResultDto));
+                    buildTask(Collections.singletonList(notice), Collections.singletonList(workflowResultDto), Boolean.FALSE);
                 } else {
                     TaskModelDto taskModelDto = new TaskModelDto();
                     BeanUtils.copyProperties(taskV2Model, taskModelDto);
@@ -403,7 +403,10 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         jgTransferNoticeMapper.insertBatchSomeColumn(list);
         // 如果为保存并提交，则创建代办
         if (SUBMIT_TYPE_FLOW.equals(submitType)) {
-            buildTask(list, workflowResultList);
+            buildTask(list, workflowResultList, Boolean.TRUE);
+        } else {
+            // 暂存任务
+            buildTaskDraft(list);
         }
         List<JgTransferNoticeEq> jgRelationEquipList = equipList.stream().map(jgRelationEquip -> {
             List<JgTransferNotice> collect = list.stream().filter(JgTransferNotice -> jgRelationEquip.getEquipTransferId().equals(JgTransferNotice.getApplyNo())).collect(Collectors.toList());
@@ -415,6 +418,31 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
     }
 
     /**
+     * 暂存任务生成待办
+     * @param list 业务信息
+     */
+    private void buildTaskDraft(List<JgTransferNotice> list) {
+        List<TaskModelDto> modelDtos = new ArrayList<>();
+        list.forEach(obj -> {
+            TaskModelDto dto = new TaskModelDto();
+            //行数据
+            TaskMessageDto taskMessageDto = new TaskMessageDto();
+            BeanUtils.copyProperties(obj, taskMessageDto);
+            dto.setModel(taskMessageDto);
+            //摘要 按原有规则组装
+            dto.setTaskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", obj.getEquList(), obj.getSupervisoryCode(), obj.getApplyNo()));
+            //申请单号
+            dto.setTaskCode(obj.getApplyNo());
+            //业务类型枚举code值
+            dto.setTaskType(BusinessTypeEnum.JG_ADVICE_REMOVAL.getCode());
+            ////业务主键
+            dto.setRelationId(obj.getSequenceNbr() + "");
+            modelDtos.add(dto);
+        });
+        commonService.buildTaskModel(modelDtos);
+    }
+
+    /**
      * 组装业务数据
      */
     private void businessData(String submitType, ReginParams reginParams, JgTransferNoticeDto model, List<Map<String, Object>> deviceList, ResponseModel<List<String>> responseModel, List<WorkflowResultDto> workflowResultList, List<JgTransferNotice> list, List<JgTransferNoticeEq> equipList) {
@@ -457,7 +485,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
     /**
      * 插入代办
      */
-    private void buildTask(List<JgTransferNotice> list, List<WorkflowResultDto> workflowResultList) {
+    private void buildTask(List<JgTransferNotice> list, List<WorkflowResultDto> workflowResultList, Boolean isDeleteDraft) {
         List<TaskModelDto> taskModelDtoList = new ArrayList<>();
         WorkflowResultDto workflowResultDto = workflowResultList.get(0);
         list.forEach(item -> {
@@ -483,12 +511,17 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             BeanUtils.copyProperties(item, taskMessageDto);
             taskModelDto.setModel(taskMessageDto);
             taskModelDtoList.add(taskModelDto);
+            if (isDeleteDraft) {
+                // 删除暂存时生成的待办
+                commonService.deleteTaskModel(item.getSequenceNbr()+"");
+            }
         });
         commonService.buildTaskModel(taskModelDtoList);
     }
 
     /**
      * 工作流启动并执行
+     *
      * @param submitType 是否提交
      * @param deviceList 设备信息
      * @return 工作流返回相关数据
@@ -698,6 +731,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             taskModelDto.setFlowStatusLabel(FlowStatusEnum.REJECTED.getName());
             taskModelDto.setFlowCode(workflowResultDto.getNextTaskId());
             taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
+            taskModelDto.setPageType("edit");
             TaskMessageDto taskMessageDto = new TaskMessageDto();
             BeanUtils.copyProperties(jgTransferNotice, taskMessageDto);
             taskModelDto.setModel(taskMessageDto);
@@ -710,6 +744,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
 
     /**
      * 执行工作流并返回组装好的工作流信息
+     *
      * @param op               是否通过
      * @param opinion          备注信息
      * @param jgTransferNotice 业务信息

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

@@ -318,6 +318,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
                     taskModelDto.setTaskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
                     taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
+                    if (WorkFlowStatusEnum.USE_SUBMIT.getCode().equals(taskCode) && "1".equals(operate)) {
+                        taskModelDto.setPageType("edit");
+                    }
                     commonServiceImpl.buildTaskModel(Collections.singletonList(taskModelDto));
                 } else {
                     workflowResultDto.setInstanceId(jgUseRegistration.getInstanceId());
@@ -459,6 +462,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         jsonObject.put("nextExecuteUser", data.getNextExecuteIds());
         jsonObject.put("taskType", BusinessTypeEnum.JG_USAGE_REGISTRATION.getCode());
         jsonObject.put("equipId", jgUseRegistrationEq.getEquId());
+        if (!WorkFlowStatusEnum.USE_SUBMIT.getCode().equals(taskCode)) {
+            jsonObject.put("pageType", "look");
+        }
         // 撤回删除代办
         commonServiceImpl.rollbackTask(instanceId, jsonObject);
     }