时间范围查询

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollClubOne/controller/RollClubOneController.java

@@ -190,7 +190,7 @@ public class RollClubOneController {
 
 		// 手动分页
 		int pageNo = queryDTO.getPageNo() != null ? queryDTO.getPageNo() : 1;
-		int pageSize = queryDTO.getPageSize() != null ? queryDTO.getPageSize() : 30;
+		int pageSize = queryDTO.getPageSize() != null ? queryDTO.getPageSize() : 40;
 		int total = rollClubOneVOS.size();
 		int fromIndex = (pageNo - 1) * pageSize;
 		int toIndex = Math.min(fromIndex + pageSize, total);

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/storageBill/controller/StorageBillPrintController.java

@@ -123,8 +123,9 @@ public class StorageBillPrintController extends JeecgController<StorageBillPrint
         if(oConvertUtils.isNotEmpty(storageBillPrint.getArrivalTime())){
             // 开始时间
             Date startTime = storageBillPrint.getArrivalTime();
-            // 结束时间+1天
-            Date endTime = DateUtils.addDays(startTime, 1);
+            startTime = DateUtils.getStartOfDayByDate(startTime);
+            // 结束时间 减一个小时
+            Date endTime = DateUtils.getEndOfDayByDate(startTime);
             log.info("查询时间范围：startTime={}, endTime={}", startTime, endTime);
             // 修改时间范围查询条件为 >= startTime 且 <= endTime
             queryWrapper.ge("arrival_time", startTime)  // 大于等于开始时间