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

@@ -153,4 +153,10 @@ public class JgEquipTransfer extends BaseEntity {
 
     @TableField(value = "create_user_company_name")
     private String createUserCompanyName;
+
+    /**
+     * 设备监管码
+     */
+    @TableField(exist = false)
+    private String supervisoryCode;
 }

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

@@ -96,6 +96,8 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
 
             JgEquipTransferEq jgEquipTransferEq = buildJgEquipTransferEq(obj, applyNo);
             JgEquipTransfer dto = buildJgEquipTransfer(model, applyNo, reginParams, submitType, workflowResultList, i);
+
+            dto.setSupervisoryCode(String.valueOf(obj.get("SUPERVISORY_CODE")));
             dto.setCreateUserName(reginParams.getUserModel().getRealName());
             dto.setCreateUserId(reginParams.getUserModel().getUserId());
             dto.setCreateUserCompanyName(reginParams.getCompany().getCompanyName());
@@ -134,6 +136,12 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
             dto.setPromoter(reginParams.getUserModel().getUserId());
             dto.setNextTaskId(workflowResult.getNextTaskId());
         }
+        if (!CollectionUtils.isEmpty(workflowResultList)) {
+            dto.setInstanceId(workflowResultList.get(i).getInstanceId());
+            dto.setApplyStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
+        } else {
+            dto.setApplyStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
+        }
         return dto;
     }
 
@@ -177,6 +185,12 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
         commonService.buildTaskModel(taskModelDtoList);
     }
 
+    /**
+     * 组装代办消息
+     * @param item 设备移交信息
+     * @param workflowResultDto 工作流返回信息
+     * @return 代办信息
+     */
     private TaskModelDto buildTaskModelDto(JgEquipTransfer item, WorkflowResultDto workflowResultDto) {
         return TaskModelDto.builder()
                 .flowCreateDate(item.getCreateDate())
@@ -186,8 +200,10 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
                 .taskTypeLabel(BusinessTypeEnum.JG_EQUIPMENT_HANDOVER.getName())
                 .relationId(item.getInstanceId())
                 .executeUserIds(workflowResultDto.getNextExecutorUserIds())
-                .taskStatus(commonService.getDictionaryCodeByName(item.getApplyStatus()))
+                .taskStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode())
                 .taskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName())
+                .taskDesc("来自" + "电梯" + "【" + item.getSupervisoryCode() + "】," + "【申请单号：" + item.getApplyNo() + "】")
+                .taskContent("来自" + "电梯" + "【" + item.getSupervisoryCode() + "】," + "【申请单号：" + item.getApplyNo() + "】")
                 .startUserId(item.getCreateUserId())
                 .startUser(item.getCreateUserName())
                 .startUserCompanyName(item.getCreateUserCompanyName())
@@ -197,6 +213,12 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
                 .build();
     }
 
+    /**
+     * 启动工作流
+     * @param submitType
+     * @param deviceList
+     * @return
+     */
     private List<WorkflowResultDto> workFlowInfo(String submitType, List<Map<String, Object>> deviceList) {
         if (!SUBMIT_TYPE_FLOW.equals(submitType)) {
             return new ArrayList<>();

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

@@ -3,13 +3,7 @@
     "type": "101",
     "pageType": "look",
     "name": "设备移交",
-    "url": "/mixuap?appId=1742358052905971713&id=1737398850580148226&sequenceNbr=%s&roleIds=%s&nextExecuteIds=%s&pageType=edit&applyStatus=%s&userId=%s&instanceId=%s"
-  },
-  {
-    "type": "101",
-    "pageType": "edit",
-    "name": "设备移交",
-    "url": "/mixuap?appId=1742358052905971713&id=1737398850580148226&sequenceNbr=%s&roleIds=%s&nextExecuteIds=%s&pageType=edit&applyStatus=%s&userId=%s&instanceId=%s"
+    "url": "/mixuap?appId=1742358052905971713&id=1737399017643470849&formType=detail&roleIds={roleIds}&instanceId={instanceId}"
   },
   {
     "type": "102",