feat(cylinder): 添加气瓶种类和类别信息字段

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/CylinderService.java

@@ -158,8 +158,12 @@ public class CylinderService {
             esCylinderFillingInfo.setFillingUnitCreditCode(bizTokenModel.getApiCompanyCode());
 
             Map<String, String> cylinder = cylinderInfoList.stream().filter(cylinderInfo -> cylinderInfo.get("sequenceCode").equals(fillingInfo.getSequenceCode())).findFirst().orElse(new HashMap<>());
-            esCylinderFillingInfo.setDefineCode(cylinder.get("equDefine"));
-            esCylinderFillingInfo.setDefineName(cylinder.get("equDefineName"));
+            esCylinderFillingInfo.setEquList(cylinder.get("equList"));
+            esCylinderFillingInfo.setEquListName(cylinder.get("equListName"));
+            esCylinderFillingInfo.setEquCategory(cylinder.get("equCategory"));
+            esCylinderFillingInfo.setEquCategoryName(cylinder.get("equCategoryName"));
+            esCylinderFillingInfo.setEquDefine(cylinder.get("equDefine"));
+            esCylinderFillingInfo.setEquDefineName(cylinder.get("equDefineName"));
             esCylinderFillingInfo.setFactoryNum(cylinder.get("factoryNum"));
             esCylinderFillingInfo.setOrgBranchCode(cylinder.get("orgBranchCode"));
             esCylinderFillingInfo.setOrgBranchName(cylinder.get("orgBranchName"));

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/java/com/yeejoin/amos/boot/module/cylinder/api/entity/ESCylinderFillingInfoDto.java

@@ -32,15 +32,35 @@ public class ESCylinderFillingInfoDto {
     @ApiModelProperty(value = "出厂编号")
     private String factoryNum;
 
+    // 气瓶种类code
+    @Field(type = FieldType.Keyword)
+    @ApiModelProperty(value = "气瓶种类代码")
+    private String equList;
+
+    // 气瓶种类名称
+    @Field(type = FieldType.Text)
+    @ApiModelProperty(value = "气瓶种类名称")
+    private String equListName;
+
+    // 气瓶类别code
+    @Field(type = FieldType.Keyword)
+    @ApiModelProperty(value = "气瓶类别代码")
+    private String equCategory;
+
+    // 气瓶类别名称
+    @Field(type = FieldType.Text)
+    @ApiModelProperty(value = "气瓶类别名称")
+    private String equCategoryName;
+
     // 气瓶品种code
     @Field(type = FieldType.Keyword)
     @ApiModelProperty(value = "气瓶品种代码")
-    private String defineCode;
+    private String equDefine;
 
     // 气瓶品种名称
     @Field(type = FieldType.Text)
     @ApiModelProperty(value = "气瓶品种名称")
-    private String defineName;
+    private String equDefineName;
 
     // 二维码编号
     @Field(type = FieldType.Keyword)

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/resources/mapper/CylinderInfoMapper.xml

@@ -655,6 +655,10 @@
         ui."EQU_STATE" cylinderStatus,
         (select name from cb_data_dictionary where type = 'SHZT' and code = ui."EQU_STATE") cylinderStatusName,
         ri."USE_ORG_CODE" useOrgCode,
+        ui."EQU_LIST" equList,
+        (select name from tz_equipment_category where code = ri."EQU_LIST") equListName,
+        ri."EQU_CATEGORY" equCategory,
+        (select name from tz_equipment_category where code = ri."EQU_CATEGORY") equCategoryName,
         ri."EQU_DEFINE" equDefine,
         (select name from tz_equipment_category where code = ri."EQU_DEFINE") equDefineName,
         ui."USE_INNER_CODE" unitInnerCode,