移装告知业务开发

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

@@ -298,11 +298,11 @@ public class JgTransferNotice extends BaseEntity {
     @TableField(value = "handle_date")
     private Date handleDate;
 
-    @TableField(value = "create_user_company_name")
+    @TableField(value = "\"create_user_company_name\"")
     private String createUserCompanyName;
 
     //下一步任务ID
-    @TableField(value = "next_taskId")
+    @TableField(value = "\"next_taskId\"")
     private String nextTaskId;
 
 }

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

@@ -365,7 +365,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
     @SuppressWarnings({"Duplicates", "rawtypes"})
     @Transactional(rollbackFor = Exception.class)
     public void saveNotice(String submitType, Map<String, Object> jgTransferNoticeDtoMap, ReginParams reginParams) {
-        JgTransferNoticeDto model = JSON.parseObject(jgTransferNoticeDtoMap.get(TABLE_PAGE_ID).toString(), JgTransferNoticeDto.class);
+        JgTransferNoticeDto model = JSON.parseObject(JSONObject.toJSONString(jgTransferNoticeDtoMap.get(TABLE_PAGE_ID)), JgTransferNoticeDto.class);
         // 字段转换
         convertField(model);
         // 获取告知设备列表
@@ -379,8 +379,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             return;
         }
 
-        // 判断当前是否为提交
-        List<String> instanceIdList = new ArrayList<>();
+
         // 启动工作流并返回信息
         List<WorkflowResultDto> workflowResultList = workFlowInfo(submitType, deviceList);
 
@@ -406,12 +405,14 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             dto.setInstallUnitCreditCode(reginParams.getCompany().getCompanyCode());
             jgRelationEquip.setEquId(String.valueOf(obj.get("SEQUENCE_NBR")));
             jgRelationEquip.setEquipTransferId(applyNo);
-            if (!CollectionUtils.isEmpty(instanceIdList)) {
-                dto.setInstanceId(instanceIdList.get(i));
+            if (!CollectionUtils.isEmpty(workflowResultList)) {
+                dto.setInstanceId(workflowResultList.get(i).getInstanceId());
                 dto.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
             } else {
                 dto.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
             }
+            dto.setCreateUserName(reginParams.getUserModel().getRealName());
+            dto.setCreateUserId(reginParams.getUserModel().getUserId());
             list.add(dto);
             equipList.add(jgRelationEquip);
         });
@@ -443,12 +444,12 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             taskModelDto.setFlowCreateDate(item.getCreateDate());
             taskModelDto.setTaskName(workflowResultDto.getNextTaskName()); // 工作流API返回
             taskModelDto.setTaskCode(item.getApplyNo());
-            taskModelDto.setTaskType(BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getCode());
-            taskModelDto.setTaskTypeLabel(BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getName());
+            taskModelDto.setTaskType(BusinessTypeEnum.JG_ADVICE_REMOVAL.getCode());
+            taskModelDto.setTaskTypeLabel(BusinessTypeEnum.JG_ADVICE_REMOVAL.getName());
             taskModelDto.setRelationId(item.getInstanceId());
             taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds()); // 工作流API返回
-            taskModelDto.setTaskStatus(commonService.getDictionaryCodeByName(item.getNoticeStatus())); // 流程状态枚举
-            taskModelDto.setTaskStatusLabel(item.getNoticeStatus());
+            taskModelDto.setTaskStatus(commonService.getDictionaryCodeByName(FlowStatusEnum.TO_BE_PROCESSED.getName())); // 流程状态枚举
+            taskModelDto.setTaskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
             taskModelDto.setStartUserId(item.getCreateUserId());
             taskModelDto.setStartUser(item.getCreateUserName());
             taskModelDto.setStartUserCompanyName(item.getCreateUserCompanyName()); // 任务发起人所在单位
@@ -598,6 +599,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             commMap.put("approvalStatus", op);
         }
         workDto.setVariable(commMap);
+        workDto.setComment(opinion);
         processTaskDTO = iCmWorkflowService.complete(jgTransferNotice.getNextTaskId(), workDto);
         // 提取节点等信息
         workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
@@ -623,8 +625,8 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 this.generateTransferNoticeReport(jgTransferNotice.getSequenceNbr());
                 // 上个代办改为已办
                 HashMap<String, Object> taskMap = new HashMap<>();
-                taskMap.put("taskStatus", commonService.getDictionaryCodeByName(jgTransferNotice.getNoticeStatus()));
-                taskMap.put("taskStatusLabel", jgTransferNotice.getNoticeStatus());
+                taskMap.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
+                taskMap.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
                 taskMap.put("relationId", jgTransferNotice.getInstanceId());
                 taskV2Model = commonService.updateTaskModel(taskMap);
             } else {
@@ -637,8 +639,8 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 jgTransferNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
                 // 上个代办改为已办
                 HashMap<String, Object> taskMap = new HashMap<>();
-                taskMap.put("taskStatus", commonService.getDictionaryCodeByName(jgTransferNotice.getNoticeStatus()));
-                taskMap.put("taskStatusLabel", jgTransferNotice.getNoticeStatus());
+                taskMap.put("taskStatus", FlowStatusEnum.TO_BE_PROCESSED.getCode());
+                taskMap.put("taskStatusLabel", FlowStatusEnum.TO_BE_PROCESSED.getName());
                 taskMap.put("relationId", jgTransferNotice.getInstanceId());
                 taskV2Model = commonService.updateTaskModel(taskMap);
                 TaskModelDto taskModelDto = new TaskModelDto();
@@ -657,8 +659,8 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             jgTransferNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.REJECTED.getCode()));
             // 上个代办改为已办
             HashMap<String, Object> taskMap = new HashMap<>();
-            taskMap.put("taskStatus", commonService.getDictionaryCodeByName(jgTransferNotice.getNoticeStatus()));
-            taskMap.put("taskStatusLabel", jgTransferNotice.getNoticeStatus());
+            taskMap.put("taskStatus", jgTransferNotice.getNoticeStatus());
+            taskMap.put("taskStatusLabel", FlowStatusEnum.REJECTED.getName());
             taskMap.put("relationId", jgTransferNotice.getInstanceId());
             taskV2Model = commonService.updateTaskModel(taskMap);
             TaskModelDto taskModelDto = new TaskModelDto();

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

@@ -51,7 +51,7 @@
     "type": "105",
     "pageType": "look",
     "name": "移装告知",
-    "url": ""
+    "url": "/mixuap?appId=1742358052905971713&id=1736722525146083329&formType=detail&userId={userId}&roleIds={roleIds}"
   },
   {
     "type": "105",