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

@@ -51,4 +51,7 @@ public class JgResumeInfoDto extends BaseDto {
 
     @ApiModelProperty(value = "审批单位Code")
     private String approvalUnitCode;
+
+    @ApiModelProperty(value = "详情路径")
+    private String routePath;
 }

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

@@ -83,4 +83,9 @@ public class JgResumeInfo extends BaseEntity {
     @TableField("approval_unit_code")
     private String approvalUnitCode;
 
+    /**
+     * 详情路径
+     */
+    @TableField("route_path")
+    private String routePath;
 }

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

@@ -105,7 +105,8 @@
             rec_user_name as recUserName,
             DATE_FORMAT(rec_date,'%Y-%m-%d %H:%i:%s') as recDate,
             approval_unit as approvalUnit,
-            status
+            status,
+            route_path as routePath
         from tzs_jg_resume_info
         where equ_id = #{record}
         order by rec_date ASC

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

@@ -551,6 +551,7 @@ public class CommonServiceImpl implements ICommonService {
                     String content = String.format("%s  创建人：%s  单号【%s】  审批单位：%s",
                             x.get("businessType"), x.get("recUserName"), x.get("applyNo"), x.get("approvalUnit"));
                     map.put("content", content);
+                    map.put("routePath", x.get("routePath"));
                     return map;
                 })
                 .collect(Collectors.toList());

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

@@ -567,15 +567,6 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             List<JgInstallationNoticeEq> jgRelationEquipList = equipList.stream().map(jgRelationEquip -> {
                 List<JgInstallationNotice> collect = list.stream().filter(jgInstallationNotice -> jgRelationEquip.getEquipTransferId().equals(jgInstallationNotice.getApplyNo())).collect(Collectors.toList());
                 Long sequenceNbr = collect.get(0).getSequenceNbr();
-                jgResumeInfoService.createWithModel(JgResumeInfoDto.builder()
-                        .applyNo(collect.get(0).getApplyNo())
-                        .businessType(BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getName())
-                        .businessId(sequenceNbr+"")
-                        .equId(jgRelationEquip.getEquId())
-                        .approvalUnit(collect.get(0).getReceiveOrgName())
-                        .approvalUnitCode(collect.get(0).getReceiveOrgCreditCode())
-                        .status("正常")
-                        .build());
                 return jgRelationEquip.setEquipTransferId(String.valueOf(sequenceNbr));
             }).collect(Collectors.toList());
             jgInstallationNoticeEqMapper.insertBatchSomeColumn(jgRelationEquipList);
@@ -1018,7 +1009,19 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                     TaskMessageDto taskMessageDto = new TaskMessageDto();
                     BeanUtils.copyProperties(jgInstallationNotice, taskMessageDto);
                     taskMap.put("model", taskMessageDto);
-                    commonService.updateTaskModel(taskMap);
+                    TaskV2Model taskV2Model1 = commonService.updateTaskModel(taskMap);
+
+                    jgResumeInfoService.createWithModel(JgResumeInfoDto.builder()
+                            .applyNo(jgInstallationNotice.getApplyNo())
+                            .businessType(BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getName())
+                            .businessId(jgInstallationNotice.getSequenceNbr() + "")
+                            .equId(jgRelationEquip.getEquId())
+                            .approvalUnit(jgInstallationNotice.getReceiveOrgName())
+                            .approvalUnitCode(jgInstallationNotice.getReceiveOrgCreditCode())
+                            .status("正常")
+                            .routePath(taskV2Model1.getRoutePath())
+                            .build());
+
                 } else {
                     jgInstallationNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
                     jgInstallationNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());

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

@@ -494,15 +494,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 this.save(jgUseRegistration);
                 jgRelationEquip.setEquipTransferId(jgUseRegistration.getSequenceNbr().toString());
                 jgRelationEquipMapper.insert(jgRelationEquip);
-                jgResumeInfoService.createWithModel(JgResumeInfoDto.builder()
-                        .applyNo(jgUseRegistration.getApplyNo())
-                        .businessType(BusinessTypeEnum.JG_USAGE_REGISTRATION.getName() + "(台套)")
-                        .businessId(jgUseRegistration.getSequenceNbr() + "")
-                        .equId(jgRelationEquip.getEquId())
-                        .approvalUnit(jgUseRegistration.getReceiveOrgName())
-                        .approvalUnitCode(jgUseRegistration.getReceiveOrgCode())
-                        .status("正常")
-                        .build());
             }
             // 暂存历史表
             updateHistory(map, map.get("equipId").toString(), String.valueOf(jgUseRegistration.getSequenceNbr()), jgUseRegistration.getSupervisoryCode());
@@ -1027,7 +1018,18 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         BeanUtil.copyProperties(jgUseRegistration, taskMessageDto);
         taskMessageDto.setEquipId(String.valueOf(mapData.get("equipId")));
         params.put("model", taskMessageDto);
-        commonServiceImpl.updateTaskModel(params);
+        TaskV2Model taskV2Model = commonServiceImpl.updateTaskModel(params);
+
+        jgResumeInfoService.createWithModel(JgResumeInfoDto.builder()
+                .applyNo(jgUseRegistration.getApplyNo())
+                .businessType(BusinessTypeEnum.JG_USAGE_REGISTRATION.getName() + "(台套)")
+                .businessId(jgUseRegistration.getSequenceNbr() + "")
+                .equId((String) mapData.get("equipId"))
+                .approvalUnit(jgUseRegistration.getReceiveOrgName())
+                .approvalUnitCode(jgUseRegistration.getReceiveOrgCode())
+                .status("正常")
+                .routePath(taskV2Model.getRoutePath())
+                .build());
     }
 
     /**