Merge branch 'master' of http://123.57.213.14:3001/zgzt/dosb-java

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/storageBill/dto/StorageCenterQueryDTO.java

@@ -27,10 +27,10 @@ public class StorageCenterQueryDTO {
 //    @DateTimeFormat(pattern = "yyyy-MM-dd")
 //    private Date createTimeEnd;
 
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date storageTimeBegin;
 
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date storageTimeEnd;
 
     /**

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/storageBill/service/impl/StorageBillServiceImpl.java

@@ -4235,11 +4235,11 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
         Date beginDate = queryDTO.getStorageTimeBegin();
         Date endDate = queryDTO.getStorageTimeEnd();
         if (beginDate != null) {
-            Date adjustedBeginDate = DateUtils.addDays(beginDate, -5);
-            billQueryWrapper.ge(HeatsActuals::getCreateTime, DateUtils.getStartOfDayByDate(adjustedBeginDate));
+            Date adjustedBeginDate = DateUtils.addDays(beginDate, -3);
+            billQueryWrapper.ge(HeatsActuals::getUpdateTime, adjustedBeginDate);
         }
         if (endDate != null) {
-            billQueryWrapper.le(HeatsActuals::getCreateTime, DateUtils.getEndOfDayByDate(endDate));
+            billQueryWrapper.le(HeatsActuals::getUpdateTime, endDate);
         }
         billQueryWrapper.orderByDesc(HeatsActuals::getCreateTime);
 
@@ -4321,15 +4321,15 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
                         Predicate<StorageCenterHeatNoInvoicingVO.RollChargeDetail> timeFilter = detail -> {
                             Date createTime1 = detail.getCreateTime();
                             if (createTime1 == null) {
-                                return false; // 没有 updateTime 的记录直接过滤掉
+                                return false; // 没有 createTime 的记录直接过滤掉
                             }
 
                             if (storageTimeBegin != null && storageTimeEnd != null) {
-                                return !createTime1.before(DateUtils.getStartOfDayByDate(storageTimeBegin)) && !createTime1.after(DateUtils.getEndOfDayByDate(storageTimeEnd));
+                                return !createTime1.before(storageTimeBegin) && !createTime1.after(storageTimeEnd);
                             } else if (storageTimeBegin != null) {
-                                return !createTime1.before(DateUtils.getStartOfDayByDate(storageTimeBegin));
+                                return !createTime1.before(storageTimeBegin);
                             } else if (storageTimeEnd != null) {
-                                return !createTime1.after(DateUtils.getEndOfDayByDate(storageTimeEnd));
+                                return !createTime1.after(storageTimeEnd);
                             } else {
                                 return true; // 时间条件都为空，则不过滤
                             }
@@ -4338,15 +4338,15 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
                         Predicate<StorageCenterHeatNoInvoicingVO.RollSendDetail> timeFilterOther = detail -> {
                             Date updateTime1 = detail.getUpdateTime();
                             if (updateTime1 == null) {
-                                return false; // 没有 createTime 的记录直接过滤掉
+                                return false; // 没有 updateTime 的记录直接过滤掉
                             }
 
                             if (storageTimeBegin != null && storageTimeEnd != null) {
-                                return !updateTime1.before(DateUtils.getStartOfDayByDate(storageTimeBegin)) && !updateTime1.after(DateUtils.getEndOfDayByDate(storageTimeEnd));
+                                return !updateTime1.before(storageTimeBegin) && !updateTime1.after(storageTimeEnd);
                             } else if (storageTimeBegin != null) {
-                                return !updateTime1.before(DateUtils.getStartOfDayByDate(storageTimeBegin));
+                                return !updateTime1.before(storageTimeBegin);
                             } else if (storageTimeEnd != null) {
-                                return !updateTime1.after(DateUtils.getEndOfDayByDate(storageTimeEnd));
+                                return !updateTime1.after(storageTimeEnd);
                             } else {
                                 return true; // 时间条件都为空，则不过滤
                             }

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/carUnit/service/impl/CarUnitServiceImpl.java

@@ -787,7 +787,7 @@ public class CarUnitServiceImpl extends ServiceImpl<CarUnitMapper, CarUnit> impl
     private static StorageCenterExportRow convert(StorageCenterHeatNoInvoicingVO.RollChargeDetail detail, Integer ccmNo, String endpoint) {
         StorageCenterExportRow row = new StorageCenterExportRow();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        String dateString = sdf.format(detail.getUpdateTime());
+        String dateString = sdf.format(detail.getCreateTime());
         row.setFactoryDate(dateString);
         row.setEndPoint(endpoint);
         row.setLicensePlate(detail.getLicensePlate());
@@ -827,7 +827,7 @@ public class CarUnitServiceImpl extends ServiceImpl<CarUnitMapper, CarUnit> impl
         }
         row.setSpec(detail.getSpec());
         if (detail != null && detail.getUpdateTime() != null) {
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             row.setFactoryDate(sdf.format(detail.getUpdateTime()));
         } else {
             row.setFactoryDate("");