添加：设备列表添加，设备类别和设备品种CODE值

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

@@ -92,6 +92,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     private static final String EQUSTATE = "EQU_STATE";
     private static final String CONSTRUCTIONTYPE = "CONSTRUCTION_TYPE";
     private static final String EQUDEFINE = "EQU_DEFINE";
+    private static final String EQUDEFINECODE = "EQU_DEFINE_CODE";
 
     /**
      * levlel=company,是企业,如果不是都是监管单位,
@@ -143,7 +144,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     ICommonService commonService;
 
     @Autowired
-    CategoryOtherInfoMapper categoryOtherInfoMapper;
+    private CategoryOtherInfoMapper categoryOtherInfoMapper;
     @Autowired
     private SuperviseInfoMapper superviseInfoMapper;
 
@@ -584,6 +585,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                     } else {
                         dto2.put(EQUDEFINE, code);
                     }
+                    dto2.put(EQUDEFINECODE, code);
                 }
                 list.add(dto2);
             }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/dto/ESEquipmentCategoryDto.java

@@ -42,6 +42,9 @@ public class ESEquipmentCategoryDto {
     @Field(type = FieldType.Text)
     private String EQU_CATEGORY;
 
+    @Field(type = FieldType.Text)
+    private String EQU_CATEGORY_CODE;
+
     @Field(type = FieldType.Keyword)
     private String USE_ORG_CODE;
 

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/CategoryOtherInfoMapper.xml

@@ -78,6 +78,7 @@
                EQU_LIST_CODE,
                EQU_LIST,
                EQU_CATEGORY,
+               EQU_CATEGORY_CODE,
                USE_ORG_CODE,
                CODE96333,
                EQU_CODE,