From 01a9d190e31eaf09d13e222a8ee1a08951c44639 Mon Sep 17 00:00:00 2001
From: 21819 <tomorasd@foxmail.com>
Date: Fri, 8 Mar 2024 18:42:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8D=E6=BB=A1=E6=84=8F?=
 =?UTF-8?q?=E4=BF=A1=E4=BB=B6=E7=AB=8B=E5=8D=B3=E5=A4=84=E7=90=86=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=98=BE=E7=A4=BA=E4=B8=8E=E6=9D=83=E9=99=90=E7=BB=91?=
 =?UTF-8?q?=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/biutag/lan/domain/vo/QueryMailVo.java   |  8 ++++++++
 .../com/biutag/lan/service/WorkService.java     | 17 +++++++++++++++++
 .../src/main/resources/mapper/WorkMapper.xml    |  2 +-
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/mailbox-lan/src/main/java/com/biutag/lan/domain/vo/QueryMailVo.java b/mailbox-lan/src/main/java/com/biutag/lan/domain/vo/QueryMailVo.java
index 144ceed..e3f13bd 100644
--- a/mailbox-lan/src/main/java/com/biutag/lan/domain/vo/QueryMailVo.java
+++ b/mailbox-lan/src/main/java/com/biutag/lan/domain/vo/QueryMailVo.java
@@ -116,4 +116,12 @@ public class QueryMailVo {
      * 现在登陆的部门
      */
     private Integer nowDeptId;
+    /**
+     * 是否显示立即处理按钮
+     */
+    private Integer ifHandle;
+    /**
+     * 当前处理步骤
+     */
+    private String step;
 }
diff --git a/mailbox-lan/src/main/java/com/biutag/lan/service/WorkService.java b/mailbox-lan/src/main/java/com/biutag/lan/service/WorkService.java
index ef699f9..7da1b70 100644
--- a/mailbox-lan/src/main/java/com/biutag/lan/service/WorkService.java
+++ b/mailbox-lan/src/main/java/com/biutag/lan/service/WorkService.java
@@ -479,6 +479,23 @@ public class WorkService extends ServiceImpl<WorkMapper, Work> {
         Page<QueryMailVo> result = baseMapper.selectDissatisfiedPage(page, queryWrapper);
         for (QueryMailVo workVo : result.getRecords()) {
             workVo.setNowDeptId(AdminThreadLocal.getDeptId());
+            workVo.setIfHandle(0);
+            //如果step为null则赋值”0“
+            if (workVo.getStep() == null) {
+                workVo.setStep("0");
+            }
+            switch (workVo.getStep()) {
+                case "1":
+                    if (AdminThreadLocal.getRoleId().equals(2)) {
+                        workVo.setIfHandle(1);
+                    }
+                    break;
+                case "2":
+                    if (AdminThreadLocal.getRoleId().equals(1)) {
+                        workVo.setIfHandle(1);
+                    }
+                    break;
+            }
         }
         return result;
     }
diff --git a/mailbox-lan/src/main/resources/mapper/WorkMapper.xml b/mailbox-lan/src/main/resources/mapper/WorkMapper.xml
index d2d27c1..8074494 100644
--- a/mailbox-lan/src/main/resources/mapper/WorkMapper.xml
+++ b/mailbox-lan/src/main/resources/mapper/WorkMapper.xml
@@ -57,7 +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,
-                        ma.appeal_state,ma.handling_dept,
+                        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
                  left join mail_appeal ma on ma.mail_id = m.id