Merge branch 'develop_tzs_bugfix' into develop_tzs_register

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

@@ -118,12 +118,22 @@ public class EquipChangeDataUpdateService {
             esEquipmentCategoryDto.setPRODUCT_NAME(registerChangeDataDto.getProductName());
             esEquipmentCategoryDto.setEQU_CODE(registerChangeDataDto.getEquCode());
             esEquipmentCategoryDto.setEQU_TYPE(registerChangeDataDto.getEquType());
-            esEquipmentCategoryDto.setEQU_DEFINE_CODE(registerChangeDataDto.getEquDefine());
             esEquipmentCategoryDto.setEQU_CATEGORY_CODE(registerChangeDataDto.getEquCategory());
+            esEquipmentCategoryDto.setEQU_DEFINE_CODE(registerChangeDataDto.getEquDefine());
+            // 冗余设备类别名称
+            if (StringUtils.isEmpty(registerChangeDataDto.getEquCategory())) {
+                esEquipmentCategoryDto.setEQU_CATEGORY(null);
+            } else {
+                EquipmentCategory category = getEquipmentCategory(registerChangeDataDto.getEquCategory());
+                if (category != null) {
+                    esEquipmentCategoryDto.setEQU_CATEGORY(category.getName());
+                }
+            }
+            // 冗余设备品种名称
             if (StringUtils.isEmpty(registerChangeDataDto.getEquDefine())) {
                 esEquipmentCategoryDto.setEQU_DEFINE(null);
             } else {
-                EquipmentCategory category = getEquipmentCategory(registerChangeDataDto);
+                EquipmentCategory category = getEquipmentCategory(registerChangeDataDto.getEquDefine());
                 if (category != null) {
                     esEquipmentCategoryDto.setEQU_DEFINE(category.getName());
                 }
@@ -143,10 +153,11 @@ public class EquipChangeDataUpdateService {
         }
     }
 
-    private EquipmentCategory getEquipmentCategory(EquipRegisterChangeDataDto registerChangeDataDto) {
-        return equipmentCategoryMapper.selectOne(new LambdaQueryWrapper<EquipmentCategory>().eq(EquipmentCategory::getCode, registerChangeDataDto.getEquDefine()));
+    private EquipmentCategory getEquipmentCategory(String categoryCode) {
+        return equipmentCategoryMapper.selectOne(new LambdaQueryWrapper<EquipmentCategory>().eq(EquipmentCategory::getCode, categoryCode));
     }
 
+
     public void updateTechParamByRecord(String tableName, String record, List<ChangeDataDto> changeDataDtos) {
         List<DynamicColumnDto> columns = changeDataDtos.stream().map(c -> {
             DynamicColumnDto columnDto = new DynamicColumnDto();