导出明细表 添加查询时间

src/main/java/com/ydtech/modules/order/service/impl/ExcelExportServiceImpl.java

@@ -30,11 +30,13 @@ public class ExcelExportServiceImpl implements ExcelExportService {
      */
     @Override
     public List<CarBusinessDetailVo> getCarBusinessDetailList(String userId, CarBusinessDetailQueryVo carBusinessDetailQueryVo) {
-        LocalDateTime now = LocalDateTime.now();
-        LocalDateTime halfYearAgo = now.minusMonths(6);
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-        carBusinessDetailQueryVo.setSignStartDate(halfYearAgo.format(formatter));
-        carBusinessDetailQueryVo.setSignEndDate(now.format(formatter));
+        if(carBusinessDetailQueryVo.getSignStartDate() == null || carBusinessDetailQueryVo.getSignEndDate() == null) {
+            LocalDateTime now = LocalDateTime.now();
+            LocalDateTime halfYearAgo = now.minusMonths(6);
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+            carBusinessDetailQueryVo.setSignStartDate(halfYearAgo.format(formatter));
+            carBusinessDetailQueryVo.setSignEndDate(now.format(formatter));
+        }
 
         List<CarBusinessDetailVo> carBusinessDetailList = insOrdersMapper.getCarBusinessDetailList(userId, carBusinessDetailQueryVo);
         return carBusinessDetailList;
@@ -42,11 +44,13 @@ public class ExcelExportServiceImpl implements ExcelExportService {
 
     @Override
     public List<RevenueExpenditureDetailVo> getRevenueExpenditureDetailList(String userId, CarBusinessDetailQueryVo carBusinessDetailQueryVo) {
-        LocalDateTime now = LocalDateTime.now();
-        LocalDateTime halfYearAgo = now.minusMonths(6);
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-        carBusinessDetailQueryVo.setSignStartDate(halfYearAgo.format(formatter));
-        carBusinessDetailQueryVo.setSignEndDate(now.format(formatter));
+        if(carBusinessDetailQueryVo.getSignStartDate() == null || carBusinessDetailQueryVo.getSignEndDate() == null) {
+            LocalDateTime now = LocalDateTime.now();
+            LocalDateTime halfYearAgo = now.minusMonths(6);
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+            carBusinessDetailQueryVo.setSignStartDate(halfYearAgo.format(formatter));
+            carBusinessDetailQueryVo.setSignEndDate(now.format(formatter));
+        }
         List<RevenueExpenditureDetailVo> revenueExpenditureDetailList = insOrdersMapper.getRevenueExpenditureDetailList(userId, carBusinessDetailQueryVo);
         revenueExpenditureDetailList.forEach(item->{
             item.setBusinessEegmentsType(BusinessSegmentsSZEnum.getDescByCode(item.getBusinessEegmentsType()));