修改大屏应急处置模块中间电梯设备-->无设备类别统计打开列表

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

@@ -20,7 +20,7 @@ public interface TzsCustomFilterMapper extends BaseMapper<TzsCustomFilter> {
 
     @MapKey("key")
     List<Map<String, Object>> selectEquipmentCategoryByParentId(@Param("parentId") String parentId);
-
+    List<String> getEquipmentSubCategoryByCode(@Param("code") String code);
     Integer selectEquipmentCategoryCountByParentId(@Param("parentId") String parentId);
 
     JSONArray queryEquCategory(@Param("type") String type, @Param("description") String description);

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

@@ -10,7 +10,13 @@
         from tz_equipment_category
         where is_delete = 0 and parent_id = #{parentId}
     </select>
-
+    <select id="getEquipmentSubCategoryByCode" resultType="java.lang.String">
+        select
+        code
+        from tz_equipment_category where parent_id in (
+        SELECT id FROM tz_equipment_category
+        WHERE code=#{code} AND is_delete = 0)
+    </select>
     <select id="queryEquCategory" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
             code AS value,

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

@@ -23,6 +23,7 @@ import com.yeejoin.amos.boot.module.statistcs.biz.utils.JsonUtils;
 import com.yeejoin.amos.boot.module.statistics.api.enums.InformationManageTypeEnum;
 import com.yeejoin.amos.boot.module.statistics.api.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.AlertStatisticsMapper;
+import com.yeejoin.amos.boot.module.statistics.api.mapper.TzsCustomFilterMapper;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.ZLStatisticsMapper;
 import com.yeejoin.amos.boot.module.statistics.api.vo.EquCategoryVo;
 import com.yeejoin.amos.boot.module.ymt.api.dto.EquipmentCategoryDto;
@@ -85,6 +86,8 @@ public class ZLDPStatisticsServiceImpl {
     private final StCommonServiceImpl stCommonService;
 
     private final EquipmentCategoryMapper equipmentCategoryMapper;
+    @Autowired
+    private   TzsCustomFilterMapper tzsCustomFilterMapper;
 
     // 设备纳管  纳管：true 未纳管：false
     public static final String IS_INTO_MANAGEMENT = "IS_INTO_MANAGEMENT";
@@ -920,7 +923,12 @@ public class ZLDPStatisticsServiceImpl {
         }
         if (!ObjectUtils.isEmpty(map.getString("EQU_CATEGORY"))) {
             if ("无设备类别".equals(map.getString("EQU_CATEGORY"))){
-                boolMust.mustNot(QueryBuilders.existsQuery("EQU_CATEGORY"));
+               // boolMust.mustNot(QueryBuilders.existsQuery("EQU_CATEGORY"));
+                String EQU_LIST_CODEs = map.getString("EQU_LIST_CODE");
+                if(null!= EQU_LIST_CODEs && !"".equals(EQU_LIST_CODEs)){
+                    List<String> equCodeList = tzsCustomFilterMapper.getEquipmentSubCategoryByCode(EQU_LIST_CODEs);
+                    boolMust.mustNot(QueryBuilders.termsQuery("EQU_CATEGORY_CODE", equCodeList));
+                }
             }else {
                 BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();
                 String test = QueryParser.escape(map.getString("EQU_CATEGORY"));