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

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

@@ -348,6 +348,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
 
         // 判断当前是否为提交
         List<String> instanceIdList = new ArrayList<>();
+        List<String> taskIds = new ArrayList<>();
         List<WorkflowResultDto> workflowResultDtos = new ArrayList<>();
         if (SUBMIT_TYPE_FLOW.equals(submitType)) {
             // 发起流程
@@ -366,6 +367,10 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             List<ProcessTaskDTO> processTaskDTOS = cmWorkflowService.startBatch(actWorkflowBatchDTO);
             workflowResultDtos = commonServiceImpl.buildWorkFlowInfo(processTaskDTOS);
 
+            for (WorkflowResultDto processTaskDTO : workflowResultDtos) {
+                instanceIdList.add(processTaskDTO.getInstanceId());
+                taskIds.add(processTaskDTO.getNextTaskId());
+            }
 //          if (CollectionUtil.isNotEmpty(processTaskDTOS)){
 //              for (ProcessTaskDTO processTaskDTO : processTaskDTOS) {
 //                  instanceIdList.add(processTaskDTO.getProcessInstance().getId());
@@ -452,6 +457,9 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                 dto.setStatus(WorkFlowStatusEnum.UNITCHANGE_RECEIVE.getPass());
             } else {
                 dto.setStatus(WorkFlowStatusEnum.UNITCHANGE_SUBMIT.getPass());
+            } if (!CollectionUtils.isEmpty(taskIds)) {
+                dto.setNextTaskId(taskIds.get(i));
+            } else {
             }
             list.add(dto);
             equipList.add(jgRelationEquip);
@@ -466,13 +474,13 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             dto.setModel(obj);
             dto.setFlowCreateDate(new Date());
             dto.setTaskName(workflowResultDtos.get(0).getNextTaskName());
-            dto.setFlowCode("");
+            dto.setFlowCode(obj.getNextTaskId());
             dto.setTaskContent("来自"+obj.getEquType()+"【"+obj.getSupervisoryCode()+"】的业务办理,【申请单号:"+obj.getApplyNo()+"】");
-            //dto.setTaskDesc();
+            dto.setTaskCode(obj.getApplyNo());
             dto.setTaskType(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getCode());
             dto.setTaskTypeLabel(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getName());
             dto.setRelationId(obj.getInstanceId());
-            dto.setExecuteUserIds(workDto.getNextExecutorUserIds());
+            dto.setExecuteUserIds(workflowResultDtos.get(0).getNextExecutorUserIds());
             dto.setTaskStatusLabel("未处理");
             dto.setFlowStatus(commonServiceImpl.getDictionaryCodeByName(WorkFlowStatusEnum.UNITCHANGE_RECEIVE.getPass()));
             dto.setFlowStatusLabel(WorkFlowStatusEnum.UNITCHANGE_RECEIVE.getPass());

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

@@ -2,77 +2,93 @@
   "SGGZ": [
     {
       "name": "安装告知",
-      "code": "GZ_AZ"
+      "code": "GZ_AZ",
+      "image": "upload/tzs/common/image/安装告知.png"
     },
     {
       "name": "改造告知",
-      "code": "GZ_GZ"
+      "code": "GZ_GZ",
+      "image": "upload/tzs/common/image/改造告知.png"
     },
     {
       "name": "维修告知",
-      "code": "GZ_WX"
+      "code": "GZ_WX",
+      "image": "upload/tzs/common/image/维修告知.png"
     },
     {
       "name": "移装告知",
-      "code": "GZ_YZ"
+      "code": "GZ_YZ",
+      "image": "upload/tzs/common/image/移装告知.png"
     }
   ],
   "DJGL":[
     {
       "name": "使用登记",
-      "code": "DJ_SY"
+      "code": "DJ_SY",
+      "image": "upload/tzs/common/image/使用登记.png"
     },
     {
       "name": "改造变更登记",
-      "code": "DJ_GZ"
+      "code": "DJ_GZ",
+      "image": "upload/tzs/common/image/改造变更登记.png"
     },
     {
       "name": "移装变更登记",
-      "code": "DJ_YZ"
+      "code": "DJ_YZ",
+      "image": "upload/tzs/common/image/移装变更登记.png"
     },
     {
       "name": "单位变更登记",
-      "code": "DJ_DW"
+      "code": "DJ_DW",
+      "image": "upload/tzs/common/image/单位变更登记.png"
     },
     {
       "name": "更名变更登记",
-      "code": "DJ_GM"
+      "code": "DJ_GM",
+      "image": "upload/tzs/common/image/更名变更登记.png"
     }
   ],
   "WBBA":[
     {
       "name": "维保备案",
-      "code": "WB_BA"
+      "code": "WB_BA",
+      "image": "upload/tzs/common/image/维保备案.png"
     }
   ],
   "SBYJ":[
     {
       "name": "设备移交",
-      "code": "SB_YJ"
+      "code": "SB_YJ",
+      "image": "upload/tzs/common/image/设备移交.png"
     }
   ],
   "QTBF":[
     {
       "name": "设备启用",
-      "code": "SB_QY"
+      "code": "SB_QY",
+      "image": "upload/tzs/common/image/设备启用.png"
     },
     {
       "name": "设备停用",
-      "code": "SB_TY"
+      "code": "SB_TY",
+      "image": "upload/tzs/common/image/设备停用.png"
     },
     {
       "name": "移装报废",
-      "code": "BF_YZ"
+      "code": "BF_YZ",
+      "image": "upload/tzs/common/image/移装报废.png"
     },
     {
       "name": "注销报废",
-      "code": "BF_ZX"
+      "code": "BF_ZX",
+      "image": "upload/tzs/common/image/注销报废.png"
     }
   ],
   "XZSB":[
     {
       "name": "新增设备",
-      "code": "SB_XZ"
+      "code": "SB_XZ",
+      "image": "upload/tzs/common/image/新增设备.png"
     }
   ]
 }
\ No newline at end of file