1.检验检测大屏接口接口开发

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

@@ -292,7 +292,7 @@ public class DPStatisticsServiceImpl {
         // 设备类别精确查询气瓶
         boolMust.must(QueryBuilders.termsQuery("EQU_CATEGORY_CODE", EQU_CATEGORY_CYLINDER));
         // 纳管状态为已纳管
-        boolMust.must(QueryBuilders.termsQuery("IS_INTO_MANAGEMENT", true));
+        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", true));
         request.query(boolMust);
         try {
             CountResponse response = restHighLevelClient.count(request, RequestOptions.DEFAULT);
@@ -321,7 +321,7 @@ public class DPStatisticsServiceImpl {
         // 区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("USE_PLACE_CODE", "*" + dpFilterParamDto.getCityCode() + "*"));
         // 纳管状态为已纳管
-        boolMust.must(QueryBuilders.termsQuery("IS_INTO_MANAGEMENT", true));
+        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", true));
         SearchSourceBuilder builder = new SearchSourceBuilder();
         builder.query(boolMust);
         TermsAggregationBuilder aggregationBuilder = AggregationBuilders.terms("count_by_equ_list_code").field("EQU_LIST_CODE");
@@ -680,7 +680,7 @@ public class DPStatisticsServiceImpl {
         // 区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("USE_PLACE_CODE", "*" + dpFilterParamDto.getCityCode() + "*"));
         // 纳管状态为已纳管
-        boolMust.must(QueryBuilders.termsQuery("IS_INTO_MANAGEMENT", true));
+        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", true));
         SearchSourceBuilder builder = new SearchSourceBuilder();
         builder.query(boolMust);
         TermsAggregationBuilder aggregationBuilder = AggregationBuilders.terms("EQU_STATE_COUNT").field("EQU_STATE");
@@ -733,7 +733,7 @@ public class DPStatisticsServiceImpl {
         // 区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("USE_PLACE_CODE", "*" + dpFilterParamDto.getCityCode() + "*"));
         // 纳管状态为已纳管
-        boolMust.must(QueryBuilders.termsQuery("IS_INTO_MANAGEMENT", true));
+        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", true));
         SearchSourceBuilder builder = new SearchSourceBuilder();
         builder.query(boolMust);
         // 设备状态

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionApplicationMapper.xml

@@ -285,6 +285,11 @@
                      a.inspection_unit_code= b.use_unit_code
                     and a.status != '6610'  and a.status != '6615'
                     and b.supervise_org_code like CONCAT(#{orgCode}, '%')
-                    and date_ge(CAST(a.application_date as date),#{dto.beginDate}) and date_le(CAST(a.application_date as date),#{dto.endDate})
+                    <if test="dto.beginDate !=null">
+                        and date_ge(CAST(a.application_date as date),#{dto.beginDate})
+                    </if>
+                    <if test="dto.endDate !=null">
+                        and date_le(CAST(a.application_date as date),#{dto.endDate})
+                    </if>
     </select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/DPStatisticsServiceImpl.java

@@ -360,8 +360,6 @@ public class DPStatisticsServiceImpl {
 
     public Map<String, Object> getCenterMapCountDataForGlobal(DPFilterParamDto dpFilterParamDto) {
         Map<String, Object> result = new HashMap<>();
-        // 0.查询条件构造未上送时间时，默认查询数据为近一个月数据
-        this.setDefaultFilter(dpFilterParamDto);
         // 1.报检数量统计
         this.staticsCenterMapCountDataReporting(result, dpFilterParamDto);
         // 2.检验检测临期设备数数量统计
@@ -379,9 +377,9 @@ public class DPStatisticsServiceImpl {
         // 且区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("USE_PLACE_CODE", "*" + dpFilterParamDto.getCityCode() + "*"));
         // 且纳管状态为已纳管
-        boolMust.must(QueryBuilders.termsQuery("IS_INTO_MANAGEMENT", true));
+        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", true));
         // 且在用状态设备
-        boolMust.must(QueryBuilders.termsQuery("EQU_STATE", EquimentEnum.ZAIYONG.getCode()));
+        boolMust.must(QueryBuilders.termQuery("EQU_STATE", EquimentEnum.ZAIYONG.getCode()));
         // 且下次检验日期大于等于当天
         long currentDayTime = DateUtil.parse(DateUtil.today(), "yyy-MM-dd").getTime();
         boolMust.must(QueryBuilders.rangeQuery("NEXT_INSPECT_DATE").gte(currentDayTime));
@@ -406,9 +404,9 @@ public class DPStatisticsServiceImpl {
         // 区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("USE_PLACE_CODE", "*" + dpFilterParamDto.getCityCode() + "*"));
         // 纳管状态为已纳管
-        boolMust.must(QueryBuilders.termsQuery("IS_INTO_MANAGEMENT", true));
+        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", true));
         // 在用状态设备
-        boolMust.must(QueryBuilders.termsQuery("EQU_STATE", EquimentEnum.ZAIYONG.getCode()));
+        boolMust.must(QueryBuilders.termQuery("EQU_STATE", EquimentEnum.ZAIYONG.getCode()));
         // 查询下次检验日期小于当前天的设备，即为超期检验超期设备
         long currentDayTime = DateUtil.parse(DateUtil.now(), "yyy-MM-dd").getTime();
         boolMust.must(QueryBuilders.rangeQuery("NEXT_INSPECT_DATE").lt(currentDayTime));
@@ -452,17 +450,15 @@ public class DPStatisticsServiceImpl {
     }
 
     public Map<String, Object> equipInspectTimeCountByEquList(DPFilterParamDto dpFilterParamDto) {
-        // 1.查询条件构造未上送时间时，默认查询数据为近一个月数据
-        this.setDefaultFilter(dpFilterParamDto);
-        // 2.按照前端约定格式返回数据
+        // 1.按照前端约定格式返回数据
         Map<String, Object> result = new HashMap<>();
-        //2.1 图列数据构造
+        // 1.1 图列数据构造
         result.put("legendData", this.getLegendDataForJyTime());
         // 8大类设备种类
         List<EquipmentCategoryDto> equipmentCategoryDtos = equipmentCategoryMapper.selectClassify();
-        //2.2 x轴数据构造
+        // 2.x轴数据构造
         result.put("xdata", this.getEquListXDataCommon(equipmentCategoryDtos));
-        //2.3 y轴数据构造
+        // 3.y轴数据构造
         this.buildYDataForJyTime(result, dpFilterParamDto, equipmentCategoryDtos);
         return result;
     }
@@ -481,9 +477,9 @@ public class DPStatisticsServiceImpl {
         // 且区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("USE_PLACE_CODE", "*" + dpFilterParamDto.getCityCode() + "*"));
         // 且纳管状态为已纳管
-        boolMust.must(QueryBuilders.termsQuery("IS_INTO_MANAGEMENT", true));
+        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", true));
         // 且在用状态设备
-        boolMust.must(QueryBuilders.termsQuery("EQU_STATE", EquimentEnum.ZAIYONG.getCode()));
+        boolMust.must(QueryBuilders.termQuery("EQU_STATE", EquimentEnum.ZAIYONG.getCode()));
         // 且下次检验日期大于等于当天
         long currentDayTime = DateUtil.parse(DateUtil.today(), "yyy-MM-dd").getTime();
         boolMust.must(QueryBuilders.rangeQuery("NEXT_INSPECT_DATE").gte(currentDayTime));
@@ -518,9 +514,9 @@ public class DPStatisticsServiceImpl {
         // 区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("USE_PLACE_CODE", "*" + dpFilterParamDto.getCityCode() + "*"));
         // 纳管状态为已纳管
-        boolMust.must(QueryBuilders.termsQuery("IS_INTO_MANAGEMENT", true));
+        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", true));
         // 在用状态设备
-        boolMust.must(QueryBuilders.termsQuery("EQU_STATE", EquimentEnum.ZAIYONG.getCode()));
+        boolMust.must(QueryBuilders.termQuery("EQU_STATE", EquimentEnum.ZAIYONG.getCode()));
         // 查询下次检验日期小于当前天的设备，即为超期检验超期设备
         long currentDayTime = DateUtil.parse(DateUtil.now(), "yyy-MM-dd").getTime();
         boolMust.must(QueryBuilders.rangeQuery("NEXT_INSPECT_DATE").lt(currentDayTime));

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionApplicationServiceImpl.java

@@ -1289,7 +1289,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         }
         // 只有纳管的设备才能做业务 TODO
         boolMust.must(QueryBuilders.existsQuery("IS_INTO_MANAGEMENT"));
-        boolMust.must(QueryBuilders.termsQuery("IS_INTO_MANAGEMENT", true));
+        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", true));
     }
 
     private Set<String> getEquipInFlowing() {

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/statistics/ScreenImpl.java

@@ -452,7 +452,7 @@ public class ScreenImpl implements IScreenService {
         //设置模糊搜索
         searchSourceBuilder.query(QueryBuilders.boolQuery()
                 .must(QueryBuilders.wildcardQuery("USE_PLACE_CODE", "*"+screenDto.getCityCode()+"*"))
-                .must(QueryBuilders.termsQuery("IS_INTO_MANAGEMENT", true)));
+                .must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", true)));
         searchSourceBuilder.aggregation(
                         AggregationBuilders.terms("USE_SITE_CODE").field("USE_SITE_CODE")
         );