LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

票据邮寄导出

Browse Source
This commit is contained in:
zhangqinlin
2021-09-15 17:33:39 +08:00
parent 04e236b061
commit 7602aca996
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayFileDownloadRecordController.java
+4 -4
View File
@@ -76,14 +76,14 @@ public class PayFileDownloadRecordController extends JeroController<PayFileDownl
HttpServletRequest req) { HttpServletRequest req) {
QueryWrapper<PayFileDownloadRecord> queryWrapper = new QueryWrapper<>(); QueryWrapper<PayFileDownloadRecord> queryWrapper = new QueryWrapper<>();
if (ObjectUtil.isNotEmpty(payFileDownloadRecord.getStartTime()) && ObjectUtil.isNotEmpty(payFileDownloadRecord.getEndTime())) { if (ObjectUtil.isNotEmpty(payFileDownloadRecord.getStartTime()) && ObjectUtil.isNotEmpty(payFileDownloadRecord.getEndTime())) {
queryWrapper.gt("create_time", payFileDownloadRecord.getStartTime()); queryWrapper.ge("create_time", payFileDownloadRecord.getStartTime());
queryWrapper.lt("create_time", payFileDownloadRecord.getEndTime()); queryWrapper.le("create_time", payFileDownloadRecord.getEndTime());
}else if (ObjectUtil.isNotEmpty(payFileDownloadRecord.getStartTime())){ }else if (ObjectUtil.isNotEmpty(payFileDownloadRecord.getStartTime())){
queryWrapper.gt("create_time", payFileDownloadRecord.getStartTime()); queryWrapper.ge("create_time", payFileDownloadRecord.getStartTime());
}else if (ObjectUtil.isNotEmpty(payFileDownloadRecord.getEndTime())){ }else if (ObjectUtil.isNotEmpty(payFileDownloadRecord.getEndTime())){
queryWrapper.lt("create_time", payFileDownloadRecord.getEndTime()); queryWrapper.le("create_time", payFileDownloadRecord.getEndTime());
} }
if (ObjectUtil.isNotEmpty(payFileDownloadRecord.getFileName())){ if (ObjectUtil.isNotEmpty(payFileDownloadRecord.getFileName())){
jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
+4 -4
View File
@@ -84,14 +84,14 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
QueryWrapper<PayMailBill> queryWrapper = new QueryWrapper<>(); QueryWrapper<PayMailBill> queryWrapper = new QueryWrapper<>();
Page<PayMailBill> page = new Page<>(pageNo, pageSize); Page<PayMailBill> page = new Page<>(pageNo, pageSize);
if (ObjectUtil.isNotEmpty(payMailBillSearch.getStartTime()) && ObjectUtil.isNotEmpty(payMailBillSearch.getEndTime())) { if (ObjectUtil.isNotEmpty(payMailBillSearch.getStartTime()) && ObjectUtil.isNotEmpty(payMailBillSearch.getEndTime())) {
queryWrapper.gt("send_date", payMailBillSearch.getStartTime()); queryWrapper.ge("send_date", payMailBillSearch.getStartTime());
queryWrapper.lt("send_date", payMailBillSearch.getEndTime()); queryWrapper.le("send_date", payMailBillSearch.getEndTime());
}else if (ObjectUtil.isNotEmpty(payMailBillSearch.getStartTime())){ }else if (ObjectUtil.isNotEmpty(payMailBillSearch.getStartTime())){
queryWrapper.gt("send_date", payMailBillSearch.getStartTime()); queryWrapper.ge("send_date", payMailBillSearch.getStartTime());
}else if (ObjectUtil.isNotEmpty(payMailBillSearch.getEndTime())){ }else if (ObjectUtil.isNotEmpty(payMailBillSearch.getEndTime())){
queryWrapper.lt("send_date", payMailBillSearch.getEndTime()); queryWrapper.le("send_date", payMailBillSearch.getEndTime());
} }
if (ObjectUtil.isNotEmpty(payMailBillSearch.getChargeCompanyName())){ if (ObjectUtil.isNotEmpty(payMailBillSearch.getChargeCompanyName())){