Browse Source

同步master更改

dev_ycq
21819 2 years ago
parent
commit
d1bb750a80
  1. 2
      mailbox-lan/src/main/java/com/biutag/lan/controller/work/WorkController.java
  2. 2
      mailbox-lan/src/main/java/com/biutag/lan/service/WorkService.java

2
mailbox-lan/src/main/java/com/biutag/lan/controller/work/WorkController.java

@ -48,7 +48,7 @@ public class WorkController {
@NotPower @NotPower
@GetMapping("dissatisfied") @GetMapping("dissatisfied")
public AjaxResult<Page<WorkVo>> dissatisfied(Page<Work> page, TodoQuery todoQuery) { public AjaxResult<Page<WorkVo>> dissatisfied(Page<Work> page, MailQuery todoQuery) {
return AjaxResult.success(workService.dissatisfied(page, todoQuery)); return AjaxResult.success(workService.dissatisfied(page, todoQuery));
} }
} }

2
mailbox-lan/src/main/java/com/biutag/lan/service/WorkService.java

@ -328,7 +328,7 @@ public class WorkService extends ServiceImpl<WorkMapper, Work> {
EasyExcel.read(file.getInputStream(), WorkVo.class, new ExcelService(this)).sheet().doRead(); EasyExcel.read(file.getInputStream(), WorkVo.class, new ExcelService(this)).sheet().doRead();
} }
public Page<WorkVo> dissatisfied(Page<Work> page, TodoQuery todoQuery) { public Page<WorkVo> dissatisfied(Page<Work> page, MailQuery todoQuery) {
QueryWrapper<Work> queryWrapper = new QueryWrapper<Work>() QueryWrapper<Work> queryWrapper = new QueryWrapper<Work>()
.ge(StrUtil.isNotBlank(todoQuery.getMailTimeStart()), "TO_CHAR(m.mail_time, 'YYYY-MM-DD')", todoQuery.getMailTimeStart()) .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()) .le(StrUtil.isNotBlank(todoQuery.getMailTimeStartEnd()), "TO_CHAR(m.mail_time, 'YYYY-MM-DD')", todoQuery.getMailTimeStartEnd())

Loading…
Cancel
Save