不满意信件申诉状态筛选实现

mailbox-lan/src/main/java/com/biutag/lan/domain/bo/MailQuery.java

@@ -43,6 +43,11 @@ public class MailQuery {
      */
     private String mailLabels;
 
+    /**
+     * 申诉状态
+     */
+    private String appealState;
+
     public List<String> handleMailLabels() {
         if (mailLabels == null) {
             return null;

mailbox-lan/src/main/java/com/biutag/lan/domain/vo/QueryMailVo.java

@@ -124,4 +124,8 @@ public class QueryMailVo {
      * 当前处理步骤
      */
     private String step;
+    /**
+     * 当前操作人
+     */
+    private String currentOperator;
 }

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

@@ -405,13 +405,6 @@ public class WorkService extends ServiceImpl<WorkMapper, Work> {
                 }
                 workVo.setMailLabels(labelNamesStr.substring(0, labelNamesStr.length() - 1));
             }
-            try {
-                String handlingEmpNo = workMapper.selectList(new QueryWrapper<Work>().eq("mail_id", workVo.getId()).orderByDesc("update_time"))
-                        .get(0).getPoliceEmpNo();
-                workVo.setHandlingDeptName(policeUserMapper.selectList(new QueryWrapper<PoliceUser>().eq("emp_no", handlingEmpNo)).get(0).getDeptName());
-            } catch (Exception e) {
-                workVo.setHandlingDeptName("无");
-            }
         }
         return result;
     }
@@ -472,6 +465,12 @@ public class WorkService extends ServiceImpl<WorkMapper, Work> {
                                         .or().eq("m.verify_feedback", "不满意"))
                                 .or().apply("m.id = ma.mail_id")
                 );
+        if (StrUtil.isNotBlank(mailQuery.getAppealState())) {
+            if (mailQuery.getAppealState().equals("0"))
+                queryWrapper.nested(q -> q.eq("ma.appeal_state", "0").or().isNull("ma.appeal_state"));
+            else
+                queryWrapper.eq("ma.appeal_state", mailQuery.getAppealState());
+        }
         mailCategorySearch(mailQuery, queryWrapper);
         deptSearch(mailQuery, queryWrapper);
         roleCheck(queryWrapper);

mailbox-lan/src/main/resources/mapper/WorkMapper.xml

@@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectQueryPage" resultType="com.biutag.lan.domain.vo.QueryMailVo">
         select distinct m.contact_name,m.contact_phone,m.contact_id_card,m.contact_sex,m.content,m.source,m.mail_time,m.id,m.mail_state,
-               m.mail_category ,m.mail_level,m.three_dept_id,m.three_dept_name,m.flow_key,m.flow_before_name,m.mail_labels,m.flow_name,
+               m.mail_category ,m.mail_level,m.three_dept_id,m.three_dept_name,m.flow_key,m.flow_before_name,m.mail_labels,m.flow_name,m.current_operator,
                f.limited_time - ROUND(EXTRACT(EPOCH FROM (CURRENT_TIMESTAMP - m.flow_limited_last_handler_time))) flow_limited_remaining_time
         from mail m
             left join work w on m.id = w.mail_id
@@ -57,6 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectDissatisfiedPage" resultType="com.biutag.lan.domain.vo.QueryMailVo">
         select distinct m.contact_name,m.contact_phone,m.contact_id_card,m.contact_sex,m.content,m.source,m.mail_time,m.id,m.mail_state,
                         m.mail_category ,m.mail_level,m.three_dept_id,m.three_dept_name,m.flow_key,m.flow_before_name,m.mail_labels,m.flow_name,
+                        m.current_operator,
                         ma.appeal_state,ma.handling_dept,ma.step,
                         f.limited_time - ROUND(EXTRACT(EPOCH FROM (CURRENT_TIMESTAMP - m.flow_limited_last_handler_time))) flow_limited_remaining_time
         from mail m