Merge branch 'develop_tzs_register' of…

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

@@ -46,6 +46,9 @@ public class JgResumeInfoDto extends BaseDto {
     @ApiModelProperty(value = "业务类型")
     private String businessType;
 
+    @ApiModelProperty(value = "变更内容")
+    private String changeContent;
+
     @ApiModelProperty(value = "审批单位")
     private String approvalUnit;
 

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

@@ -105,4 +105,10 @@ public class JgResumeInfo extends BaseEntity {
      */
     @TableField("resume_type")
     private String resumeType;
+
+    /**
+     * 变更内容
+     */
+    @TableField("change_content")
+    private String changeContent;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/event/listener/ChangeLogInsertListener.java

@@ -49,6 +49,9 @@ public class ChangeLogInsertListener {
     @Value("${change.log.deal.thread.number:1}")
     private int threadNumber;
 
+    @Value("${change.log.deal.routePath:/mixuap?appId=1742358052905971713&id=1924440797940314113}")
+    private String routePath;
+
     private final ESDataChangeLogDao esDataChangeLogDao;
 
     private final JgBizChangeLogServiceImpl bizChangeLogService;
@@ -104,21 +107,21 @@ public class ChangeLogInsertListener {
                     Optional.ofNullable(event.getBizRelationData().getRecords()).orElse(Collections.emptySet()).stream()
             ).findFirst().orElse(null);
             String businessTypeName = BusinessTypeEnum
-                    .findNameByEnumName(changeLog.getBizType())
-                    .map(name -> "设备编辑_" + name)
-                    .orElse("设备编辑");
+                    .findNameByEnumName(changeLog.getBizType()).orElse("设备编辑");
             jgResumeInfoService.createWithModel(JgResumeInfoDto.builder()
                     .applyNo(event.getBizRelationData().getBizId())
                     .businessType(businessTypeName)
                     .businessId(event.getBizRelationData().getBizId())
                     .equId(equId)
                     .resumeType("1")
+                    .changeContent("设备编辑")
                     .changeLogId(String.valueOf(changeLog.getSequenceNbr()))
                     .approvalUnit(event.getBizRelationData().getUnitName())
                     .approvalUnitCode(event.getBizRelationData().getUnitCode())
                     .createUserName(event.getBizRelationData().getRecUserName())
                     .createUserId(event.getRequestContext().getExcutedUserId())
                     .status("正常")
+                    .routePath(routePath)
                     .build());
         } catch (Exception e){
             log.error(e.getMessage(), e);