剔除专班共享账号; 信件查询已终止查询调整

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

@@ -357,27 +357,27 @@ public class WorkService extends ServiceImpl<WorkMapper, Work> {
                 .le(StrUtil.isNotBlank(mailQuery.getMailTimeStartEnd()), "TO_CHAR(m.mail_time, 'YYYY-MM-DD')", mailQuery.getMailTimeStartEnd())
                 .eq(StrUtil.isNotBlank(mailQuery.getSource()), "m.source", mailQuery.getSource())
                 .eq(StrUtil.isNotBlank(mailQuery.getMailLevel()), "m.mail_level", mailQuery.getMailLevel())
-//                .eq(StrUtil.isNotBlank(mailQuery.getMailState()), "m.mail_state", mailQuery.getMailState())
+                .eq(StrUtil.isNotBlank(mailQuery.getMailState()), "m.mail_state", mailQuery.getMailState())
                 .eq(Objects.nonNull(mailQuery.getSignRoleId()), "w.sign_role_id", mailQuery.getSignRoleId())
                 .eq(Objects.nonNull(mailQuery.getSignDeptId()), "w.sign_dept_id", mailQuery.getSignDeptId());
 
         //剔除终止操作的信件类别方便统计
-        if (StrUtil.isNotBlank(mailQuery.getMailState())) {
-            switch (mailQuery.getMailState()) {
-                case "terminated":
-                    queryWrapper.nested(i -> i.eq("m.mail_first_category", "终止类")
-                            .or().eq("m.mail_first_category", "感谢信类")
-                            .or().eq("m.mail_first_category", "无效类"));
-                    break;
-                case "completion":
-                    queryWrapper.ne("m.mail_first_category", "终止类")
-                            .ne("m.mail_first_category", "感谢信类")
-                            .ne("m.mail_first_category", "无效类");
-                    break;
-                default:
-                    queryWrapper.eq("m.mail_state", mailQuery.getMailState());
-            }
-        }
+//        if (StrUtil.isNotBlank(mailQuery.getMailState())) {
+//            switch (mailQuery.getMailState()) {
+//                case "terminated":
+//                    queryWrapper.nested(i -> i.eq("m.mail_first_category", "终止类")
+//                            .or().eq("m.mail_first_category", "感谢信类")
+//                            .or().eq("m.mail_first_category", "无效类"));
+//                    break;
+//                case "completion":
+//                    queryWrapper.ne("m.mail_first_category", "终止类")
+//                            .ne("m.mail_first_category", "感谢信类")
+//                            .ne("m.mail_first_category", "无效类");
+//                    break;
+//                default:
+//                    queryWrapper.eq("m.mail_state", mailQuery.getMailState());
+//            }
+//        }
         if (StrUtil.isNotBlank(mailQuery.getFlowKey())) {
             List<String> flowKeyList = StrUtil.split(mailQuery.getFlowKey(), ',', true, true);
 

mailbox-lan/src/main/java/com/biutag/lan/service/impl/PoliceUserServiceImpl.java

@@ -116,6 +116,7 @@ public class PoliceUserServiceImpl implements IPoliceUserService {
                         "t.post_ids as post,t.role_ids as role,t.dept_ids as dept,t.is_multipoint,t.mobile,t.id_code,t.job,t.job_type," +
                         "t.is_disable,t.last_login_ip,t.last_login_time,t.create_time,t.update_time")
                 .eq("t.is_delete", 0)
+                .apply("t.emp_no !~ '[\\u4e00-\\u9fa5]'")//剔除专班共享账号
                 .orderByDesc(Arrays.asList("t.id", "t.sort"));