储运中心查询导出时间字段修改为根据发车时间过滤

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

@@ -1574,12 +1574,12 @@ public class CarUnitServiceImpl extends ServiceImpl<CarUnitMapper, CarUnit> impl
             billQueryWrapper.eq(StorageBill::getShiftGroup, queryDTO.getShiftGroup());
         }
         if (beginDate != null) {
-            billQueryWrapper.ge(StorageBill::getArrivalTime, beginDate);
+            billQueryWrapper.ge(StorageBill::getOutTime, beginDate);
         }
         if (endDate != null) {
-            billQueryWrapper.le(StorageBill::getArrivalTime, endDate);
+            billQueryWrapper.le(StorageBill::getOutTime, endDate);
         }
-        billQueryWrapper.orderByDesc(StorageBill::getArrivalTime);
+        billQueryWrapper.orderByDesc(StorageBill::getOutTime);
 
         List<StorageBill> billList = storageBillMapper.selectList(billQueryWrapper);
 
@@ -1752,6 +1752,17 @@ public class CarUnitServiceImpl extends ServiceImpl<CarUnitMapper, CarUnit> impl
             log.warn("allHeatNos 为空，未生成任何开票信息结果");
         }
 
+        resultList.sort(Comparator.comparing(
+                vo -> vo.getHeatNoDetails() == null || vo.getHeatNoDetails().isEmpty()
+                        ? null
+                        : vo.getHeatNoDetails().stream()
+                        .map(StorageCenterInvoicingVO.HeatNoDetail::getCreateTime)
+                        .filter(Objects::nonNull)
+                        .max(Comparator.naturalOrder())
+                        .orElse(null),
+                Comparator.nullsLast(Comparator.reverseOrder())
+        ));
+
         return resultList;
 
     }
@@ -1966,7 +1977,7 @@ public class CarUnitServiceImpl extends ServiceImpl<CarUnitMapper, CarUnit> impl
                     chargeDetail.setHeatNo(heatNo);
                     chargeDetail.setCarNum(Optional.ofNullable(bill.getCarNum()).orElse(1));
                     chargeDetail.setBrandNum(Optional.ofNullable(bill.getBrandNum()).orElse(""));
-                    chargeDetail.setCreateTime(Optional.ofNullable(bill.getCreateTime()).orElse(new Date()));
+                    chargeDetail.setCreateTime(Optional.ofNullable(bill.getOutTime()).orElse(new Date()));
                     rollTwoHeatNo.getRollChargeDetails().add(chargeDetail);
                 }
             }
@@ -2107,7 +2118,7 @@ public class CarUnitServiceImpl extends ServiceImpl<CarUnitMapper, CarUnit> impl
                     chargeDetail.setHeatNo(heatNo);
                     chargeDetail.setCarNum(Optional.ofNullable(bill.getCarNum()).orElse(1));
                     chargeDetail.setBrandNum(Optional.ofNullable(bill.getBrandNum()).orElse(""));
-                    chargeDetail.setCreateTime(Optional.ofNullable(bill.getCreateTime()).orElse(new Date()));
+                    chargeDetail.setCreateTime(Optional.ofNullable(bill.getOutTime()).orElse(new Date()));
                     rollThreeHeatNo.getRollChargeDetails().add(chargeDetail);
                 }
             }
@@ -2248,7 +2259,7 @@ public class CarUnitServiceImpl extends ServiceImpl<CarUnitMapper, CarUnit> impl
                     chargeDetail.setHeatNo(heatNo);
                     chargeDetail.setCarNum(Optional.ofNullable(bill.getCarNum()).orElse(1));
                     chargeDetail.setBrandNum(Optional.ofNullable(bill.getBrandNum()).orElse(""));
-                    chargeDetail.setCreateTime(Optional.ofNullable(bill.getCreateTime()).orElse(new Date()));
+                    chargeDetail.setCreateTime(Optional.ofNullable(bill.getOutTime()).orElse(new Date()));
                     rollOutHeatNo.getRollChargeDetails().add(chargeDetail);
                 }
             }