From 98336610d39952fbc4bc35cfae3eecf1096a423d Mon Sep 17 00:00:00 2001 From: buaixuexideshitongxue <2936013465@qq.com> Date: Wed, 18 Mar 2026 14:07:27 +0800 Subject: [PATCH] =?UTF-8?q?fix--=E8=B0=83=E6=95=B4=E5=B1=80=E9=95=BF?= =?UTF-8?q?=E4=BF=A1=E7=AE=B1=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../subdatav/SubOneGlobalController.java | 2 +- .../repository/mail/MailResourceService.java | 8 ++++--- .../service/datav/DatavServiceImpl.java | 21 ++++++++++++------- .../service/subDatav/SubDatavServiceImpl.java | 2 +- 4 files changed, 21 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/biutag/supervision/controller/subdatav/SubOneGlobalController.java b/src/main/java/com/biutag/supervision/controller/subdatav/SubOneGlobalController.java index 816e935..3fa6be4 100644 --- a/src/main/java/com/biutag/supervision/controller/subdatav/SubOneGlobalController.java +++ b/src/main/java/com/biutag/supervision/controller/subdatav/SubOneGlobalController.java @@ -124,7 +124,7 @@ public class SubOneGlobalController { String exDepartId = externalDepartMapper.getExIdByInId(departId.toString(), "局长信箱"); subOneMailQueryWrapper.ne("mail_state", VALID_SIGN); subOneMailQueryWrapper.eq("second_dept_id", exDepartId); - subOneMailQueryWrapper.between("create_time", beginTime, endTime); + subOneMailQueryWrapper.between("mail_time", beginTime, endTime); Long mailboxNumber = mailMapper.selectCount(subOneMailQueryWrapper); // todo 局长信箱 // long mailboxNumber = negativeService.count(new LambdaQueryWrapper() diff --git a/src/main/java/com/biutag/supervision/repository/mail/MailResourceService.java b/src/main/java/com/biutag/supervision/repository/mail/MailResourceService.java index 50eb19b..4dad089 100644 --- a/src/main/java/com/biutag/supervision/repository/mail/MailResourceService.java +++ b/src/main/java/com/biutag/supervision/repository/mail/MailResourceService.java @@ -60,9 +60,11 @@ public class MailResourceService extends BaseDAO { queryWrapper.in(CollectionUtil.isNotEmpty(param.getSecondDeptIds()), Mail::getSecondDeptId, param.getSecondDeptIds()); queryWrapper.eq(StrUtil.isNotBlank(param.getThreeDeptId()), Mail::getThreeDeptId, param.getThreeDeptId()); queryWrapper.in(CollectionUtil.isNotEmpty(param.getThreeDeptIds()), Mail::getThreeDeptId, param.getThreeDeptIds()); - queryWrapper.between(CollectionUtil.isNotEmpty(param.getCreateTime()), Mail::getCreateTime, param.getCreateTime().get(0), param.getCreateTime().get(1)); - if (queryWrapper.getExpression() == null || queryWrapper.getExpression().getSqlSegment().isEmpty()) { - return 0L; + if (CollectionUtil.isNotEmpty(param.getCreateTime()) && param.getCreateTime().size() >= 2) { + queryWrapper.between(Mail::getCreateTime, param.getCreateTime().get(0), param.getCreateTime().get(1)); + } + if (CollectionUtil.isNotEmpty(param.getMailTime()) && param.getMailTime().size() >= 2) { + queryWrapper.between(Mail::getCreateTime, param.getMailTime().get(0), param.getMailTime().get(1)); } return mailMapper.selectCount(queryWrapper); } diff --git a/src/main/java/com/biutag/supervision/service/datav/DatavServiceImpl.java b/src/main/java/com/biutag/supervision/service/datav/DatavServiceImpl.java index fbd2a61..0110d9c 100644 --- a/src/main/java/com/biutag/supervision/service/datav/DatavServiceImpl.java +++ b/src/main/java/com/biutag/supervision/service/datav/DatavServiceImpl.java @@ -269,10 +269,16 @@ public class DatavServiceImpl implements DatavService { .map(list -> list.get(0)) .orElseThrow(() -> new RuntimeException("未查询到" + departDto.getParentName() + "的外部部门信息")); - MailQueryParam mailQueryParam = new MailQueryParam(); - mailQueryParam.setSecondDeptId(depart.getExternalId()); - mailQueryParam.setCreateTime(dates); - long mailCount = mailResourceService.count(mailQueryParam); +// MailQueryParam mailQueryParam = new MailQueryParam(); +// mailQueryParam.setSecondDeptId(depart.getExternalId()); +// mailQueryParam.setMailTime(dates); +// long mailCount = mailResourceService.count(mailQueryParam); + + QueryWrapper mailQueryWrapper = new QueryWrapper<>(); + mailQueryWrapper.ne("mail_state", VALID_SIGN); + mailQueryWrapper.between("mail_time", request.getBeginTime(), request.getEndTime()); + mailQueryWrapper.in("second_dept_id", depart.getExternalId()); + long mailCount = mailMapper.selectCount(mailQueryWrapper); globalMapIconVo.setSupervisionPro(supervisionProCount); globalMapIconVo.setNumSupervisionPro(numSupervisionProCount); @@ -369,9 +375,10 @@ public class DatavServiceImpl implements DatavService { ajhcQueryParam.setCreateTime(dates); long ajhcCount = dataCaseVerifResourceService.count(ajhcQueryParam); // 局长信箱 - MailQueryParam mailQueryParam = new MailQueryParam(); - mailQueryParam.setMailTime(dates); - long jzxxCount = mailResourceService.count(mailQueryParam); + QueryWrapper mailQueryWrapper = new QueryWrapper<>(); + mailQueryWrapper.ne("mail_state", VALID_SIGN); + mailQueryWrapper.between("mail_time", request.getBeginTime(), request.getEndTime()); + long jzxxCount = mailMapper.selectCount(mailQueryWrapper); // 12337 NegativeQueryParam xf12337Param = new NegativeQueryParam(); diff --git a/src/main/java/com/biutag/supervision/service/subDatav/SubDatavServiceImpl.java b/src/main/java/com/biutag/supervision/service/subDatav/SubDatavServiceImpl.java index eeda396..e4b58e3 100644 --- a/src/main/java/com/biutag/supervision/service/subDatav/SubDatavServiceImpl.java +++ b/src/main/java/com/biutag/supervision/service/subDatav/SubDatavServiceImpl.java @@ -127,7 +127,7 @@ public class SubDatavServiceImpl implements SubDatavService { MailQueryParam mailQueryParam = new MailQueryParam(); mailQueryParam.setSecondDeptIds(supExternalDepartIdSet); - mailQueryParam.setCreateTime(dates); + mailQueryParam.setMailTime(dates); long mailCount = mailResourceService.count(mailQueryParam); // 12337