气瓶充装和基本信息筛选调整

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/java/com/yeejoin/amos/boot/module/cylinder/flc/biz/service/impl/CylinderFillingRecordServiceImpl.java

@@ -344,14 +344,14 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
             boolMust.must(query);
         }
 
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        SimpleDateFormat sdf = new SimpleDateFormat(DateUtils.DATE_TIME_PATTERN);
         //充装开始时间
         if (!ObjectUtils.isEmpty(esCylinderFillingRecordDto.getFillingStartTime())) {
             flag = false;
             BoolQueryBuilder query = QueryBuilders.boolQuery();
-//            query.must(QueryBuilders.matchQuery("fillingStartTime", esCylinderFillingRecordDto.getFillingStartTime()));
             try {
-                query.must(QueryBuilders.rangeQuery("inspectionDateMs").gte(sdf.parse(esCylinderFillingRecordDto.getFillingStartTime()).getTime()));
+                String fillingStartTime = esCylinderFillingRecordDto.getFillingStartTime() + " 00:00:00";
+                query.must(QueryBuilders.rangeQuery("inspectionDateMs").gte(sdf.parse(fillingStartTime).getTime()));
             } catch (ParseException e) {
                 e.printStackTrace();
             }
@@ -362,9 +362,9 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
         if (!ObjectUtils.isEmpty(esCylinderFillingRecordDto.getFillingEndTime())) {
             flag = false;
             BoolQueryBuilder query = QueryBuilders.boolQuery();
-//            query.must(QueryBuilders.matchQuery("fillingEndTime", esCylinderFillingRecordDto.getFillingEndTime()));
             try {
-                query.must(QueryBuilders.rangeQuery("inspectionDateAfterMS").lte(sdf.parse(esCylinderFillingRecordDto.getFillingEndTime()).getTime()));
+                String fillingEndTime = esCylinderFillingRecordDto.getFillingEndTime() + " 23:59:59";
+                query.must(QueryBuilders.rangeQuery("inspectionDateAfterMS").lte(sdf.parse(fillingEndTime).getTime()));
             } catch (ParseException e) {
                 e.printStackTrace();
             }

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/java/com/yeejoin/amos/boot/module/cylinder/flc/biz/service/impl/CylinderInfoServiceImpl.java

@@ -934,9 +934,34 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
         if (!ObjectUtils.isEmpty(cylinderInfoDto.getInspectionDateStart()) && !ObjectUtils.isEmpty(cylinderInfoDto.getInspectionDateEnd())) {
             flag = false;
             BoolQueryBuilder query = QueryBuilders.boolQuery();
-//            query.must(QueryBuilders.rangeQuery("inspectionDate").from(cylinderInfoDto.getInspectionDateStart()).to(cylinderInfoDto.getInspectionDateEnd()));
             try {
-                query.must(QueryBuilders.rangeQuery("inspectionDateMs").gte(sdf.parse(cylinderInfoDto.getInspectionDateStart()).getTime()));
+                String inspectionDateStart = cylinderInfoDto.getInspectionDateStart() + " 00:00:00";
+                String inspectionDateEnd = cylinderInfoDto.getInspectionDateEnd() + " 23:59:59";
+                query.must(QueryBuilders.rangeQuery("inspectionDateMs")
+                        .gte(sdf.parse(inspectionDateStart).getTime())
+                        .lte(sdf.parse(inspectionDateEnd).getTime()));
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+            boolMust.must(query);
+        } else if (!ObjectUtils.isEmpty(cylinderInfoDto.getInspectionDateStart()) && ObjectUtils.isEmpty(cylinderInfoDto.getInspectionDateEnd())) {
+            flag = false;
+            BoolQueryBuilder query = QueryBuilders.boolQuery();
+            try {
+                String inspectionDateStart = cylinderInfoDto.getInspectionDateStart() + " 00:00:00";
+                query.must(QueryBuilders.rangeQuery("inspectionDateMs")
+                        .gte(sdf.parse(inspectionDateStart).getTime()));
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+            boolMust.must(query);
+        } else if(ObjectUtils.isEmpty(cylinderInfoDto.getInspectionDateStart()) && !ObjectUtils.isEmpty(cylinderInfoDto.getInspectionDateEnd())){
+            flag = false;
+            BoolQueryBuilder query = QueryBuilders.boolQuery();
+            try {
+                String inspectionDateEnd = cylinderInfoDto.getInspectionDateEnd() + " 23:59:59";
+                query.must(QueryBuilders.rangeQuery("inspectionDateMs")
+                        .lte(sdf.parse(inspectionDateEnd).getTime()));
             } catch (ParseException e) {
                 e.printStackTrace();
             }