1、修改大屏跳转设备列表，一类二类没有过滤气瓶管道

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/mapper/TzsCustomFilterMapper.java

@@ -36,4 +36,6 @@ public interface TzsCustomFilterMapper extends BaseMapper<TzsCustomFilter> {
     void setOrgBranchCodeIsNullByRecords(@Param("records") List<String> records);
 
     void updateOrgBranchCodeByRecords(@Param("dataList") List<Map<String, Object>> dataList);
+
+    List<String> getSubCodes(String code);
 }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/TzsCustomFilterMapper.xml

@@ -87,6 +87,14 @@
                 AND ibjri."EQU_CATEGORY" = #{code}
             </if>
     </select>
+    <select id="getSubCodes" resultType="java.lang.String">
+        SELECT
+            code
+        FROM
+            tz_equipment_category
+        WHERE
+            is_delete = 0 AND parent_id = ( SELECT id FROM tz_equipment_category where code = #{code} )
+    </select>
 
     <update id="setOrgBranchCodeIsNullByRecords">
         update amos_tzs_biz.idx_biz_jg_supervision_info set "ORG_BRANCH_CODE" = null where "RECORD" in

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

@@ -886,6 +886,28 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
         // 筛选
         if (!ObjectUtils.isEmpty(filter.get("filterParams"))) {
             filterParams = JSONObject.parseObject(JSONObject.toJSONString(filter.get("filterParams")));
+            if (filterParams.containsKey("dp_filter_business_type") && filterParams.containsKey("DATA_QUALITY_SCORE") && !filterParams.containsKey("EQU_LIST")) {
+                List<String> equListCode = Arrays.asList("1000", "2000", "3000", "4000", "5000", "6000", "9000");
+                boolMust.must(QueryBuilders.termsQuery("EQU_LIST_CODE", equListCode));
+                boolMust.mustNot(QueryBuilders.termQuery("EQU_CATEGORY_CODE", "2300"));
+            }
+            if (filterParams.containsKey("other")) {
+                if (!filterParams.containsKey("EQU_LIST")) {
+                    boolMust.mustNot(QueryBuilders.termsQuery("EQU_LIST_CODE", equList));
+                } else if (!filterParams.containsKey("EQU_CATEGORY")) {
+                    JSONArray jsonArray = (JSONArray) filterParams.get("EQU_LIST");
+                    if (!ObjectUtils.isEmpty(jsonArray)) {
+                        List<String> subCodes = tzsCustomFilterMapper.getSubCodes(String.valueOf(jsonArray.get(0)));
+                        boolMust.mustNot(QueryBuilders.termsQuery("EQU_CATEGORY_CODE", subCodes));
+                    }
+                } else if (!filterParams.containsKey("EQU_DEFINE")) {
+                    JSONArray jsonArray = (JSONArray) filterParams.get("EQU_CATEGORY");
+                    if (!ObjectUtils.isEmpty(jsonArray)) {
+                        List<String> subCodes = tzsCustomFilterMapper.getSubCodes(String.valueOf(jsonArray.get(0)));
+                        boolMust.mustNot(QueryBuilders.termsQuery("EQU_DEFINE_CODE", subCodes));
+                    }
+                }
+            }
             String filterType = filter.getString("filterType");
             // 组装查询条件
             getEquipmentBoolQueryBuilder(boolMust, filterParams, filterType);