fix--调整局长信箱查询

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<Negative>()

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 (CollectionUtil.isNotEmpty(param.getCreateTime()) && param.getCreateTime().size() >= 2) {
-        if (queryWrapper.getExpression() == null || queryWrapper.getExpression().getSqlSegment().isEmpty()) {
+            queryWrapper.between(Mail::getCreateTime, param.getCreateTime().get(0), param.getCreateTime().get(1));
-            return 0L;
+        }
+        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);
     }

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 mailQueryParam = new MailQueryParam();
-            mailQueryParam.setSecondDeptId(depart.getExternalId());
+//            mailQueryParam.setSecondDeptId(depart.getExternalId());
-            mailQueryParam.setCreateTime(dates);
+//            mailQueryParam.setMailTime(dates);
-            long mailCount = mailResourceService.count(mailQueryParam);
+//            long mailCount = mailResourceService.count(mailQueryParam);
+
+            QueryWrapper<Mail> 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();
+        QueryWrapper<Mail> mailQueryWrapper = new QueryWrapper<>();
-        mailQueryParam.setMailTime(dates);
+        mailQueryWrapper.ne("mail_state", VALID_SIGN);
-        long jzxxCount = mailResourceService.count(mailQueryParam);
+        mailQueryWrapper.between("mail_time", request.getBeginTime(), request.getEndTime());
+        long jzxxCount = mailMapper.selectCount(mailQueryWrapper);
 
         // 12337
         NegativeQueryParam xf12337Param = new NegativeQueryParam();

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