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

 package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.aspose.words.SaveFormat;
@@ -640,9 +641,15 @@ public class CommonServiceImpl implements ICommonService {
      **/
     public void buildTaskModel(List<TaskModelDto> list) {
         List<TaskV2Model> taskV2Models = new ArrayList<>();
-        list.forEach(obj -> {
+        for (TaskModelDto obj : list) {
             //判断是否是暂存 新增若无下一节点执行人即为暂存
             boolean flag = StringUtils.isEmpty(obj.getNextExecuteUser())? true:false;
+            if (flag){
+                List<TaskV2Model> result = Systemctl.taskV2Client.selectListByRelationId(obj.getRelationId()).getResult();
+                if (CollectionUtil.isNotEmpty(result) && result.size() > 0){
+                    break;
+                }
+            }
             ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
             TaskV2Model model = new TaskV2Model();
             BeanUtil.copyProperties(obj, model);
@@ -689,7 +696,7 @@ public class CommonServiceImpl implements ICommonService {
                 model.setTaskTitle("有一条待提交的草稿");
                 model.setTaskName(BusinessTypeEnum.getNameByType(obj.getTaskType()));
                 model.setTaskTypeLabel(BusinessTypeEnum.getNameByType(obj.getTaskType()));
-           //     model.setTaskContent("【申请单号:"+obj.getTaskCode()+"】待提交");
+                //     model.setTaskContent("【申请单号:"+obj.getTaskCode()+"】待提交");
             }else {
                 model.setTaskStatus(0);
                 model.setTaskTitle(obj.getStartUser() + "发起了" + obj.getTaskName());
@@ -703,7 +710,7 @@ public class CommonServiceImpl implements ICommonService {
             model.setAgencyCode(RequestContext.getAgencyCode());
             taskV2Models.add(model);
 
-        });
+        }
         Systemctl.taskV2Client.batchAdd(taskV2Models);
     }
 

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

@@ -12,10 +12,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.ByteArrayMultipartFile;
-import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationUnitDto;
-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.*;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.EquipTypeEnum;
@@ -530,7 +527,15 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         if (SUBMIT_TYPE_FLOW.equals(submitType)) {
             for (JgChangeRegistrationUnit obj : list) {
                 TaskModelDto dto = new TaskModelDto();
-                dto.setModel(obj);
+
+                TaskMessageDto ta = new TaskMessageDto();
+                ta.setInstanceId(obj.getInstanceId());
+                ta.setStatus(obj.getStatus());
+                ta.setPromoter(obj.getPromoter());
+                ta.setNextExecuteUserIds(obj.getNextExecuteUserIds());
+                ta.setSequenceNbr(obj.getSequenceNbr());
+                dto.setModel(ta);
+               // dto.setModel(obj);
                 dto.setFlowCreateDate(new Date());
                 dto.setTaskName(workflowResultDtos.get(0).getNextTaskName());
                 dto.setFlowCode(obj.getNextTaskId());
@@ -553,10 +558,15 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         }else {
             for (JgChangeRegistrationUnit obj : list) {
                 TaskModelDto dto = new TaskModelDto();
+                //行数据
                 dto.setModel(obj);
+                //摘要 按原有规则组装
                 dto.setTaskContent("来自"+obj.getEquType()+"【"+obj.getSupervisoryCode()+"】的业务办理,【申请单号:"+obj.getApplyNo()+"】");
+                //申请单号
                 dto.setTaskCode(obj.getApplyNo());
+                //业务类型枚举code值
                 dto.setTaskType(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getCode());
+                ////业务主键
                 dto.setRelationId(obj.getSequenceNbr()+"");
                 modelDtos.add(dto);
             }
@@ -995,7 +1005,13 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             taskModelDto.setStartUserCompanyName(dto.getUseUnitName());
             taskModelDto.setNextExecuteUser(dto.getNextExecutorIds());
             taskModelDto.setStartDate(dto.getCreateDate());
-            taskModelDto.setModel(dto);
+            TaskMessageDto obj = new TaskMessageDto();
+            obj.setInstanceId(dto.getInstanceId());
+            obj.setStatus(dto.getStatus());
+            obj.setPromoter(dto.getPromoter());
+            obj.setNextExecuteUserIds(dto.getNextExecuteUserIds());
+            obj.setSequenceNbr(dto.getSequenceNbr());
+            taskModelDto.setModel(obj);
             commonServiceImpl.buildTaskModel(Collections.singletonList(taskModelDto));
         }
     }
@@ -1062,7 +1078,13 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         TaskModelDto modelDto = new TaskModelDto();
         BeanUtil.copyProperties(taskV2Model, modelDto);
         modelDto.setNextExecuteUser(jgChangeRegistrationName.getNextExecutorIds());
-        modelDto.setModel(jgChangeRegistrationName);
+        TaskMessageDto obj = new TaskMessageDto();
+        obj.setInstanceId(jgChangeRegistrationName.getInstanceId());
+        obj.setStatus(jgChangeRegistrationName.getStatus());
+        obj.setPromoter(jgChangeRegistrationName.getPromoter());
+        obj.setNextExecuteUserIds(jgChangeRegistrationName.getNextExecuteUserIds());
+        obj.setSequenceNbr(jgChangeRegistrationName.getSequenceNbr());
+        modelDto.setModel(obj);
         // 再插入新代办、数据待定
         commonServiceImpl.buildTaskModel(Collections.singletonList(modelDto));
     }

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

@@ -253,11 +253,9 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             equipList.add(jgRelationEquip);
         }
         this.saveBatch(list);
-        if (SUBMIT_TYPE_FLOW.equals(submitType)) {
-            // 新增代办
-            for (JgScrapCancel jgScrapCancel : list) {
-                this.createTaskModel(jgScrapCancel, taskName[0], submitType, nextUserIds);
-            }
+        // 新增代办
+        for (JgScrapCancel jgScrapCancel : list) {
+            this.createTaskModel(jgScrapCancel, 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());
@@ -269,8 +267,8 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
 
     private void createTaskModel(JgScrapCancel scrapCancel, String taskName, String submitType, String nextUserIds) {
         ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+        TaskModelDto taskModelDto = new TaskModelDto();
         if ("1".equals(submitType)) {
-            TaskModelDto taskModelDto = new TaskModelDto();
             taskModelDto.setFlowCreateDate(scrapCancel.getCreateDate());
             taskModelDto.setTaskName(taskName);
             taskModelDto.setTaskCode(scrapCancel.getApplyNo());
@@ -295,8 +293,17 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             TaskMessageDto taskMessageDto = new TaskMessageDto();
             BeanUtils.copyProperties(scrapCancel, taskMessageDto);
             taskModelDto.setModel(taskMessageDto);
-            commonService.buildTaskModel(Collections.singletonList(taskModelDto));
+        } else {
+            TaskMessageDto taskMessageDto = new TaskMessageDto();
+            BeanUtils.copyProperties(scrapCancel, taskMessageDto);
+            taskModelDto.setModel(taskMessageDto);
+            taskModelDto.setTaskContent(this.buildTaskContent(scrapCancel.getSupervisoryCode(),
+                    scrapCancel.getCancelType(), scrapCancel.getApplyNo()));
+            taskModelDto.setTaskCode(scrapCancel.getApplyNo());
+            taskModelDto.setTaskType(businessTypeJudgment(scrapCancel.getCancelType()).getCode());
+            taskModelDto.setRelationId(taskMessageDto.getSequenceNbr() + "");
         }
+        commonService.buildTaskModel(Collections.singletonList(taskModelDto));
     }
 
     private void buildRoleList(List<ProcessTaskDTO> processTasks, List<String> roleListNext, List<String> roleListAll) {
@@ -346,7 +353,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
                     ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
                     List<ActWorkflowStartDTO> list = new ArrayList<>();
                     ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
-                    dto.setProcessDefinitionKey("unitRename");
+                    dto.setProcessDefinitionKey("scrapCancelNew");
                     dto.setBusinessKey(jgScrapCancelDto.getApplyNo());
                     dto.setCompleteFirstTask(true);
                     dto.setNextExecuteUserCompanyCode(jgScrapCancelDto.getReceiveOrgCode());
@@ -368,6 +375,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
                     // 创建待办
                     JgScrapCancel bean = new JgScrapCancel();
                     BeanUtil.copyProperties(jgScrapCancelDto, bean);
+                    commonService.deleteTaskModel(String.valueOf(jgScrapCancelDto.getSequenceNbr()));
                     createTaskModel(bean, taskName, "1", nextUserIds);
                 } catch (Exception e) {
                     log.error("提交失败：{}", e);

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

@@ -111,7 +111,8 @@
     "type": "109",
     "pageType": "draft",
     "name": "单位变更登记",
-    "url": "/mixuap?appId=1742358052905971713&id=1738018156141637633&roleIds={roleIds}&userId={userId}&pageType=edit"  },
+    "url": "/mixuap?appId=1742358052905971713&id=1738018156141637633&roleIds={roleIds}&userId={userId}&pageType=edit"
+  },
   {
     "type": "109",
     "pageType": "look",
@@ -126,6 +127,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"
@@ -134,7 +141,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",
@@ -180,6 +187,12 @@
   },
   {
     "type": "113-1",
+    "pageType": "draft",
+    "name": "移装报废",
+    "url": "/mixuap?appId=1742358052905971713&id=1737357808040439809&roleIds={roleIds}&userId={userId}&pageType=edit"
+  },
+  {
+    "type": "113-1",
     "pageType": "look",
     "name": "移装报废",
     "url": "/mixuap?appId=1742358052905971713&id=1737357871097606146&roleIds={roleIds}&userId={userId}&pageType=look"