bug修改

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationManageMapper.xml

@@ -335,6 +335,9 @@
             <if test="dto.equListCode != null and dto.equListCode != ''">
                 and tjurm.equ_list_code = #{dto.equListCode}
             </if>
+            <if test="dto.superviseOrgCode != null and dto.superviseOrgCode != ''">
+                and pc.org_code like concat (#{dto.superviseOrgCode}, '%')
+            </if>
             <if test="dto.equCategory != null and dto.equCategory != ''">
                 and tjurm.equ_category = #{dto.equCategory}
             </if>

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

@@ -282,6 +282,8 @@ public class JGDPStatisticsServiceImpl {
 
     private final ComprehensiveStatisticalAnalysisServiceImpl statisticalAnalysisService;
 
+    DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+
 
     private List<LegendDataDto> buildLegendDataList() {
         List<LegendDataDto> legendDataDtos = new ArrayList<>();
@@ -720,14 +722,14 @@ public class JGDPStatisticsServiceImpl {
     private long countEquipNumFromES(DPFilterParamDto dpFilterParamDto, Integer... states) {
         long num;
         CountRequest request = new CountRequest();
-        request.indices("idx_biz_view_jg_all");
+        request.indices(StatisticalAnalysisEnum.equip.getKey());
         BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
         String orgCode = stCommonService.getAndSetOrgCode(dpFilterParamDto.getCityCode());
         if (orgCode == null) {
             return 0L;
         }
         // 按照管辖机构区域信息模糊查询
-        boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
+        boolMust.must(QueryBuilders.prefixQuery("ORG_BRANCH_CODE", orgCode));
         //已赋码
         boolMust.must(QueryBuilders.existsQuery("SUPERVISORY_CODE"));
         boolMust.mustNot(QueryBuilders.termQuery("SUPERVISORY_CODE", "null"));
@@ -789,25 +791,22 @@ public class JGDPStatisticsServiceImpl {
     private Long staticsCenterMapCountDateTemporary(DPFilterParamDto dpFilterParamDto) {
         long num;
         CountRequest request = new CountRequest();
-        request.indices("idx_biz_view_jg_all");
+        request.indices(StatisticalAnalysisEnum.equip.getKey());
         BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
         String orgCode = stCommonService.getAndSetOrgCode(dpFilterParamDto.getCityCode());
         if (orgCode == null) {
             return 0L;
         }
         // 按照管辖机构区域信息模糊查询
-        boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
+        boolMust.must(QueryBuilders.prefixQuery("ORG_BRANCH_CODE", orgCode));
         //已赋码
         boolMust.must(QueryBuilders.existsQuery("SUPERVISORY_CODE"));
         boolMust.mustNot(QueryBuilders.termQuery("SUPERVISORY_CODE", "null"));
         //状态为已认领
         String[] status = {"草稿", "已拒领", "待认领"};
         boolMust.mustNot(QueryBuilders.termsQuery("STATUS", Arrays.asList(status)));
-        // 且下次检验日期大于等于当天
-        long currentDayTime = DateUtil.parse(DateUtil.today(), "yyy-MM-dd").getTime();
         // 且查询 下次检验日期 <= 当前天+30天 极为临期
-        long currentDayAfter30DayTime = DateUtil.offsetDay(DateUtil.parse(DateUtil.today(), "yyy-MM-dd"), 30).getTime();
-        boolMust.must(QueryBuilders.rangeQuery("NEXT_INSPECT_DATE").gte(currentDayTime).lte(currentDayAfter30DayTime));
+        boolMust.filter(QueryBuilders.rangeQuery("NEXT_INSPECT_DATE").gte(LocalDate.now().format(formatter)).lte(LocalDate.now().plusDays(30).format(formatter)));
         // 且8大类，目的去掉脏数据
         boolMust.must(QueryBuilders.termsQuery("EQU_LIST_CODE", StCommonServiceImpl.getEquipmentCategory().stream().map(EquipmentCategoryDto::getCode).collect(Collectors.toList())));
         request.query(boolMust);
@@ -830,14 +829,14 @@ public class JGDPStatisticsServiceImpl {
     private Long staticsCenterMapCountDateOverdue(DPFilterParamDto dpFilterParamDto) {
         long num = 0;
         CountRequest request = new CountRequest();
-        request.indices("idx_biz_view_jg_all");
+        request.indices(StatisticalAnalysisEnum.equip.getKey());
         BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
         String orgCode = stCommonService.getAndSetOrgCode(dpFilterParamDto.getCityCode());
         if (orgCode == null) {
             return 0L;
         }
         // 按照管辖机构区域信息模糊查询
-        boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
+        boolMust.must(QueryBuilders.prefixQuery("ORG_BRANCH_CODE", orgCode));
         //已赋码
         boolMust.must(QueryBuilders.existsQuery("SUPERVISORY_CODE"));
         boolMust.mustNot(QueryBuilders.termQuery("SUPERVISORY_CODE", "null"));
@@ -3574,10 +3573,11 @@ public class JGDPStatisticsServiceImpl {
             return new Page<>();
         }
         // 默认登录监管单位orgcode过滤
-        problemModel.setGoverningBodyOrgCode(orgCode);
         if (!ObjectUtils.isEmpty(problemModel.getGoverningBodyOrgCode())) {
             // 筛选条件起效
             problemModel.setGoverningBodyOrgCode(problemModel.getGoverningBodyOrgCode());
+        } else {
+            problemModel.setGoverningBodyOrgCode(orgCode);
         }
         // 使用orgCode过滤
         // 将单位类型从code转化为value
@@ -3594,6 +3594,7 @@ public class JGDPStatisticsServiceImpl {
 
     public Page<JgUseRegistrationManageDto> getRegistrationRecords(Page<JgUseRegistrationManageDto> page, JgUseRegistrationManageDto dto, String cityCode) {
         String orgCode = stCommonService.getAndSetOrgCode(cityCode);
+
         return jgUseRegistrationManageMapper.getRecords(page, dto, orgCode);
     }