fix(JG)：设备移交代码提交

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgEquipTransferDto.java

@@ -107,6 +107,9 @@ public class JgEquipTransferDto  extends BaseDto {
     @ApiModelProperty(value = "监管码")
     private String supervisoryCode;
 
+    @ApiModelProperty(value = "设备种类")
+    private String equList;
+
     @ApiModelProperty(value = "单位内编号")
     private String useInnerCode;
 

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

@@ -159,4 +159,10 @@ public class JgEquipTransfer extends BaseEntity {
      */
     @TableField(exist = false)
     private String supervisoryCode;
+
+    /**
+     * 设备类型
+     */
+    @TableField(exist = false)
+    private String equList;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgEquipTransferMapper.xml

@@ -143,7 +143,11 @@
             ui.PROVINCE_NAME AS useUnitProvinceName,
             ui.CITY_NAME AS useUnitCityName,
             ui.COUNTY_NAME AS useUnitCountyName,
-            ui.ADDRESS AS useUnitAddress
+            ui.ADDRESS AS useUnitAddress,
+            tec2.name AS equCategory,
+            tec1.name AS equList,
+            tec.name AS equDefine,
+            oi.SUPERVISORY_CODE AS supervisoryCode
         FROM
             tzs_jg_equip_transfer jet
             LEFT JOIN tzs_jg_equip_transfer_eq ete ON ete.equip_transfer_id = jet.sequence_nbr
@@ -152,6 +156,10 @@
             LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = ete.equ_id
             LEFT JOIN idx_biz_jg_inspection_detection_info idi ON idi.record = ete.equ_id
             LEFT JOIN idx_biz_jg_use_info ui ON ui.record = ete.equ_id
+            LEFT JOIN tz_equipment_category tec ON ri."EQU_CATEGORY"::text = tec.code::text
+            LEFT JOIN tz_equipment_category tec1 ON ri."EQU_LIST"::text = tec1.code::text
+            LEFT JOIN tz_equipment_category tec2 ON ri."EQU_DEFINE"::text = tec2.code::text
+            LEFT JOIN idx_biz_jg_other_info oi ON ri.RECORD = oi.RECORD
         WHERE
             jet.sequence_nbr = #{sequenceNbr}
         LIMIT 1

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

@@ -98,6 +98,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
             JgEquipTransfer dto = buildJgEquipTransfer(model, applyNo, reginParams, submitType, workflowResultList, i);
 
             dto.setSupervisoryCode(String.valueOf(obj.get("SUPERVISORY_CODE")));
+            dto.setEquList(String.valueOf(obj.get("EQU_LIST")));
             dto.setCreateUserName(reginParams.getUserModel().getRealName());
             dto.setCreateUserId(reginParams.getUserModel().getUserId());
             dto.setCreateUserCompanyName(reginParams.getCompany().getCompanyName());
@@ -187,7 +188,8 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
 
     /**
      * 组装代办消息
-     * @param item 设备移交信息
+     *
+     * @param item              设备移交信息
      * @param workflowResultDto 工作流返回信息
      * @return 代办信息
      */
@@ -202,8 +204,10 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
                 .executeUserIds(workflowResultDto.getNextExecutorUserIds())
                 .taskStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode())
                 .taskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName())
-                .taskDesc("来自" + "电梯" + "【" + item.getSupervisoryCode() + "】," + "【申请单号：" + item.getApplyNo() + "】")
-                .taskContent("来自" + "电梯" + "【" + item.getSupervisoryCode() + "】," + "【申请单号：" + item.getApplyNo() + "】")
+                .flowStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode())
+                .flowStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName())
+                .taskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), item.getSupervisoryCode(), item.getApplyNo()))
+                .taskDesc(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), item.getSupervisoryCode(), item.getApplyNo()))
                 .startUserId(item.getCreateUserId())
                 .startUser(item.getCreateUserName())
                 .startUserCompanyName(item.getCreateUserCompanyName())
