fix(西安编辑)：bug修复

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

@@ -26,7 +26,7 @@ public class EquipFactoryChangeDataDto extends BaseChangeDataDto {
     @FieldDisplayDefine(value = "制造日期")
     private String produceDate;
 
-    @FieldDisplayDefine(value = "是否进口")
+    @FieldDisplayDefine(value = "是否进口", typeHandler = "yesOrNoTypeHandler")
     private String imported;
 
     @FieldDisplayDefine(value = "制造国")

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

@@ -14,7 +14,7 @@ public class EquipRegisterChangeDataDto extends BaseChangeDataDto {
     @FieldDisplayDefine(value = "设备种类" ,isExist = false)
     private String equList;
 
-    @FieldDisplayDefine(value = "设备类别")
+    @FieldDisplayDefine(value = "设备类别", typeHandler = "equipCategoryTypeHandler")
     private String equCategory;
 
     @FieldDisplayDefine(value = "设备代码")
@@ -22,10 +22,10 @@ public class EquipRegisterChangeDataDto extends BaseChangeDataDto {
     /**
      * 1-手工输入、2-系统自动生成
      */
-    @FieldDisplayDefine(value = "设备代码类型" ,isExist = false)
+    @FieldDisplayDefine(value = "设备代码类型", typeHandler = "hasOrNoTypeHandler" )
     private String equCodeType;
 
-    @FieldDisplayDefine(value = "设备品种")
+    @FieldDisplayDefine(value = "设备品种", typeHandler = "equipCategoryTypeHandler")
     private String equDefine;
 
     @FieldDisplayDefine(value = "产品名称")

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/BizDataChangeController.java

@@ -41,7 +41,7 @@ public class BizDataChangeController extends BaseController {
     @PostMapping(value = "/v1/singleManageEquipEdit/save")
     @ApiOperation(value = "业务数据变更保存--西安专用", httpMethod = "POST")
     public ResponseModel<String> save(@RequestParam String applyNo, @RequestBody RequestChangeData changeData) {
-        singleManageEquipEditHandle.doSave(applyNo, changeData);
+        singleManageEquipEditHandle.doSave(applyNo, changeData, getSelectedOrgInfo());
         return ResponseHelper.buildResponse("success");
     }
 

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

@@ -53,6 +53,7 @@ public class EquipChangeDataUpdateServiceImpl {
     public void updateRegisterChangeData(String record, EquipRegisterChangeDataDto registerChangeDataDto) {
         LambdaUpdateWrapper<IdxBizJgRegisterInfo> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.eq(IdxBizJgRegisterInfo::getRecord, record);
+        updateWrapper.set(IdxBizJgRegisterInfo::getEquCodeType, registerChangeDataDto.getEquCodeType());
         updateWrapper.set(IdxBizJgRegisterInfo::getEquCode, registerChangeDataDto.getEquCode());
         updateWrapper.set(IdxBizJgRegisterInfo::getEquCategory, registerChangeDataDto.getEquCategory());
         updateWrapper.set(IdxBizJgRegisterInfo::getEquDefine, registerChangeDataDto.getEquDefine());

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

 package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.jg.api.dto.*;
+import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
 import com.yeejoin.amos.boot.module.jg.biz.edit.event.BaseBizDataChangeEvent;
 import com.yeejoin.amos.boot.module.jg.biz.edit.process.equip.CommonEquipDataProcessService;
 import com.yeejoin.amos.boot.module.jg.biz.event.publisher.EventPublisher;
@@ -10,10 +12,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Component
 @RequiredArgsConstructor
@@ -48,21 +47,26 @@ public class SingleManageEquipEditHandleImpl {
 
 
     @Transactional(rollbackFor = Exception.class)
-    public void doSave(String record, Map<String, Object> changeData) {
+    public void doSave(String record, Map<String, Object> changeData, ReginParams selectedOrgInfo) {
         List<FieldChangeMeta> allChangeColumns = this.update(record, changeData);
         // 记录流水
         if (!allChangeColumns.isEmpty()) {
-            // 更新历史的JSON的数据
-            this.buildLogData(allChangeColumns);
             // 异步记录变更流水
-            publishEvent2Logger(record, allChangeColumns);
+            publishEvent2Logger(record, allChangeColumns, selectedOrgInfo);
         }
     }
 
-    private void publishEvent2Logger(String record, List<FieldChangeMeta> allChangeColumns) {
+    private void publishEvent2Logger(String record, List<FieldChangeMeta> allChangeColumns, ReginParams selectedOrgInfo) {
         BizRelationDataDto relationDataDto = new BizRelationDataDto();
         relationDataDto.setBizId(record);
-        relationDataDto.setBizType(BIZ_TYPE);
+        relationDataDto.setRecords(new HashSet<>(Collections.singletonList(record)));
+        relationDataDto.setChangeReason("西安数据编辑");
+        relationDataDto.setProjectContraptionIds(new HashSet<>());
+        relationDataDto.setRecUserName(selectedOrgInfo.getUserModel().getRealName());
+        relationDataDto.setUnitCode(selectedOrgInfo.getCompany().getCompanyCode());
+        relationDataDto.setUnitName(selectedOrgInfo.getCompany().getCompanyName());
+        relationDataDto.setBizIsFinished(true);
+        relationDataDto.setBizType(BusinessTypeEnum.JG_NEW_EQUIP.name());
         // 异步记录日志
         publisher.publish(new BaseBizDataChangeEvent(this, relationDataDto, allChangeColumns, RequestContext.cloneRequestContext()));
     }