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

@@ -37,7 +37,6 @@ import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
 import com.yeejoin.amos.feign.workflow.model.ProcessTaskDTO;
 import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
-import org.apache.commons.lang3.SerializationUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -436,9 +435,22 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         jsonObject.put("flowStatus", this.getTaskCodeByName(jgChangeRegistrationName.getAuditStatus()));
         jsonObject.put("flowStatusLabel", jgChangeRegistrationName.getAuditStatus());
         jsonObject.put("changeCertificate",null);
+        // 判断撤回后当前的节点，如果当前节点为提交节点则页面可编辑
+        jsonObject.put("pageType",this.getPageTypeByCurrentNode(jgChangeRegistrationName.getAuditStatus()));
         commonService.rollbackTask(instanceId, jsonObject);
     }
 
+    private String getPageTypeByCurrentNode(String auditStatus) {
+        if(WorkFlowStatusEnum.UNIT_RENAME_SUBMIT.getPass().equals(auditStatus) ||
+                WorkFlowStatusEnum.UNIT_RENAME_SUBMIT.getReject().equals(auditStatus) ||
+                WorkFlowStatusEnum.UNIT_RENAME_SUBMIT.getRollBack().equals(auditStatus)
+        ){
+            return "edit";
+        } else {
+            return "look";
+        }
+    }
+
 
     public void flowExecute(Long id, String instanceId, String operate, String comment) {
         try {

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

@@ -135,8 +135,6 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
     ICmWorkflowService icmWorkflowService;
     @Autowired
     CommonServiceImpl commonService;
-    @Value("classpath:/json/urlInfo.json")
-    private Resource bizTypeInfo;
 
     /**
      * 新增移装变更登记
@@ -299,6 +297,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
         //发起流程
         if ("1".equals(submitType)) {
             String instanceId = "";
+
             if (!ValidationUtil.isEmpty(oldTransfer.getSequenceNbr()) && !ValidationUtil.isEmpty(oldTransfer.getInstanceId())) {
                 this.flowExecute(oldTransfer.getSequenceNbr(), oldTransfer.getInstanceId(), "0", "");
             } else {
@@ -314,9 +313,21 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                 WorkflowResultDto workflowResult = this.startWorkFlork(oldTransfer.getReceiveOrgCode());
 
                 this.updateExecuteIds(instanceId, oldTransfer, "startWorkfow", workflowResult);
+                //删除旧的代办
+                commonService.deleteTaskModel(oldTransfer.getSequenceNbr().toString());
                 //生成代办
                 this.createToDoTask(Arrays.asList(workflowResult), oldTransfer, submitType);
             }
+        }else {
+            List<TaskModelDto> modelDtos = new ArrayList<>();
+            TaskModelDto dto = new TaskModelDto();
+            dto.setModel(oldTransfer);
+            dto.setTaskContent(this.getSummaryInfo(oldTransfer));
+            dto.setTaskCode(oldTransfer.getApplyNo());
+            dto.setTaskType(BusinessTypeEnum.JG_CHANGE_REGISTRATION.getCode());
+            dto.setRelationId(oldTransfer.getSequenceNbr() + "");
+            modelDtos.add(dto);
+            commonService.buildTaskModel(modelDtos);
         }
         return true;
     }

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

@@ -10,6 +10,7 @@ import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.jg.api.dto.TaskMessageDto;
 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.*;
@@ -146,7 +147,9 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
                 TaskModelDto taskModelDto = new TaskModelDto();
                 BeanUtils.copyProperties(taskV2Model, taskModelDto);
                 // 创建新的代办
-                taskModelDto.setModel(jgEnableDisable);
+                TaskMessageDto taskMessageDto = new TaskMessageDto();
+                BeanUtils.copyProperties(jgEnableDisable, taskMessageDto);
+                taskModelDto.setModel(taskMessageDto);
                 taskModelDto.setTaskName(workflowResultDto.getNextTaskName());
                 taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
                 taskModelDto.setFlowStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode());
@@ -248,7 +251,9 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
             taskModelDto.setStartUser(item.getCreateUserName());
             taskModelDto.setStartUserCompanyName(item.getCreateUserCompanyName()); // 任务发起人所在单位
             taskModelDto.setStartDate(item.getCreateDate());
-            taskModelDto.setModel(item);
+            TaskMessageDto taskMessageDto = new TaskMessageDto();
+            BeanUtils.copyProperties(item, taskMessageDto);
+            taskModelDto.setModel(taskMessageDto);
             taskModelDto.setNextExecuteUser(item.getExecuteSequence());
             taskModelDto.setTaskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), item.getSupervisoryCode(), item.getApplyNo()));
             taskModelDtoList.add(taskModelDto);
@@ -330,6 +335,8 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
                 taskMap.put("relationId", jgEnableDisable.getInstanceId());
                 taskMap.put("flowStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
                 taskMap.put("flowStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
+                TaskMessageDto taskMessageDto = new TaskMessageDto();
+                BeanUtils.copyProperties(jgEnableDisable, taskMessageDto);
                 taskMap.put("model", jgEnableDisable);
                 commonService.updateTaskModel(taskMap);
             } else {
@@ -351,7 +358,9 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
                 TaskModelDto taskModelDto = new TaskModelDto();
                 BeanUtils.copyProperties(taskV2Model, taskModelDto);
                 // 创建新的代办
-                taskModelDto.setModel(jgEnableDisable);
+                TaskMessageDto taskMessageDto = new TaskMessageDto();
+                BeanUtils.copyProperties(jgEnableDisable, taskMessageDto);
+                taskModelDto.setModel(taskMessageDto);
                 taskModelDto.setTaskName(workflowResultDto.getNextTaskName());
                 taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
                 taskModelDto.setFlowStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode());
@@ -376,7 +385,9 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
             TaskModelDto taskModelDto = new TaskModelDto();
             BeanUtils.copyProperties(taskV2Model, taskModelDto);
             // 创建新的代办
-            taskModelDto.setModel(jgEnableDisable);
+            TaskMessageDto taskMessageDto = new TaskMessageDto();
+            BeanUtils.copyProperties(jgEnableDisable, taskMessageDto);
+            taskModelDto.setModel(taskMessageDto);
             taskModelDto.setTaskName(workflowResultDto.getNextTaskName());
             taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
             taskModelDto.setFlowStatus(FlowStatusEnum.REJECTED.getCode());

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

@@ -12,10 +12,7 @@ import com.yeejoin.amos.boot.biz.common.enums.WorkFlowEnum;
 import com.yeejoin.amos.boot.biz.common.service.IDataDictionaryService;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
-import com.yeejoin.amos.boot.module.jg.api.dto.JgInstallationNoticeDto;
-import com.yeejoin.amos.boot.module.jg.api.dto.JgMaintainNoticeDto;
-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.dto.*;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintainNotice;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintainNoticeEq;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgTransferNotice;
@@ -240,7 +237,9 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                     TaskModelDto taskModelDto = new TaskModelDto();
                     BeanUtils.copyProperties(taskV2Model, taskModelDto);
                     // 创建新的代办
-                    taskModelDto.setModel(notice);
+                    TaskMessageDto taskMessageDto = new TaskMessageDto();
+                    BeanUtils.copyProperties(notice, taskMessageDto);
+                    taskModelDto.setModel(taskMessageDto);
                     taskModelDto.setTaskName(workflowResultDto.getNextTaskName());
                     taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
                     taskModelDto.setFlowStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode());
@@ -491,7 +490,9 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
             taskModelDto.setStartUser(item.getCreateUserName());
             taskModelDto.setStartUserCompanyName(item.getCreateUserCompanyName()); // 任务发起人所在单位
             taskModelDto.setStartDate(item.getCreateDate());
-            taskModelDto.setModel(item);
+            TaskMessageDto taskMessageDto = new TaskMessageDto();
+            BeanUtils.copyProperties(item, taskMessageDto);
+            taskModelDto.setModel(taskMessageDto);
             taskModelDto.setNextExecuteUser(item.getNextExecuteIds());
             taskModelDto.setTaskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), item.getSupervisoryCode(), item.getApplyNo()));
             taskModelDtoList.add(taskModelDto);
@@ -714,7 +715,9 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                 taskMap.put("relationId", jgMaintainNotice.getInstanceId());
                 taskMap.put("flowStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
                 taskMap.put("flowStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
-                taskMap.put("model", jgMaintainNotice);
+                TaskMessageDto taskMessageDto = new TaskMessageDto();
+                BeanUtils.copyProperties(jgMaintainNotice,taskMessageDto);
+                taskMap.put("model", taskMessageDto);
                 commonService.updateTaskModel(taskMap);
             } else {
                 jgMaintainNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
@@ -735,7 +738,9 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                 TaskModelDto taskModelDto = new TaskModelDto();
                 BeanUtils.copyProperties(taskV2Model, taskModelDto);
                 // 创建新的代办
-                taskModelDto.setModel(jgMaintainNotice);
+                TaskMessageDto taskMessageDto = new TaskMessageDto();
+                BeanUtils.copyProperties(jgMaintainNotice, taskMessageDto);
+                taskModelDto.setModel(taskMessageDto);
                 taskModelDto.setTaskName(workflowResultDto.getNextTaskName());
                 taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
                 taskModelDto.setFlowStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode());
@@ -759,7 +764,9 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
             TaskModelDto taskModelDto = new TaskModelDto();
             BeanUtils.copyProperties(taskV2Model, taskModelDto);
             // 创建新的代办
-            taskModelDto.setModel(jgMaintainNotice);
+            TaskMessageDto taskMessageDto = new TaskMessageDto();
+            BeanUtils.copyProperties(jgMaintainNotice, taskMessageDto);
+            taskModelDto.setModel(taskMessageDto);
             taskModelDto.setTaskName(workflowResultDto.getNextTaskName());
             taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
             taskModelDto.setFlowStatus(FlowStatusEnum.REJECTED.getCode());

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

@@ -120,6 +120,12 @@
   },
   {
     "type": "110",
+    "pageType": "draft",
+    "name": "移装变更登记",
+    "url": "/mixuap?appId=1742358052905971713&id=1737388347548004354&roleIds={roleIds}&userId={userId}&pageType=edit"
+  },
+  {
+    "type": "110",
     "pageType": "look",
     "name": "移装变更登记",
     "url": "/mixuap?appId=1742358052905971713&id=1737388393685348353&roleIds={roleIds}&userId={userId}&pageType=look"
@@ -128,7 +134,7 @@
     "type": "110",
     "pageType": "edit",
     "name": "移装变更登记",
-    "url": "/mixuap?appId=1742358052905971713&id=1737388347548004354&roleIds={roleIds}&userId={userId}&pageType=edit"
+    "url": "/mixuap?appId=1742358052905971713&id=1737388393685348353&roleIds={roleIds}&userId={userId}&pageType=edit"
   },
   {
     "type": "111",