Browse Source

局长信箱来源改为mailbox库的mail

master
buaixuexideshitongxue 3 weeks ago
parent
commit
eeaa139bcb
  1. 1
      src/main/java/com/biutag/supervision/controller/data/DataMailBoxController.java
  2. 2
      src/main/java/com/biutag/supervision/pojo/param/MailQueryParam.java
  3. 6
      src/main/java/com/biutag/supervision/pojo/param/NegativeQueryParam.java
  4. 1
      src/main/java/com/biutag/supervision/repository/mail/MailResourceService.java

1
src/main/java/com/biutag/supervision/controller/data/DataMailBoxController.java

@ -80,6 +80,7 @@ public class DataMailBoxController {
mailQueryParam.setContent(param.getThingDesc()); mailQueryParam.setContent(param.getThingDesc());
mailQueryParam.setCurrent(param.getCurrent()); mailQueryParam.setCurrent(param.getCurrent());
mailQueryParam.setSize(param.getSize()); mailQueryParam.setSize(param.getSize());
mailQueryParam.setMailTime(param.getMailTime());
if (StrUtil.isNotBlank(param.getResponderKey()) && StrUtil.isNotBlank(param.getResponderValue())) { if (StrUtil.isNotBlank(param.getResponderKey()) && StrUtil.isNotBlank(param.getResponderValue())) {
switch (param.getResponderKey()) { switch (param.getResponderKey()) {
case "name": case "name":

2
src/main/java/com/biutag/supervision/pojo/param/MailQueryParam.java

@ -51,7 +51,7 @@ public class MailQueryParam extends BasePage{
private List<Date> createTime = new ArrayList<>(); private List<Date> createTime = new ArrayList<>();
@Schema(description = "创建时间") @Schema(description = "来信时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private List<Date> mailTime = new ArrayList<>(); private List<Date> mailTime = new ArrayList<>();

6
src/main/java/com/biutag/supervision/pojo/param/NegativeQueryParam.java

@ -96,4 +96,10 @@ public class NegativeQueryParam extends BasePage {
@Schema(description = "涉及部门id集合") @Schema(description = "涉及部门id集合")
private Set<String> involveDepartIds; private Set<String> involveDepartIds;
@Schema(description = "来信时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private List<Date> mailTime = new ArrayList<>();
} }

1
src/main/java/com/biutag/supervision/repository/mail/MailResourceService.java

@ -89,6 +89,7 @@ public class MailResourceService extends BaseDAO {
if (!param.getMailTime().isEmpty() && param.getMailTime().size() >= 2) { if (!param.getMailTime().isEmpty() && param.getMailTime().size() >= 2) {
queryWrapper.between(Mail::getMailTime, param.getMailTime().get(0), param.getMailTime().get(1)); queryWrapper.between(Mail::getMailTime, param.getMailTime().get(0), param.getMailTime().get(1));
} }
queryWrapper.orderByDesc(Mail::getMailTime);
return mailMapper.selectPage(new Page<>(param.getCurrent(), param.getSize()), queryWrapper); return mailMapper.selectPage(new Page<>(param.getCurrent(), param.getSize()), queryWrapper);
} }

Loading…
Cancel
Save