From 6ae23a9e947a157630ab3c4e14a83c15f04ebdbb Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Tue, 30 Jul 2024 20:23:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=B5=81=E7=A8=8B=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=BE=85=E9=87=8D=E6=96=B0=E5=AE=A1=E9=98=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mappers/basis/ExamineMapper.xml      | 2 +-
 src/main/resources/mappers/basis/ExperimentalMapper.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mappers/basis/ExamineMapper.xml b/src/main/resources/mappers/basis/ExamineMapper.xml
index efdaf83..1778071 100644
--- a/src/main/resources/mappers/basis/ExamineMapper.xml
+++ b/src/main/resources/mappers/basis/ExamineMapper.xml
@@ -133,7 +133,7 @@
             </if>
             GROUP BY tsd.dev_type_code
         ) a
-        ORDER BY FIELD(a.status, '审阅不通过','审核不通过','审批不通过','待提交','待审阅','待重新审阅','待审核','待审批','试验完成') ASC,a.testTime DESC
+        ORDER BY FIELD(a.status, '审阅不通过','审核不通过','审批不通过','待提交','待审阅','待重新审阅','待审核','待审批','试验完成'),a.testTime DESC
     </select>
     <!--查询试验设备数量-->
     <select id="getExperDevItemsNum" resultType="java.util.Map">
diff --git a/src/main/resources/mappers/basis/ExperimentalMapper.xml b/src/main/resources/mappers/basis/ExperimentalMapper.xml
index 87b502a..35646e7 100644
--- a/src/main/resources/mappers/basis/ExperimentalMapper.xml
+++ b/src/main/resources/mappers/basis/ExperimentalMapper.xml
@@ -262,8 +262,8 @@
                tt.team_name AS teamName,
                CASE WHEN ts.process_status IS NULL THEN '待试验'
                     WHEN ts.process_status = 0 AND ts.audti_status = 0 THEN '待提交'
-                    WHEN ts.process_status = 1 AND ts.audti_status = 0 THEN '待审阅'
-                    WHEN ts.process_status = 1 AND ts.audti_status = 0 THEN '待重新审阅'
+                    WHEN ts.process_status = 1 AND ts.audti_status = 0 AND ts.is_er IS NULL THEN '待审阅'
+                    WHEN ts.process_status = 1 AND ts.audti_status = 0 AND ts.is_er = '1' THEN '待重新审阅'
                     WHEN ts.process_status = 1 AND ts.audti_status = 2 THEN '审阅不通过'
                     WHEN ts.process_status = 2 AND ts.audti_status = 0 THEN '待审核'
                     WHEN ts.process_status = 2 AND ts.audti_status = 2 THEN '审核不通过'