From d1bb750a80fe0180174fce9d4ca9769eca1461ae Mon Sep 17 00:00:00 2001 From: 21819 Date: Thu, 22 Feb 2024 11:10:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5master=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/biutag/lan/controller/work/WorkController.java | 2 +- .../src/main/java/com/biutag/lan/service/WorkService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mailbox-lan/src/main/java/com/biutag/lan/controller/work/WorkController.java b/mailbox-lan/src/main/java/com/biutag/lan/controller/work/WorkController.java index f4cfed2..5cdaa41 100644 --- a/mailbox-lan/src/main/java/com/biutag/lan/controller/work/WorkController.java +++ b/mailbox-lan/src/main/java/com/biutag/lan/controller/work/WorkController.java @@ -48,7 +48,7 @@ public class WorkController { @NotPower @GetMapping("dissatisfied") - public AjaxResult> dissatisfied(Page page, TodoQuery todoQuery) { + public AjaxResult> dissatisfied(Page page, MailQuery todoQuery) { return AjaxResult.success(workService.dissatisfied(page, todoQuery)); } } diff --git a/mailbox-lan/src/main/java/com/biutag/lan/service/WorkService.java b/mailbox-lan/src/main/java/com/biutag/lan/service/WorkService.java index b35cd48..7def5bc 100644 --- a/mailbox-lan/src/main/java/com/biutag/lan/service/WorkService.java +++ b/mailbox-lan/src/main/java/com/biutag/lan/service/WorkService.java @@ -328,7 +328,7 @@ public class WorkService extends ServiceImpl { EasyExcel.read(file.getInputStream(), WorkVo.class, new ExcelService(this)).sheet().doRead(); } - public Page dissatisfied(Page page, TodoQuery todoQuery) { + public Page dissatisfied(Page page, MailQuery todoQuery) { QueryWrapper queryWrapper = new QueryWrapper() .ge(StrUtil.isNotBlank(todoQuery.getMailTimeStart()), "TO_CHAR(m.mail_time, 'YYYY-MM-DD')", todoQuery.getMailTimeStart()) .le(StrUtil.isNotBlank(todoQuery.getMailTimeStartEnd()), "TO_CHAR(m.mail_time, 'YYYY-MM-DD')", todoQuery.getMailTimeStartEnd())