From 0310dad84e26b652da0b1b07e3a80a9142634ef1 Mon Sep 17 00:00:00 2001 From: "15989082884@163.com" <15989082884@163.com> Date: Wed, 27 Sep 2023 11:38:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=B4=B9=E7=94=A8=EF=BC=8C?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=9F=A5=E8=AF=A2BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/controller/DateCheckApplyController.java | 8 ++++++-- .../modules/pay/controller/PayPaymentController.java | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/excel/controller/DateCheckApplyController.java b/src/main/java/com/qs/serve/modules/excel/controller/DateCheckApplyController.java index 8d08b3b7..d1fceaf5 100644 --- a/src/main/java/com/qs/serve/modules/excel/controller/DateCheckApplyController.java +++ b/src/main/java/com/qs/serve/modules/excel/controller/DateCheckApplyController.java @@ -43,7 +43,9 @@ public class DateCheckApplyController { @GetMapping("/summary") @SysLog(module = SystemModule.Verification, title = "客户汇总账单", biz = BizType.EXPORT) public R getSummary(DataSupplierSo param){ - param.setEndDate(LocalDate.now()); + if(param.getEndDate()==null) { + param.setEndDate(LocalDate.now()); + } if(param.getSaFlag().equals(0)){ SysConfig config = configService.getByKey(SysConfigKey.DateCheckApplyExcelYear); if(config==null){ @@ -67,7 +69,9 @@ public class DateCheckApplyController { @GetMapping("/itemized") @SysLog(module = SystemModule.Verification, title = "客户明细帐", biz = BizType.EXPORT) public R getItemized(DataSupplierSo param){ - param.setEndDate(LocalDate.now()); + if(param.getEndDate()==null) { + param.setEndDate(LocalDate.now()); + } if(param.getSaFlag().equals(0)){ SysConfig config = configService.getByKey(SysConfigKey.DateCheckApplyExcelYear); if(config==null){ diff --git a/src/main/java/com/qs/serve/modules/pay/controller/PayPaymentController.java b/src/main/java/com/qs/serve/modules/pay/controller/PayPaymentController.java index 41f58f15..3db3d70b 100644 --- a/src/main/java/com/qs/serve/modules/pay/controller/PayPaymentController.java +++ b/src/main/java/com/qs/serve/modules/pay/controller/PayPaymentController.java @@ -96,6 +96,8 @@ public class PayPaymentController { LocalDate startDate = LocalDate.of(LocalDate.now().getYear()-yearNum,1,1); if(paramSo.getQueryStartTime()==null || startDate.isAfter(paramSo.getQueryStartTime().toLocalDate())){ so.setStartDate(startDate); + }else{ + so.setStartDate(paramSo.getQueryStartTime().toLocalDate()); } }else { so.setStartDate(paramSo.getQueryStartTime()==null?null:paramSo.getQueryStartTime().toLocalDate());