bug修改

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/DPFilterParamForDetailDto.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.common.api.dto;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 /**
  * 大屏筛选过滤对象
@@ -195,7 +196,7 @@ public class DPFilterParamForDetailDto {
     /**
      * 下次检验日期
      */
-    private String nextInspectionDate;
+    private List<String> nextInspectionDate;
     /**
      * 姓名
      */

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

@@ -26,6 +26,7 @@ import org.springframework.data.domain.PageRequest;
 import org.springframework.data.elasticsearch.core.query.NativeSearchQuery;
 import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
 import javax.annotation.Resource;
@@ -375,9 +376,16 @@ public class EquipmentStaticsServiceImpl {
             boolMust.must(QueryBuilders.wildcardQuery("EQU_CATEGORY", "*" + dpFilterParamForDetailDto.getEquCategory() + "*"));
         }
 
-        if (StringUtils.isNotEmpty(dpFilterParamForDetailDto.getNextInspectionDate())) {
-            String[] timeArray = dpFilterParamForDetailDto.getNextInspectionDate().split(",");
-            boolMust.filter(QueryBuilders.rangeQuery("NEXT_INSPECT_DATE").gte(timeArray[0]).lte(timeArray[1]));
+        if (!CollectionUtils.isEmpty(dpFilterParamForDetailDto.getNextInspectionDate())) {
+            String startDate = dpFilterParamForDetailDto.getNextInspectionDate().get(0);
+            String endDate = dpFilterParamForDetailDto.getNextInspectionDate().get(1);
+            if (startDate != null && endDate != null) {
+                boolMust.filter(QueryBuilders.rangeQuery("NEXT_INSPECT_DATE").gte(startDate).lte(endDate));
+            } else if (startDate != null) {
+                boolMust.filter(QueryBuilders.rangeQuery("NEXT_INSPECT_DATE").gte(startDate));
+            } else if (endDate != null) {
+                boolMust.filter(QueryBuilders.rangeQuery("NEXT_INSPECT_DATE").lte(endDate));
+            }
         }
     }
 }