feat: 增加气瓶分类枚举并处理信息情况和气瓶类别转换逻辑

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/ComprehensiveStatisticalAnalysisServiceImpl.java

@@ -2412,7 +2412,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
 
     public JSONArray queryXK(String type) {
         JSONArray result = new JSONArray();
-        if (null == type || "".equals(type)) {
+        if (ObjectUtils.isEmpty(type)) {
             List<DataDictionary> xkxm = dataDictionaryService.lambdaQuery()
                     .and(wrapper -> wrapper.like(DataDictionary::getType, "XKXM")
                             .or()
@@ -2422,15 +2422,15 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
             result = deployDictionary(xkxm);
         } else {
             List<DataDictionary> childrenxkxm = new ArrayList<>();
-//            if ("".equals(type)) {
-//                childrenxkxm = dataDictionaryService.lambdaQuery()
-//                        .likeRight(DataDictionary::getCode, "XK")
-//                        .isNotNull(DataDictionary::getTypeDesc)
-//                        .eq(BaseEntity::getIsDelete, false).list();
-//            } else {
-//
-//            }
-            childrenxkxm = dataDictionaryService.lambdaQuery().eq(DataDictionary::getTypeDesc, type).eq(BaseEntity::getIsDelete, false).list();
+            if ("null".equals(type)) {
+                childrenxkxm = dataDictionaryService.lambdaQuery()
+                        .likeRight(DataDictionary::getCode, "XK")
+                        .isNotNull(DataDictionary::getTypeDesc)
+                        .eq(BaseEntity::getIsDelete, false).list();
+            } else {
+                childrenxkxm = dataDictionaryService.lambdaQuery().eq(DataDictionary::getTypeDesc, type).eq(BaseEntity::getIsDelete, false).list();
+
+            }
             result = deployDictionary(childrenxkxm);
         }
 //        if (ValidationUtil.isEmpty(type)) {