@@ -212,12 +216,11 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
                 .nextExecuteUser(item.getNextExecuteIds())
                 .build();
     }
-
     /**
      * 启动工作流
-     * @param submitType
-     * @param deviceList
-     * @return
+     * @param submitType 提交类型
+     * @param deviceList 设备列表
+     * @return 工作流信息
      */
     private List<WorkflowResultDto> workFlowInfo(String submitType, List<Map<String, Object>> deviceList) {
         if (!SUBMIT_TYPE_FLOW.equals(submitType)) {
@@ -344,7 +347,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
             if (StringUtils.isEmpty(workflowResultDto.getNextExecutorRoleIds())) {
                 jgEquipTransfer.setApplyStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
                 jgEquipTransfer.setPromoter("");
-                if (jgEquipTransferEq != null){
+                if (jgEquipTransferEq != null) {
                     Map<String, Map<String, Object>> resultMap = MapBuilder.<String, Map<String, Object>>create()
                             .put(jgEquipTransferEq.getEquId(), MapBuilder.<String, Object>create()
                                     .put("USC_UNIT_NAME", jgEquipTransfer.getInstallUnitName())
@@ -358,6 +361,8 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
                 taskV2Model = commonService.updateTaskModel(MapBuilder.<String, Object>create()
                         .put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode())
                         .put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName())
+                        .put("flowStatus", FlowStatusEnum.TO_BE_FINISHED.getCode())
+                        .put("flowStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName())
                         .put("relationId", jgEquipTransfer.getInstanceId())
                         .build());
             } else {
@@ -374,58 +379,52 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
                 commonService.updateTaskModel(MapBuilder.<String, Object>create()
                         .put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode())
                         .put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName())
+                        .put("flowStatus", FlowStatusEnum.TO_BE_FINISHED.getCode())
+                        .put("flowStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName())
                         .put("relationId", jgEquipTransfer.getInstanceId())
                         .build());
 
                 // 创建新的代办
-                TaskModelDto taskModelDto = TaskModelDto.builder()
-                        .flowCreateDate(taskV2Model.getFlowCreateDate())
-                        .taskName(workflowResultDto.getNextTaskName())
-                        .taskCode(taskV2Model.getTaskCode())
-                        .taskType(taskV2Model.getTaskType())
-                        .taskTypeLabel(taskV2Model.getTaskTypeLabel())
-                        .relationId(taskV2Model.getRelationId())
-                        .executeUserIds(workflowResultDto.getNextExecutorUserIds())
-                        .taskStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode())
-                        .taskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName())
-                        .startUserId(taskV2Model.getStartUserId())
-                        .startUser(taskV2Model.getStartUser())
-                        .startDate(taskV2Model.getStartDate())
-                        .model(jgEquipTransfer)
-                        .nextExecuteUser(workflowResultDto.getNextExecutorRoleIds())
-                        .build();
-
-                commonService.buildTaskModel(Collections.singletonList(taskModelDto));
-
+                this.createNewTodo(jgEquipTransfer, workflowResultDto, taskV2Model);
             }
         } else {
             //驳回
             jgEquipTransfer.setPromoter("");
             jgEquipTransfer.setApplyStatus(String.valueOf(FlowStatusEnum.REJECTED.getCode()));
 
-            // 上个代办改为已办
-            commonService.updateTaskModel(MapBuilder.<String, Object>create()
-                    .put("taskStatus", commonService.getDictionaryCodeByName(jgEquipTransfer.getApplyStatus()))
-                    .put("taskStatusLabel", jgEquipTransfer.getApplyStatus())
-                    .put("relationId", jgEquipTransfer.getInstanceId())
-                    .build());
-
-            TaskModelDto taskModelDto = new TaskModelDto();
-            BeanUtils.copyProperties(taskV2Model, taskModelDto);
-            // 创建新的代办
-            taskModelDto.setModel(jgEquipTransfer);
-            taskModelDto.setTaskName(workflowResultDto.getNextTaskName());
-            taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
-            taskModelDto.setTaskStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode());
-            taskModelDto.setTaskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
-            taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
+            // 上个代办改为驳回
+            TaskV2Model taskV2Model1 = this.updateLastTodo(jgEquipTransfer, FlowStatusEnum.REJECTED);
+
+            TaskModelDto taskModelDto = TaskModelDto.builder()
+                    .taskName(workflowResultDto.getNextTaskName())
+                    .executeUserIds(workflowResultDto.getNextExecutorUserIds())
+                    .taskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName())
+                    .flowStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode())
+                    .flowStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName())
+                    .nextExecuteUser(workflowResultDto.getNextExecutorRoleIds())
+                    .model(jgEquipTransfer)
+                    .startUserId(taskV2Model1.getStartUserId())
+                    .startUser(taskV2Model1.getStartUser())
+                    .startDate(taskV2Model1.getStartDate())
+                    .flowCreateDate(taskV2Model1.getFlowCreateDate())
+                    .taskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", jgEquipTransferDto.getEquList(), jgEquipTransferDto.getSupervisoryCode(), jgEquipTransferDto.getApplyNo()))
+                    .taskDesc(String.format("来自%s【%s】的业务办理，【申请单号：%s】", jgEquipTransferDto.getEquList(), jgEquipTransferDto.getSupervisoryCode(), jgEquipTransferDto.getApplyNo()))
+                    .startUserCompanyName(reginParams.getCompany().getCompanyName())
+                    .taskName(workflowResultDto.getNextTaskName())
+                    .taskCode(taskV2Model1.getTaskCode())
+                    .taskType(taskV2Model1.getTaskType())
+                    .taskTypeLabel(taskV2Model1.getTaskTypeLabel())
+                    .relationId(taskV2Model1.getRelationId())
+                    .build();
             commonService.buildTaskModel(Collections.singletonList(taskModelDto));
