查询时间修改

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

@@ -33,6 +33,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
@@ -238,7 +239,7 @@ public class DbStockController extends AbstractController {
             queryWrapper.eq(DbStock::getCollegeId, dbStockParam.getCollegeId());
         }
         if (Objects.nonNull(dbStockParam.getStartTime()) && Objects.nonNull(dbStockParam.getEndTime())) {
-            queryWrapper.between(DbStock::getCreateTime, dbStockParam.getStartTime(), dbStockParam.getEndTime());
+            queryWrapper.between(DbStock::getCreateTime, dbStockParam.getStartTime().atStartOfDay(), dbStockParam.getEndTime().atTime(LocalTime.MAX));
         }
         //倒叙
         queryWrapper.orderByDesc(DbStock::getId);

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

@@ -1,5 +1,6 @@
 package com.zd.airbottle.domain.bo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.zd.model.page.PageQuery;
@@ -8,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -25,8 +27,10 @@ public class DbStockParam extends PageQuery implements Serializable {
     private Long collegeId;
 
     @ApiModelProperty("开始时间")
-    private LocalDateTime startTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDate startTime;
 
     @ApiModelProperty("结束时间")
-    private LocalDateTime endTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDate endTime;
 }