diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayFileDownloadRecordController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayFileDownloadRecordController.java index 480f7908..50d5d701 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayFileDownloadRecordController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayFileDownloadRecordController.java @@ -76,14 +76,14 @@ public class PayFileDownloadRecordController extends JeroController queryWrapper = new QueryWrapper<>(); if (ObjectUtil.isNotEmpty(payFileDownloadRecord.getStartTime()) && ObjectUtil.isNotEmpty(payFileDownloadRecord.getEndTime())) { - queryWrapper.gt("create_time", payFileDownloadRecord.getStartTime()); - queryWrapper.lt("create_time", payFileDownloadRecord.getEndTime()); + queryWrapper.ge("create_time", payFileDownloadRecord.getStartTime()); + queryWrapper.le("create_time", payFileDownloadRecord.getEndTime()); }else if (ObjectUtil.isNotEmpty(payFileDownloadRecord.getStartTime())){ - queryWrapper.gt("create_time", payFileDownloadRecord.getStartTime()); + queryWrapper.ge("create_time", payFileDownloadRecord.getStartTime()); }else if (ObjectUtil.isNotEmpty(payFileDownloadRecord.getEndTime())){ - queryWrapper.lt("create_time", payFileDownloadRecord.getEndTime()); + queryWrapper.le("create_time", payFileDownloadRecord.getEndTime()); } if (ObjectUtil.isNotEmpty(payFileDownloadRecord.getFileName())){ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java index b1976493..275bc4e7 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java @@ -84,14 +84,14 @@ public class PayMailBillController extends JeroController queryWrapper = new QueryWrapper<>(); Page page = new Page<>(pageNo, pageSize); if (ObjectUtil.isNotEmpty(payMailBillSearch.getStartTime()) && ObjectUtil.isNotEmpty(payMailBillSearch.getEndTime())) { - queryWrapper.gt("send_date", payMailBillSearch.getStartTime()); - queryWrapper.lt("send_date", payMailBillSearch.getEndTime()); + queryWrapper.ge("send_date", payMailBillSearch.getStartTime()); + queryWrapper.le("send_date", payMailBillSearch.getEndTime()); }else if (ObjectUtil.isNotEmpty(payMailBillSearch.getStartTime())){ - queryWrapper.gt("send_date", payMailBillSearch.getStartTime()); + queryWrapper.ge("send_date", payMailBillSearch.getStartTime()); }else if (ObjectUtil.isNotEmpty(payMailBillSearch.getEndTime())){ - queryWrapper.lt("send_date", payMailBillSearch.getEndTime()); + queryWrapper.le("send_date", payMailBillSearch.getEndTime()); } if (ObjectUtil.isNotEmpty(payMailBillSearch.getChargeCompanyName())){