2023-10-26 出库列表查询日期过滤

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/DbInOutRecordController.java

@@ -14,6 +14,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.time.LocalTime;
 import java.util.Objects;
 
 /**
@@ -61,7 +62,8 @@ public class DbInOutRecordController extends AbstractController {
             queryWrapper.eq(DbInOutRecord::getCollegeId, dbInOutRecordParam.getCollegeId());
         }
         if (Objects.nonNull(dbInOutRecordParam.getStartTime()) && Objects.nonNull(dbInOutRecordParam.getEndTime())) {
-            queryWrapper.between(DbInOutRecord::getCreateTime, dbInOutRecordParam.getStartTime(), dbInOutRecordParam.getEndTime());
+            queryWrapper.between(DbInOutRecord::getCreateTime, dbInOutRecordParam.getStartTime().atStartOfDay(), dbInOutRecordParam.getEndTime().atTime(LocalTime.MAX));
+//            queryWrapper.between(DbInOutRecord::getCreateTime, dbInOutRecordParam.getStartTime(), dbInOutRecordParam.getEndTime());
         }
         //操作人 联系电话 气瓶编号 气瓶名称
         if (StringUtils.isNotBlank(dbInOutRecordParam.getSearchValue())) {

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/bo/DbInOutRecordParam.java

@@ -6,7 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.time.LocalDate;
 
 /**
  * @Description 出入库记录列表请求参数
@@ -25,9 +25,9 @@ public class DbInOutRecordParam extends PageQuery implements Serializable {
     private Long collegeId;
 
     @ApiModelProperty("开始时间")
-    private LocalDateTime startTime;
+    private LocalDate startTime;
 
     @ApiModelProperty("结束时间")
-    private LocalDateTime endTime;
+    private LocalDate endTime;
 
 }