fix(大编辑)：自测联调修改

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

@@ -50,4 +50,7 @@ public class ESDataChangeLogDto {
 
     @Field(type = FieldType.Keyword)
     private String changeId;
+
+    @Field(type = FieldType.Keyword)
+    private String columnType;
 }

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

@@ -91,9 +91,40 @@ public class ChangeLogInsertListener {
         JgBizChangeLog changeLog = saveLog(event);
         // 2.子表字段保存
         List<ESDataChangeLogDto> logs = saveColumnsChange2Es(fieldChangeMetas, requestContextModel, date, changeLog);
+        // 3.异步记录履历日志
+        this.insertCertLog(changeLog, event);
         log.info("es 操作日志数据入库成功：{}条", logs.size());
     }
 
+    @Async
+    protected void insertCertLog(JgBizChangeLog changeLog, BaseBizDataChangeEvent event) {
+        try {
+            String equId = Stream.concat(
+                    Optional.ofNullable(event.getBizRelationData().getProjectContraptionIds()).orElse(Collections.emptySet()).stream(),
+                    Optional.ofNullable(event.getBizRelationData().getRecords()).orElse(Collections.emptySet()).stream()
+            ).findFirst().orElse(null);
+            String businessTypeName = BusinessTypeEnum
+                    .findNameByEnumName(changeLog.getBizType())
+                    .map(name -> "设备编辑_" + name)
+                    .orElse("设备编辑");
+            jgResumeInfoService.createWithModel(JgResumeInfoDto.builder()
+                    .applyNo(event.getBizRelationData().getBizId())
+                    .businessType(businessTypeName)
+                    .businessId(event.getBizRelationData().getBizId())
+                    .equId(equId)
+                    .resumeType("1")
+                    .changeLogId(String.valueOf(changeLog.getSequenceNbr()))
+                    .approvalUnit(event.getBizRelationData().getUnitName())
+                    .approvalUnitCode(event.getBizRelationData().getUnitCode())
+                    .createUserName(event.getBizRelationData().getRecUserName())
+                    .createUserId(event.getRequestContext().getExcutedUserId())
+                    .status("正常")
+                    .build());
+        } catch (Exception e){
+            log.error(e.getMessage(), e);
+        }
+    }
+
     private List<ESDataChangeLogDto> saveColumnsChange2Es(List<FieldChangeMeta> fieldChangeMetas, RequestContextModel requestContextModel, Date date, JgBizChangeLog changeLog) {
         List<ESDataChangeLogDto> logs = fieldChangeMetas.parallelStream().map(changeDataDto -> {
             ESDataChangeLogDto changeLogDto = new ESDataChangeLogDto();
@@ -108,6 +139,7 @@ public class ChangeLogInsertListener {
             changeLogDto.setColumnFamily(changeDataDto.getColumnFamily());
             changeLogDto.setBizType(changeDataDto.getBizType());
             changeLogDto.setBatchId(changeLog.getSequenceNbr() + "");
+            changeLogDto.setColumnType(changeDataDto.getColumnType());
             return changeLogDto;
         }).collect(Collectors.toList());
         if (!logs.isEmpty()) {
@@ -124,27 +156,6 @@ public class ChangeLogInsertListener {
         changeLog.setRecUserId(event.getRequestContext().getExcutedUserId());
         changeLog.setSequenceNbr(Long.parseLong(event.getRequestContext().getTraceId()));
         bizChangeLogService.getBaseMapper().insert(changeLog);
-        String equId = Stream.concat(
-                Optional.ofNullable(event.getBizRelationData().getProjectContraptionIds()).orElse(Collections.emptySet()).stream(),
-                Optional.ofNullable(event.getBizRelationData().getRecords()).orElse(Collections.emptySet()).stream()
-        ).findFirst().orElse(null);
-        String businessTypeName = BusinessTypeEnum
-                .findNameByEnumName(changeLog.getBizType())
-                .map(name -> "设备编辑_" + name)
-                .orElse("设备编辑");
-        jgResumeInfoService.createWithModel(JgResumeInfoDto.builder()
-                .applyNo(event.getBizRelationData().getBizId())
-                .businessType(businessTypeName)
-                .businessId(event.getBizRelationData().getBizId())
-                .equId(equId)
-                .resumeType("1")
-                .changeLogId(String.valueOf(changeLog.getSequenceNbr()))
-                .approvalUnit(event.getBizRelationData().getUnitName())
-                .approvalUnitCode(event.getBizRelationData().getUnitCode())
-                .createUserName(event.getBizRelationData().getRecUserName())
-                .createUserId(event.getRequestContext().getExcutedUserId())
-                .status("正常")
-                .build());
         return changeLog;
     }
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/biz/DefaultBizDataChangeHandler.java

 package com.yeejoin.amos.boot.module.jg.biz.edit.process.biz;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
@@ -36,7 +37,8 @@ public abstract class DefaultBizDataChangeHandler<U extends BaseBizDataChangeEve
     @Override
     public final void doSave(String bizId, String applyNo, ModelType model, Map<String, Object> changeData, ReginParams selectedOrgInfo) {
         if (beforeCheck(bizId, applyNo, model, changeData)) {
-            JSONObject oData = new JSONObject(changeData);
+            JSONObject oData = new JSONObject();
+            BeanUtil.copyProperties(changeData, oData);
             // 删除原始提交的变更说明及附件放置后续存放到json
             changeData.remove("changeReason");
             changeData.remove("changeAttachment");
@@ -53,14 +55,14 @@ public abstract class DefaultBizDataChangeHandler<U extends BaseBizDataChangeEve
         }
     }
 
-    private void publish2OtherBiz(List<FieldChangeMeta> allChangeColumns, String applyNo, JSONObject changeData, ReginParams selectedOrgInfo) {
+    private void publish2OtherBiz(List<FieldChangeMeta> allChangeColumns, String applyNo, JSONObject oData, ReginParams selectedOrgInfo) {
         if (!allChangeColumns.isEmpty()) {
             BizRelationDataDto bizRelationDataDto = new BizRelationDataDto();
             bizRelationDataDto.setBizId(applyNo);
             bizRelationDataDto.setBizType(canHandleBizType());
             bizRelationDataDto.setRecords(getEqs(applyNo));
-            bizRelationDataDto.setChangeReason(changeData.getString("changeReason"));
-            bizRelationDataDto.setChangeAttachment(JSONObject.toJSONString(changeData.get("changeAttachment")));
+            bizRelationDataDto.setChangeReason(oData.getString("changeReason"));
+            bizRelationDataDto.setChangeAttachment(JSONObject.toJSONString(oData.get("changeAttachment")));
             bizRelationDataDto.setProjectContraptionIds(getProjectContraptionIds(applyNo));
             bizRelationDataDto.setRecUserName(selectedOrgInfo.getUserModel().getUserName());
             bizRelationDataDto.setUnitCode(selectedOrgInfo.getCompany().getCompanyCode());

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/equip/CommonEquipDataProcessService.java

@@ -670,6 +670,8 @@ public class CommonEquipDataProcessService {
                         fieldChangeMeta.setColumnFamily(group.value());
                         fieldChangeMeta.setColumnLabel(fieldName);
                         fieldChangeMeta.setChangeId(changeId);
+                        // 字段类型前端渲染时使用
+                        fieldChangeMeta.setColumnType(displayDefine.type().getSimpleName());
                         if (newVal instanceof String) {
                             fieldChangeMeta.setColumnOldValue((String) oldVal);
                             fieldChangeMeta.setColumnNewValue((String) newVal);