+
         }
         updateById(jgEquipTransfer);
     }
 
     /**
      * 撤回
+     *
      * @param equipTransferInfo equipTransferInfo
      */
     public void cancel(JgEquipTransferDto equipTransferInfo) {
@@ -437,8 +436,12 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
         equipTransfer.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
         equipTransfer.setApplyStatus(String.valueOf(FlowStatusEnum.ROLLBACK.getCode()));
         this.baseMapper.updateById(equipTransfer);
-        commonService.deleteTaskModel(equipTransfer.getInstanceId());
-        commonService.rollbackTask(equipTransfer.getInstanceId());
+        JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(equipTransfer));
+        jsonObject.put("nextTaskId", equipTransfer.getNextTaskId());
+        jsonObject.put("nextExecuteUser", equipTransfer.getNextExecuteIds());
+        jsonObject.put("taskType", BusinessTypeEnum.JG_EQUIPMENT_HANDOVER.getCode());
+        commonService.rollbackTask(equipTransfer.getInstanceId(), jsonObject);
+
     }
 
     public JgEquipTransferDto updateEquipTransfer(String submitType, JgEquipTransferDto equipTransferDto, String op) {
@@ -447,8 +450,8 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
 
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(
                 RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
-        // 字段转换
         this.convertField(equipTransferDto);
+
         equipTransferDto.setPromoter(reginParams.getUserModel().getUserId());
         JgEquipTransfer transfer = this.getById(equipTransferDto.getSequenceNbr());
         if (SUBMIT_TYPE_FLOW.equals(submitType)) {
@@ -479,9 +482,9 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
                 updateById(transfer);
                 // 如果为保存并提交，则创建代办
                 buildTask(Collections.singletonList(transfer), Collections.singletonList(workflowResultDto));
-            }else {
-                ProcessTaskDTO processTaskDTO = new ProcessTaskDTO();
-                WorkflowResultDto workflowResultDto = new WorkflowResultDto();
+            } else {
+                ProcessTaskDTO processTaskDTO;
+                WorkflowResultDto workflowResultDto;
                 TaskResultDTO dto = new TaskResultDTO();
                 dto.setResultCode("approvalStatus");
                 dto.setTaskId(transfer.getNextTaskId());
@@ -507,21 +510,9 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
                 transfer.setApplyStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
                 updateById(transfer);
                 // 上个代办改为已办
-                HashMap<String, Object> map = new HashMap<>();
-                map.put("taskStatus", commonService.getDictionaryCodeByName(transfer.getApplyStatus()));
-                map.put("taskStatusLabel", transfer.getApplyStatus());
-                map.put("relationId", transfer.getInstanceId());
-                TaskV2Model taskV2Model = commonService.updateTaskModel(map);
-                TaskModelDto taskModelDto = new TaskModelDto();
-                BeanUtils.copyProperties(taskV2Model, taskModelDto);
+                TaskV2Model taskV2Model = this.updateLastTodo(transfer,FlowStatusEnum.TO_BE_PROCESSED);
                 // 创建新的代办
-                taskModelDto.setModel(transfer);
-                taskModelDto.setTaskName(workflowResultDto.getNextTaskName());
-                taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
-                taskModelDto.setTaskStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode());
-                taskModelDto.setTaskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
-                taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
-                commonService.buildTaskModel(Collections.singletonList(taskModelDto));
+                this.createNewTodo(transfer, workflowResultDto, taskV2Model);
             }
         } else {
             JgEquipTransfer bean = new JgEquipTransfer();
@@ -530,4 +521,50 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
         }
         return equipTransferDto;
     }
