修改bug

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/enums/CompanyAdvanceSearchEnum.java

@@ -17,7 +17,7 @@ public enum CompanyAdvanceSearchEnum {
     ADDRESS("详细地址", "address", TechnicalParameter.ParamType.STRING,"",null,null),
     EXPIRYDATE("许可有效期", "expiryDate",TechnicalParameter.ParamType.DATE,"",null,null),
     UNIT_TYPE("企业类型", "unitType",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryUnitType",null,null),
-    REGULATORY_LABELS("企业等级", "regulatoryLabels",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryDicData?type={type}","QYBQ",null),
+    REGULATORY_LABELS("监管标签", "regulatoryLabels",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryDicData?type={type}","QYBQ",null),
     INDUSTRY_SUPERVISOR("行业主管部门", "industrySupervisor",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryDicData?type={type}","HYZGBM",null),
     ITEM_CODE("许可项目", "itemCode",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryXK",null,null),
     SUB_ITEM_CODE("许可子项目", "subItemCode",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryXK?type={type}",null,"itemCode"),

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/enums/DataQualityScoreEnum.java

@@ -17,11 +17,12 @@ public enum DataQualityScoreEnum {
      * *设备等级
      */
 
-    I("一级（只有设备名称）", "3"),
-    II("二级（只有设备名称和使用登记证编号）", "2"),
-    III("三级（使用登记证信息齐全）", "1");
+    I("一级（使用登记证信息齐全）","一级", "1"),
+    II("二级（只有设备名称和使用登记证编号）","二级", "2"),
+    III("三级（只有设备名称）","三级", "3");
 
     private String name;
+    private String label;
     private String code;
 
     public static Map<String, String> getName = new HashMap<>();
@@ -47,10 +48,10 @@ public enum DataQualityScoreEnum {
         return jsonArray;
     }
 
-    public static String getNameByCode(String code) {
+    public static String getLabelByCode(String code) {
         for (DataQualityScoreEnum e : EnumSet.allOf(DataQualityScoreEnum.class)) {
             if(e.getCode().equals(code)){
-                return e.getName();
+                return e.getLabel();
             }
         }
         return null;

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/enums/EquipAdvanceSearchEnum.java

@@ -27,6 +27,7 @@ public enum EquipAdvanceSearchEnum {
 //    IS_SUPERVISORY_CODE("赋码状态", "IS_SUPERVISORY_CODE", null,"/statistics/comprehensiveStatisticalAnalysis/select/queryIsSupervisoryCode",null,null),
     DATA_QUALITY_SCORE("数据完整性", "DATA_QUALITY_SCORE", null,"/statistics/comprehensiveStatisticalAnalysis/select/queryDataQualityScore",null,null),
     USE_DATE("使用年限", "USE_DATE", null,"/statistics/comprehensiveStatisticalAnalysis/select/queryUscDate",null,null),
+    REGISTER_STATUS("登记状态", "registerStatus", null,"/statistics/comprehensiveStatisticalAnalysis/select/queryRegisterStatus",null,null),
 //    UNIT_TYPE("所属单位类型", "unitType", null,"/statistics/comprehensiveStatisticalAnalysis/select/queryUnitType",null,null),
     USC_UNIT_NAME("所属单位名称", "USC_UNIT_NAME", TechnicalParameter.ParamType.STRING,"",null,null),
     PRODUCE_UNIT_NAME("制造单位名称", "PRODUCE_UNIT_NAME", TechnicalParameter.ParamType.STRING,"",null,null),

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/controller/ComprehensiveStatisticalAnalysisController.java

@@ -292,6 +292,17 @@ public class ComprehensiveStatisticalAnalysisController extends BaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/select/queryRegisterStatus")
+    @ApiOperation(httpMethod = "GET", value = "高级搜索登记状态", notes = "高级搜索登记状态")
+    public ResponseModel<JSONArray> queryRegisterStatus() {
+        return ResponseHelper.buildResponse(statisticalAnalysisService.queryRegisterStatus());
+    }
+
+    /**
+     * @param
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/select/queryUscDate")
     @ApiOperation(httpMethod = "GET", value = "高级搜索使用年限", notes = "高级搜索使用年限")
     public ResponseModel<JSONArray> queryUscDate() {

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

@@ -728,6 +728,22 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
                                         }
                                     });
                                     boolMust.must(queryBuilder.build());
+                                } else if (k.equals("registerStatus")) {
+                                    EnhancedDynamicQueryBuilder enhancedDynamicQueryBuilder = new EnhancedDynamicQueryBuilder();
+                                    ((JSONArray) v).forEach(item -> {
+                                        BoolQueryBuilder queryBuilder = QueryBuilders.boolQuery();
+                                        if ("1".equals(item)) {
+                                            queryBuilder.must(QueryBuilders.termsQuery("IS_INTO_MANAGEMENT", Boolean.TRUE))
+                                                    .must(QueryBuilders.existsQuery("USE_ORG_CODE"));
+                                        } else {
+                                            queryBuilder.should(QueryBuilders.boolQuery().mustNot(QueryBuilders.existsQuery("IS_INTO_MANAGEMENT")))
+                                                    .should(QueryBuilders.matchQuery("IS_INTO_MANAGEMENT", Boolean.FALSE))
+                                                    .should(QueryBuilders.boolQuery().mustNot(QueryBuilders.existsQuery("USE_ORG_CODE")))
+                                                    .minimumShouldMatch(1);
+                                        }
+                                        enhancedDynamicQueryBuilder.add(queryBuilder, or);
+                                    });
+                                    boolMust.must(enhancedDynamicQueryBuilder.build());
                                 } else if (k.equals("PRODUCE_DATE") || k.equals("issueDate") || k.equals("designDate") || k.equals("nextInspectDate") || k.equals("USE_DATE")) {
                                     field = k.equals("nextInspectDate") ? "NEXT_INSPECT_DATE" : k;
                                     JSONArray dates = (JSONArray) v;
@@ -867,7 +883,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
                 JSONObject dto = jsonObject.getJSONObject("sourceAsMap");
                 dto.put("record", dto.get("SEQUENCE_NBR"));
                 dto.put("equipAddress", dto.get("USE_PLACE") + "/" + dto.get("ADDRESS"));
-                String dataQualityScore = ObjectUtils.isEmpty(dto.get("DATA_QUALITY_SCORE")) ? null : DataQualityScoreEnum.getNameByCode(dto.get("DATA_QUALITY_SCORE").toString());
+                String dataQualityScore = ObjectUtils.isEmpty(dto.get("DATA_QUALITY_SCORE")) ? null : DataQualityScoreEnum.getLabelByCode(dto.get("DATA_QUALITY_SCORE").toString());
                 dto.put("DATA_QUALITY_SCORE", dataQualityScore);
                 dto.put("WHETHER_VEHICLE_CYLINDER", ObjectUtils.isEmpty(dto.get("WHETHER_VEHICLE_CYLINDER")) ? "" : "1".equals(dto.get("WHETHER_VEHICLE_CYLINDER")) ? "是" : "否");
                 dto.put("WHETHER_SKID_MOUNTED_PRESSURE_VESSEL", ObjectUtils.isEmpty(dto.get("WHETHER_SKID_MOUNTED_PRESSURE_VESSEL")) ? "" : "1".equals(dto.get("WHETHER_SKID_MOUNTED_PRESSURE_VESSEL")) ? "是" : "否");
@@ -1588,6 +1604,26 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
                     builder.add(QueryBuilders.matchQuery(value.toString(), "0"), isOr);
                 }
             }
+        } else if (field.equals("registerStatus")) {
+            BoolQueryBuilder registerQuery = QueryBuilders.boolQuery().must(QueryBuilders.termsQuery("IS_INTO_MANAGEMENT", Boolean.TRUE))
+                    .must(existsQuery("USE_ORG_CODE"));
+            BoolQueryBuilder noRegisterQuery = QueryBuilders.boolQuery().should(QueryBuilders.boolQuery().mustNot(existsQuery("IS_INTO_MANAGEMENT")))
+                    .should(QueryBuilders.matchQuery("IS_INTO_MANAGEMENT", Boolean.FALSE))
+                    .should(QueryBuilders.boolQuery().mustNot(existsQuery("USE_ORG_CODE")))
+                    .minimumShouldMatch(1);
+            if (itemCondition.equals("eq") || itemCondition.equals("in")) {
+                if (value.equals("1")) {
+                    builder.add(registerQuery, isOr);
+                } else {
+                    builder.add(noRegisterQuery, isOr);
+                }
+            } else {
+                if (value.equals("1")) {
+                    builder.add(noRegisterQuery, isOr);
+                } else {
+                    builder.add(registerQuery, isOr);
+                }
+            }
         }
     }
 
@@ -2279,4 +2315,24 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
         }
         return qzOrTank;
     }
+
+    public JSONArray queryRegisterStatus() {
+        //是否车用气瓶
+        JSONArray registerStatus = new JSONArray();
+        for (int i = 0; i < 2; i++) {
+            JSONObject object = new JSONObject();
+            if (0 == i) {
+                object.put("key", "0");
+                object.put("value", "0");
+                object.put("label", "未登记");
+            } else {
+                object.put("key", "1");
+                object.put("value", "1");
+                object.put("label", "已登记");
+            }
+            registerStatus.add(object);
+        }
+        return registerStatus;
+    }
+
 }
\ No newline at end of file