已办和代办信件分类搜素以及信件状态搜索更新

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

@@ -224,13 +224,28 @@ public class WorkService extends ServiceImpl<WorkMapper, Work> {
                 .le(StrUtil.isNotBlank(todoQuery.getMailTimeStartEnd()), "TO_CHAR(m.mail_time, 'YYYY-MM-DD')", todoQuery.getMailTimeStartEnd())
                 .eq(StrUtil.isNotBlank(todoQuery.getSource()), "m.source", todoQuery.getSource())
                 .eq(StrUtil.isNotBlank(todoQuery.getMailLevel()), "m.mail_level", todoQuery.getMailLevel())
-                .eq(StrUtil.isNotBlank(todoQuery.getMailCategory()), "m.mail_category", todoQuery.getMailCategory())
+//                .eq(StrUtil.isNotBlank(todoQuery.getMailCategory()), "m.mail_category", todoQuery.getMailCategory())
+                .eq(StrUtil.isNotBlank(todoQuery.getMailState()), "m.mail_state", todoQuery.getMailState())
                 .like(StrUtil.isNotBlank(todoQuery.getThreeDeptName()), "m.three_dept_name", todoQuery.getThreeDeptName())
                 .eq(StrUtil.isNotBlank(todoQuery.getFlowKey()), "m.flow_key", todoQuery.getFlowKey())
                 .and(query -> {
                     query.isNull("m.flow_key").or().ne("m.flow_key", FlowNodeEnum.COMPLETION.getKey());
                 });
         deptWorkSearch(todoQuery, queryWrapper);
+        if (StrUtil.isNotBlank(todoQuery.getMailCategory())) {
+            MailCategory mailCategory = mailCategoryMapper.selectById(todoQuery.getMailCategory());
+            switch (mailCategory.getLevel()) {
+                case 1:
+                    queryWrapper.eq("m.mail_first_category", mailCategory.getName());
+                    break;
+                case 2:
+                    queryWrapper.eq("m.mail_second_category", mailCategory.getName());
+                    break;
+                case 3:
+                    queryWrapper.eq("m.mail_three_category", mailCategory.getName());
+                    break;
+            }
+        }
 
         Integer roleId = AdminThreadLocal.getRoleId();
         Integer deptId = AdminThreadLocal.getDeptId();