Browse Source

客户费用,时间查询BUG

v1.0
15989082884@163.com 2 years ago
parent
commit
0310dad84e
  1. 4
      src/main/java/com/qs/serve/modules/excel/controller/DateCheckApplyController.java
  2. 2
      src/main/java/com/qs/serve/modules/pay/controller/PayPaymentController.java

4
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<DataCheckApplyMainInfo> getSummary(DataSupplierSo param){
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<DataCheckApplyDetailInfo> getItemized(DataSupplierSo param){
if(param.getEndDate()==null) {
param.setEndDate(LocalDate.now());
}
if(param.getSaFlag().equals(0)){
SysConfig config = configService.getByKey(SysConfigKey.DateCheckApplyExcelYear);
if(config==null){

2
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());

Loading…
Cancel
Save