修改信件查询部分终止类的查询逻辑

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

@@ -357,9 +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.getFlowKey())) {
             List<String> flowKeyList = StrUtil.split(mailQuery.getFlowKey(), ',', true, true);