fix(jg):监管设备查询功能开发

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

@@ -96,6 +96,7 @@ public class IdxBizJgProjectContraptionServiceImplService extends BaseEntityServ
     public static final String ORG_BRANCH_CODE = "orgBranchCode";
 
     public static final String DATA_QUALITY_SCORE = "dataQualityScore";
+    public static final String DATA_QUALITY = "dataQuality";
     // 设备基本信息表单id
     private static final String EQUIP_INFO_FORM_ID = "equipInfo";
     public static final String USE_UNIT_CREDIT_CODE = "useUnitCreditCode";
@@ -274,6 +275,7 @@ public class IdxBizJgProjectContraptionServiceImplService extends BaseEntityServ
         String equDefine = params.get(EQU_DEFINE);
 
         String dataQualityScore = params.get(DATA_QUALITY_SCORE);
+        String dataQuality = params.get(DATA_QUALITY);
         // 证详情-查询标识
         String useRegDetail = params.get("useRegDetail");
         // 登录人公司类型：企业，监管
@@ -357,6 +359,7 @@ public class IdxBizJgProjectContraptionServiceImplService extends BaseEntityServ
                 .eq(!ValidationUtil.isEmpty(county), IdxBizJgProjectContraption::getCounty, county)
                 .eq(!ValidationUtil.isEmpty(street), IdxBizJgProjectContraption::getStreet, street)
                 .eq(!ValidationUtil.isEmpty(dataQualityScore), IdxBizJgProjectContraption::getDataQualityScore, dataQualityScore)
+                .in(!ValidationUtil.isEmpty(dataQuality), IdxBizJgProjectContraption::getDataQualityScore, JSON.parseArray(dataQuality, String.class))
                 .eq(!ValidationUtil.isEmpty(useUnitCreditCode), IdxBizJgProjectContraption::getUseUnitCreditCode, useUnitCreditCode)
                 .like(!ValidationUtil.isEmpty(useUnitName), IdxBizJgProjectContraption::getUseUnitName, useUnitName)
                 .like(!ValidationUtil.isEmpty(projectContraption), IdxBizJgProjectContraption::getProjectContraption, projectContraption)

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

@@ -155,6 +155,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     public static final String USE_PLACE_CODE = "USE_PLACE_CODE";
     public static final String EQU_CATEGORY_CODE = "EQU_CATEGORY_CODE";
     public static final String EQU_LIST_CODE = "EQU_LIST_CODE";
+    public static final String DEVICE_TYPE = "DEVICE_TYPE";
     public static final String PROJECT_CONTRAPTION = "PROJECT_CONTRAPTION";// 工程装置名称
     public static final String CREATE_DATE_RANGE = "CREATE_DATE_RANGE";// 创建时间范围查询
     public static final String CREATE_DATE = "CREATE_DATE";// 创建时间范围查询
@@ -353,6 +354,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     private TechParamsBackupService techParamsBackupService;
 
     public static final String DATA_QUALITY_SCORE = "DATA_QUALITY_SCORE";
+    public static final String DATA_QUALITY_SCORE_JG = "DATA_QUALITY";
 
     private final ExecutorService executorService = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
 
@@ -2806,6 +2808,23 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             pBuilder.mustNot(QueryBuilders.termQuery(EQU_LIST_CODE, test));
             boolMust.must(pBuilder);
         }
+        String deviceType = map.getString(DEVICE_TYPE);
+        if ("set".equals(deviceType) || "cylinder".equals(deviceType)) {
+            BoolQueryBuilder scBuilder = QueryBuilders.boolQuery();
+            String test = QueryParser.escape("2300");
+            scBuilder = "set".equals(deviceType)? scBuilder.mustNot(QueryBuilders.wildcardQuery(EQU_CATEGORY_CODE, test))
+                    : scBuilder.must(QueryBuilders.wildcardQuery(EQU_CATEGORY_CODE, test));
+            boolMust.must(scBuilder);
+        }
+
+        //监管查看
+        if (!ObjectUtils.isEmpty(map.getString(DATA_QUALITY_SCORE_JG))) {
+            BoolQueryBuilder scBuilder = QueryBuilders.boolQuery();
+            String param = map.getString(DATA_QUALITY_SCORE_JG);
+            List<String> strings = Arrays.asList(param.split(","));
+            scBuilder.must(QueryBuilders.termsQuery("DATA_QUALITY_SCORE", strings));
+            boolMust.must(scBuilder);
+        }
 
         // 设备品种编码
         if (!ObjectUtils.isEmpty(map.getString("EQU_DEFINE_CODE"))) {