Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into…

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/enums/IssueMainBodyEnum.java

@@ -14,9 +14,7 @@ public enum IssueMainBodyEnum {
     //企业
     COMPANY("企业","2"),
     //设备
-    EQUIPMENT("设备","3"),
-
-    ;
+    EQUIPMENT("设备","3");
 
     String name;
     String code;

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

@@ -24,8 +24,8 @@ public interface AQZSDPStatisticsMapper {
     List<CountDto> selectByOrgAndMainBody(@Param("orgCode") String orgCode, @Param("dto") DPFilterParamDto filterParamDto);
 
 
-    List<Map<String, Object>> selectByOrgAndProblemType(@Param("orgCode") String orgCode, @Param("enumNameList") List<String> enumNameList,
-                                                        @Param("startDate") String startDate, @Param("sourceType") String sourceType, @Param("equipType") String equipType);
+    List<CountDto> selectByOrgAndProblemType(@Param("orgCode") String orgCode, @Param("enumNameList") List<String> enumNameList,
+                                                        @Param("dto") DPFilterParamDto dpFilterParamDto, @Param("sourceTypeCode") String sourceTypeCode, @Param("equListCode") String equListCode);
 
     List<Map<String, Object>> getIssueCountByMonth(@Param("orgCode") String orgCode, @Param("year") String year, @Param("status") String status);
 
@@ -72,4 +72,7 @@ public interface AQZSDPStatisticsMapper {
     List<Map<String, Object>> selectByOrg(String orgCode);
 
     List<Map<String, Object>> cylinderIssueMonthList(@Param("orgCode") String orgCode, @Param("time") String time);
+
+
+    List<CountDto> selectByOrgAndProblemTypeForCy(@Param("orgCode") String orgCode, @Param("dto") DPFilterParamDto dpFilterParamDto);
 }

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

@@ -23,18 +23,23 @@
 			</if>
 			GROUP BY source_type,problem_status_code
 	</select>
-	<select id="selectByOrgAndProblemType" resultType="java.util.Map">
-		SELECT COUNT
-			( 1 ),
-			problem_type AS problemType
-			FROM
+	<select id="selectByOrgAndProblemType" resultType="com.yeejoin.amos.boot.biz.common.dto.CountDto">
+		SELECT
+			COUNT(1) as longValue,
+			problem_type  AS keyStr
+		FROM
 			tzs_safety_problem_tracing
 		WHERE
 			governing_body_org_code LIKE concat ( #{orgCode}, '%' )
-			AND problem_time &gt;= #{startDate}
-		  	AND source_type = #{sourceType}
+			<if test="dto.beginDate !=null and dto.beginDate !=''">
+				and date_ge(CAST(problem_time as date),#{dto.beginDate})
+			</if>
+			<if test="dto.endDate !=null and dto.endDate !=''">
+				and date_le(CAST(problem_time as date),#{dto.endDate})
+			</if>
+		  	AND source_type_code = #{sourceTypeCode}
 		  	<if test="null != equipType">
-				AND equip_list_code = #{equipType}
+				AND equip_list_code = #{equListCode}
 			</if>
 			AND problem_type IN
 				<foreach collection="enumNameList" item="item" separator="," open="(" close=")">
@@ -42,7 +47,26 @@
 				</foreach>
 		GROUP BY
 			problem_type
-
+	</select>
+	<select id="selectByOrgAndProblemTypeForCy" resultType="com.yeejoin.amos.boot.biz.common.dto.CountDto">
+		SELECT
+			COUNT(1) as longValue,
+		    t.problem_type  AS keyStr
+		FROM
+			tzs_safety_problem_tracing t,
+			idx_biz_jg_register_info A
+		WHERE
+		    A.RECORD = t.source_id
+		    AND A.EQU_CATEGORY = '2300'
+		    and t.governing_body_org_code LIKE concat (#{orgCode}, '%')
+			<if test="dto.beginDate !=null and dto.beginDate !=''">
+				and date_ge(CAST(t.problem_time as date),#{dto.beginDate})
+			</if>
+			<if test="dto.endDate !=null and dto.endDate !=''">
+				and date_le(CAST(t.problem_time as date),#{dto.endDate})
+			</if>
+			AND t.source_type_code = '3'
+			GROUP BY t.problem_type
 	</select>
 	<select id="getIssueCountByMonth" resultType="java.util.Map">
 		SELECT COUNT

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

@@ -70,12 +70,12 @@ public class AQZSDPStatisticsController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "大屏-安全追溯-左屏-设备问题近30天统计")
     @PostMapping(value = "/equipmentCount")
-    public ResponseModel<Map<String, Object>> equipmentCount(@RequestBody Map<String, Object> map) {
-        Object regionCode = map.get("cityCode");
-        if (ObjectUtils.isEmpty(regionCode)) {
-            regionCode = "610000";
+    public ResponseModel<Map<String, Object>> equipmentCount(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult bindingResult) throws Exception {
+        List<FieldError> fieldErrors = bindingResult.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
         }
-        Map<String, Object> result = statisticsService.equipmentCount(regionCode.toString());
+        Map<String, Object> result = statisticsService.equipmentCount(dpFilterParamDto);
         return ResponseHelper.buildResponse(result);
     }
 
@@ -83,12 +83,12 @@ public class AQZSDPStatisticsController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "大屏-安全追溯-左屏-企业问题近30天统计")
     @PostMapping(value = "/companyCount")
-    public ResponseModel<List<Map<String, Object>>> companyCount(@RequestBody Map<String, Object> map) {
-        Object regionCode = map.get("cityCode");
-        if (ObjectUtils.isEmpty(regionCode)) {
-            regionCode = "610000";
+    public ResponseModel<List<Map<String, Object>>> companyCount(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult bindingResult) throws Exception {
+        List<FieldError> fieldErrors = bindingResult.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
         }
-        List<Map<String, Object>> result = statisticsService.companyCount(regionCode.toString());
+        List<Map<String, Object>> result = statisticsService.companyCount(dpFilterParamDto);
         return ResponseHelper.buildResponse(result);
     }
 
@@ -96,12 +96,12 @@ public class AQZSDPStatisticsController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "大屏-安全追溯-左屏-人员问题近30天统计")
     @PostMapping(value = "/personCount")
-    public ResponseModel<Map<String, Object>> personCount(@RequestBody Map<String, Object> map) {
-        Object regionCode = map.get("cityCode");
-        if (ObjectUtils.isEmpty(regionCode)) {
-            regionCode = "610000";
+    public ResponseModel<Map<String, Object>> personCount(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult bindingResult) throws Exception {
+        List<FieldError> fieldErrors = bindingResult.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
         }
-        Map<String, Object> result = statisticsService.personCount(regionCode.toString());
+        Map<String, Object> result = statisticsService.personCount(dpFilterParamDto);
         return ResponseHelper.buildResponse(result);
     }
 
@@ -110,12 +110,12 @@ public class AQZSDPStatisticsController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "大屏-安全追溯-左屏-气瓶问题近30天统计")
     @PostMapping(value = "/cylinderCount")
-    public ResponseModel<Map<String, Object>> cylinderCount(@RequestBody Map<String, Object> map) {
-        Object regionCode = map.get("cityCode");
-        if (ObjectUtils.isEmpty(regionCode)) {
-            regionCode = "610000";
+    public ResponseModel<Map<String, Object>> cylinderCount(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult bindingResult) throws Exception {
+        List<FieldError> fieldErrors = bindingResult.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
         }
-        Map<String, Object> result = statisticsService.cylinderCount(regionCode.toString());
+        Map<String, Object> result = statisticsService.cylinderCount(dpFilterParamDto);
         return ResponseHelper.buildResponse(result);
     }
 

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

@@ -368,19 +368,17 @@ public class AQZSDPStatisticsServiceImpl {
     }
 
 
-    public Map<String, Object> equipmentCount(String cityCode) {
+    public Map<String, Object> equipmentCount(DPFilterParamDto dpFilterParamDto) {
+        this.setDefaultFilter(dpFilterParamDto);
         Map<String, Object> resultMap = new HashMap<>();
         Map<String, Object> dataMap = new HashMap<>();
         List<Object> xdata = new ArrayList<>();
         List<Object> ydata = new ArrayList<>();
         List<String> enumNameList = IssueTypeEnum.getEnumNameListByMainBody("3");
-        String startDate = LocalDate.now().minusDays(29).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
-        String orgCode = stCommonService.getAndSetOrgCode(cityCode);
+        String orgCode = stCommonService.getAndSetOrgCode(dpFilterParamDto.getCityCode());
         if(orgCode != null){
-            List<Map<String, Object>> list = statisticsMapper.selectByOrgAndProblemType(orgCode, enumNameList, startDate, IssueMainBodyEnum.EQUIPMENT.getName(), null);
-            list.forEach(t -> {
-                dataMap.put(t.get("problemType").toString(), t.get("count").toString());
-            });
+            List<CountDto> countDtos = statisticsMapper.selectByOrgAndProblemType(orgCode, enumNameList, dpFilterParamDto, IssueMainBodyEnum.EQUIPMENT.getCode(), null);
+            countDtos.forEach(t -> dataMap.put(t.getKeyStr(), t.getLongValue()));
         }
         for (int i = 0; i < enumNameList.size(); i++) {
             xdata.add(enumNameList.get(i));
@@ -391,17 +389,15 @@ public class AQZSDPStatisticsServiceImpl {
         return resultMap;
     }
 
-    public List<Map<String, Object>> companyCount(String cityCode) {
+    public List<Map<String, Object>> companyCount(DPFilterParamDto dpFilterParamDto) {
+        this.setDefaultFilter(dpFilterParamDto);
         List<Map<String, Object>> resultList = new ArrayList<>();
         Map<String, Object> dataMap = new HashMap<>();
         List<String> enumNameList = IssueTypeEnum.getEnumNameListByMainBody("2");
-        String startDate = LocalDate.now().minusDays(29).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
-        String orgCode = stCommonService.getAndSetOrgCode(cityCode);
+        String orgCode = stCommonService.getAndSetOrgCode(dpFilterParamDto.getCityCode());
         if(orgCode != null){
-            List<Map<String, Object>> list = statisticsMapper.selectByOrgAndProblemType(orgCode, enumNameList, startDate, IssueMainBodyEnum.COMPANY.getName(), null);
-            list.forEach(t -> {
-                dataMap.put(t.get("problemType").toString(), t.get("count").toString());
-            });
+            List<CountDto> countDtos = statisticsMapper.selectByOrgAndProblemType(orgCode, enumNameList, dpFilterParamDto, IssueMainBodyEnum.COMPANY.getCode(), null);
+            countDtos.forEach(t -> dataMap.put(t.getKeyStr(), t.getLongValue()));
         }
         for (int i = 0; i < enumNameList.size(); i++) {
             Map<String, Object> map = new HashMap<>();
@@ -429,19 +425,17 @@ public class AQZSDPStatisticsServiceImpl {
         return resultList;
     }
 
-    public Map<String, Object> personCount(String cityCode) {
+    public Map<String, Object> personCount(DPFilterParamDto dpFilterParamDto) {
+        this.setDefaultFilter(dpFilterParamDto);
         Map<String, Object> resultMap = new HashMap<>();
         Map<String, Object> dataMap = new HashMap<>();
         List<Object> xdata = new ArrayList<>();
         List<Object> ydata = new ArrayList<>();
         List<String> enumNameList = IssueTypeEnum.getEnumNameListByMainBody("1");
-        String startDate = LocalDate.now().minusDays(29).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
-        String orgCode = stCommonService.getAndSetOrgCode(cityCode);
+        String orgCode = stCommonService.getAndSetOrgCode(dpFilterParamDto.getCityCode());
         if(orgCode != null){
-            List<Map<String, Object>> list = statisticsMapper.selectByOrgAndProblemType(orgCode, enumNameList, startDate, IssueMainBodyEnum.PERSON.getName(), null);
-            list.forEach(t -> {
-                dataMap.put(t.get("problemType").toString(), t.get("count").toString());
-            });
+            List<CountDto> countDtos = statisticsMapper.selectByOrgAndProblemType(orgCode, enumNameList, dpFilterParamDto, IssueMainBodyEnum.PERSON.getCode(), null);
+            countDtos.forEach(t -> dataMap.put(t.getKeyStr(), t.getLongValue()));
         }
         for (int i = 0; i < enumNameList.size(); i++) {
             xdata.add(enumNameList.get(i));
@@ -452,19 +446,17 @@ public class AQZSDPStatisticsServiceImpl {
         return resultMap;
     }
 
-    public Map<String, Object> cylinderCount(String cityCode) {
+    public Map<String, Object> cylinderCount(DPFilterParamDto dpFilterParamDto) {
+        this.setDefaultFilter(dpFilterParamDto);
         Map<String, Object> resultMap = new HashMap<>();
         Map<String, Object> dataMap = new HashMap<>();
         List<Object> xdata = new ArrayList<>();
         List<Object> ydata = new ArrayList<>();
         List<String> enumNameList = IssueTypeEnum.getEnumNameListByMainBody("4");
-        String startDate = LocalDate.now().minusDays(29).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
-        String orgCode = stCommonService.getAndSetOrgCode(cityCode);
+        String orgCode = stCommonService.getAndSetOrgCode(dpFilterParamDto.getCityCode());
         if(orgCode != null){
-            List<Map<String, Object>> list = statisticsMapper.selectByOrgAndProblemType(orgCode, enumNameList, startDate, IssueMainBodyEnum.EQUIPMENT.getName(), "2300");
-            list.forEach(t -> {
-                dataMap.put(t.get("problemType").toString(), t.get("count").toString());
-            });
+            List<CountDto> countDtos = statisticsMapper.selectByOrgAndProblemTypeForCy(orgCode, dpFilterParamDto);
+            countDtos.forEach(t -> dataMap.put(t.getKeyStr(), t.getLongValue()));
         }
         for (int i = 0; i < enumNameList.size(); i++) {
             xdata.add(enumNameList.get(i));

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

@@ -87,6 +87,7 @@ public class CylinderDPStatisticsServiceImpl {
         searchSourceBuilder.query(
                 QueryBuilders.boolQuery()
                         .must(QueryBuilders.termQuery("EQU_CATEGORY_CODE", "2300"))
+                        // 只统计已纳管设备
                         .must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", Boolean.TRUE))
                         // 按照管辖机构区域信息模糊查询
                         .must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"))
@@ -221,7 +222,7 @@ public class CylinderDPStatisticsServiceImpl {
         boolMust.must(QueryBuilders.termQuery("EQU_CATEGORY_CODE", "2300"));
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
-        // 且在用状态设备
+        // 只统计已纳管设备
         boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", Boolean.TRUE));
         request.query(boolMust);
         try {
@@ -241,7 +242,7 @@ public class CylinderDPStatisticsServiceImpl {
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.termQuery("WHETHER_VEHICLE_CYLINDER.keyword", "1"));
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
-        // 且在用状态设备
+        // 只统计已纳管设备
         boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", Boolean.TRUE));
         request.query(boolMust);
         try {
@@ -307,7 +308,7 @@ public class CylinderDPStatisticsServiceImpl {
         boolMust.must(QueryBuilders.termQuery("EQU_CATEGORY_CODE", "2300"));
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
-        // 且在用状态设备
+        // 只统计已纳管设备
         boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", Boolean.TRUE));
         // 且下次检验日期大于等于当天
         long currentDayTime = DateUtil.parse(DateUtil.today(), "yyy-MM-dd").getTime();
@@ -340,7 +341,7 @@ public class CylinderDPStatisticsServiceImpl {
         boolMust.must(QueryBuilders.termQuery("EQU_CATEGORY_CODE", "2300"));
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
-        // 在用状态设备
+        // 只统计已纳管设备
         boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", Boolean.TRUE));
         // 查询下次检验日期小于当前天的设备，即为超期检验超期设备
         long currentDayTime = DateUtil.parse(DateUtil.now(), "yyy-MM-dd").getTime();

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

@@ -408,6 +408,8 @@ public class JGDPStatisticsServiceImpl {
         }
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
+        // 只统计已纳管的设备
+        boolMust.must(QueryBuilders.termsQuery("IS_INTO_MANAGEMENT", Boolean.TRUE));
         // 设备状态过滤
         boolMust.must(QueryBuilders.termsQuery("EQU_STATE", Arrays.asList(states)));
         // 且8大类，目的去掉脏数据
@@ -461,7 +463,7 @@ public class JGDPStatisticsServiceImpl {
         }
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
-        // 且在用状态设备
+        // 只统计已纳管设备
         boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", Boolean.TRUE));
         // 且下次检验日期大于等于当天
         long currentDayTime = DateUtil.parse(DateUtil.today(), "yyy-MM-dd").getTime();
@@ -498,7 +500,7 @@ public class JGDPStatisticsServiceImpl {
         }
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
-        // 在用状态设备
+        // 只统计已纳管设备
         boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", Boolean.TRUE));
         // 查询下次检验日期小于当前天的设备，即为超期检验超期设备
         long currentDayTime = DateUtil.parse(DateUtil.now(), "yyy-MM-dd").getTime();
@@ -705,6 +707,8 @@ public class JGDPStatisticsServiceImpl {
         }
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
+        // 只统计已纳管设备
+        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", Boolean.TRUE));
         // 且8大类，目的去掉脏数据
         boolMust.must(QueryBuilders.termsQuery("EQU_LIST_CODE", StCommonServiceImpl.getEquipmentCategory().stream().map(EquipmentCategoryDto::getCode).collect(Collectors.toList())));
         SearchSourceBuilder builder = new SearchSourceBuilder();
@@ -753,6 +757,8 @@ public class JGDPStatisticsServiceImpl {
         if (orgCode != null) {
             // 按照管辖机构区域信息模糊查询
             boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
+            // 只统计已纳管设备
+            boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", Boolean.TRUE));
             // 且8大类，目的去掉脏数据
             boolMust.must(QueryBuilders.termsQuery("EQU_LIST_CODE", StCommonServiceImpl.getEquipmentCategory().stream().map(EquipmentCategoryDto::getCode).collect(Collectors.toList())));
             SearchSourceBuilder builder = new SearchSourceBuilder();
@@ -1248,6 +1254,8 @@ public class JGDPStatisticsServiceImpl {
         BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
+        // 只统计已纳管设备
+        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", Boolean.TRUE));
         // 且8大类，目的去掉脏数据
         boolMust.must(QueryBuilders.termsQuery("EQU_LIST_CODE", StCommonServiceImpl.getEquipmentCategory().stream().map(EquipmentCategoryDto::getCode).collect(Collectors.toList())));
         request.query(boolMust);
@@ -1454,7 +1462,7 @@ public class JGDPStatisticsServiceImpl {
         BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
-        // 设备类别精确查询气瓶
+        // 只统计已纳管设备
         boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", true));
         // 且8大类，目的去掉脏数据
         boolMust.must(QueryBuilders.termsQuery("EQU_LIST_CODE", StCommonServiceImpl.getEquipmentCategory().stream().map(EquipmentCategoryDto::getCode).collect(Collectors.toList())));

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

@@ -463,7 +463,7 @@ public class JYJCDPStatisticsServiceImpl {
         String orgCode = stCommonService.getAndSetOrgCode(dpFilterParamDto.getCityCode());
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
-        // 且在用状态设备
+        // 只统计已纳管设备
         boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", Boolean.TRUE));
         // 且下次检验日期大于等于当天
         long currentDayTime = DateUtil.parse(DateUtil.today(), "yyy-MM-dd").getTime();
@@ -490,7 +490,7 @@ public class JYJCDPStatisticsServiceImpl {
         String orgCode = stCommonService.getAndSetOrgCode(dpFilterParamDto.getCityCode());
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
-        // 在用状态设备
+        // 只统计已纳管设备
         boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", Boolean.TRUE));
         // 查询下次检验日期小于当前天的设备，即为超期检验超期设备
         long currentDayTime = DateUtil.parse(DateUtil.now(), "yyy-MM-dd").getTime();
@@ -561,7 +561,7 @@ public class JYJCDPStatisticsServiceImpl {
         String orgCode = stCommonService.getAndSetOrgCode(dpFilterParamDto.getCityCode());
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
-        // 且在用状态设备
+        // 只统计已纳管设备
         boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", Boolean.TRUE));
         // 且下次检验日期大于等于当天 且查询 下次检验日期 <= 当前天+30天 即为临期
         long currentDayTime = DateUtil.parse(DateUtil.today(), "yyy-MM-dd").getTime();
@@ -600,7 +600,7 @@ public class JYJCDPStatisticsServiceImpl {
         String orgCode = stCommonService.getAndSetOrgCode(dpFilterParamDto.getCityCode());
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
-        // 在用状态设备
+        // 只统计已纳管设备
         boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", Boolean.TRUE));
         // 查询下次检验日期小于当前天的设备，即为超期检验超期设备
         long currentDayTime = DateUtil.parse(DateUtil.now(), "yyy-MM-dd").getTime();

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

@@ -205,7 +205,7 @@ public class StCommonServiceImpl {
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
         // 设备类别精确查询气瓶
         boolMust.must(QueryBuilders.termQuery("EQU_CATEGORY_CODE", EQU_CATEGORY_CYLINDER));
-        // 且在用状态设备
+        // 只统计已纳管设备
         boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", Boolean.TRUE));
         request.query(boolMust);
         try {
@@ -224,7 +224,7 @@ public class StCommonServiceImpl {
         BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
-        // 且在用状态设备
+        // 只统计已纳管设备
         boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", Boolean.TRUE));
         // 且8大类，目的去掉脏数据
         boolMust.must(QueryBuilders.termsQuery("EQU_LIST_CODE",StCommonServiceImpl.getEquipmentCategory().stream().map(EquipmentCategoryDto::getCode).collect(Collectors.toList())));

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

@@ -417,7 +417,9 @@ public class YJDPStatisticsServiceImpl {
         BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
-        // 在用状态设备
+        // 只统计已纳管设备
+        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", Boolean.TRUE));
+        // 设备种类是电梯的
         boolMust.must(QueryBuilders.termQuery("EQU_LIST_CODE", EquipmentClassifityEnum.DT.getCode()));
         request.query(boolMust);
         try {
@@ -437,7 +439,7 @@ public class YJDPStatisticsServiceImpl {
         BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
-        // 且在用状态设备
+        // 只统计已纳管设备
         boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", Boolean.TRUE));
         // 且设备品种3级,按照真实的过滤，防止有脏数据
         boolMust.must(QueryBuilders.termsQuery("EQU_DEFINE_CODE.keyword", ELEVATOR_EQU_DEFINE_CODES.split(",")));

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

@@ -6,12 +6,11 @@ import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
 import com.yeejoin.amos.boot.module.common.api.entity.AlertStatistics;
-import com.yeejoin.amos.boot.module.statistics.api.mapper.AlertStatisticsMapper;
 import com.yeejoin.amos.boot.module.common.api.enums.UnitTypeEnum;
 import com.yeejoin.amos.boot.module.common.api.enums.UserPostEnum;
+import com.yeejoin.amos.boot.module.statistics.api.mapper.AlertStatisticsMapper;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.ZLStatisticsMapper;
 import com.yeejoin.amos.boot.module.ymt.api.dto.EquipmentCategoryDto;
-import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
 import org.apache.lucene.queryparser.classic.QueryParser;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
@@ -481,7 +480,7 @@ public class ZLDPStatisticsServiceImpl {
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
         // 且8大类，目的去掉脏数据
         boolMust.must(QueryBuilders.termsQuery("EQU_LIST_CODE",StCommonServiceImpl.getEquipmentCategory().stream().map(EquipmentCategoryDto::getCode).collect(Collectors.toList())));
-        // 且在用状态设备
+        // 只统计已纳管设备
         boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", Boolean.TRUE));
         // 有监管码
         boolMust.must(QueryBuilders.existsQuery("SUPERVISORY_CODE"));