+
+    /**
+     * 上个代办改为已办
+     * @param transfer 设备信息
+     * @return 代办信息
+     */
+    private TaskV2Model updateLastTodo(JgEquipTransfer transfer, FlowStatusEnum statusEnum) {
+        return commonService.updateTaskModel(MapBuilder.<String, Object>create()
+                .put("taskStatus", statusEnum.getCode())
+                .put("taskStatusLabel",statusEnum.getName())
+                .put("flowStatus", statusEnum.getCode())
+                .put("flowStatusLabel", statusEnum.getName())
+                .put("relationId", transfer.getInstanceId())
+                .build());
+    }
+
+    /**
+     * 创建新代办
+     * @param transfer 设备信息
+     * @param workflowResultDto 工作流信息
+     * @param taskV2Model 代办信息
+     */
+    private void createNewTodo(JgEquipTransfer transfer, WorkflowResultDto workflowResultDto, TaskV2Model taskV2Model) {
+        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+        TaskModelDto taskModelDto = TaskModelDto.builder()
+                .flowCreateDate(taskV2Model.getFlowCreateDate())
+                .taskName(workflowResultDto.getNextTaskName())
+                .taskCode(taskV2Model.getTaskCode())
+                .taskType(taskV2Model.getTaskType())
+                .taskTypeLabel(taskV2Model.getTaskTypeLabel())
+                .relationId(taskV2Model.getRelationId())
+                .executeUserIds(workflowResultDto.getNextExecutorUserIds())
+                .taskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName())
+                .flowStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode())
+                .flowStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName())
+                .taskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", transfer.getEquList(), transfer.getSupervisoryCode(), transfer.getApplyNo()))
+                .taskDesc(String.format("来自%s【%s】的业务办理，【申请单号：%s】", transfer.getEquList(), transfer.getSupervisoryCode(), transfer.getApplyNo()))
+                .startUserCompanyName(reginParams.getCompany().getCompanyName())
+                .startUserId(taskV2Model.getStartUserId())
+                .startUser(taskV2Model.getStartUser())
+                .startDate(taskV2Model.getStartDate())
+                .model(transfer)
+                .nextExecuteUser(workflowResultDto.getNextExecutorRoleIds())
+                .build();
+        commonService.buildTaskModel(Collections.singletonList(taskModelDto));
+    }
 }
\ No newline at end of file

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

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