From 21a1d0243c3980a9b96f8f31353a0df2387fe0fb Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Thu, 25 Jul 2024 11:18:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mappers/basis/ExperimentalMapper.xml      | 41 ++++++++++++-------
 .../mappers/basis/OriginalRecordMapper.xml    |  2 +-
 2 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/src/main/resources/mappers/basis/ExperimentalMapper.xml b/src/main/resources/mappers/basis/ExperimentalMapper.xml
index 9843c1e..a28a7ce 100644
--- a/src/main/resources/mappers/basis/ExperimentalMapper.xml
+++ b/src/main/resources/mappers/basis/ExperimentalMapper.xml
@@ -297,22 +297,33 @@
         <if test="devTypeCode != null and devTypeCode!=''">
             AND INSTR(tsd.sampleDevCode,#{devTypeCode})
         </if>
-        <if test="roleCode != 'administrators'">
-          /*试验班组成员-待试验/待提交/审阅不通过展示/审核不通过展示/审批不通过展示*/
-            <if test="roleCode == 'experimentalTeamMember' and teamId != null">
-                AND ts.team_id = #{teamId} AND (
-                (ts.process_status IS NULL AND audti_status = 0) OR
-                (ts.process_status = 1 AND audti_status = 0) OR
-                (ts.process_status = 1 AND audti_status = 2) OR
-                (ts.process_status = 2 AND audti_status = 2) OR
-                (ts.process_status = 3 AND audti_status = 2)
-                )
-            </if>
-            <if test="(roleCode != 'experimentalTeamMember') or (roleCode == 'experimentalTeamMember' and teamId == null)">
-                AND ts.team_id = -1
-            </if>
+        /*试验班组成员-待试验/待提交/审阅不通过/审核不通过/审批不通过*/
+        <if test="roleCode == 'experimentalTeamMember' and teamId != null">
+            AND ts.team_id = #{teamId} AND (
+            (ts.process_status IS NULL AND audti_status = 0) OR
+            (ts.process_status = 0 AND audti_status = 0) OR
+            (ts.process_status = 1 AND audti_status = 2) OR
+            (ts.process_status = 2 AND audti_status = 2) OR
+            (ts.process_status = 3 AND audti_status = 2)
+            )
         </if>
-        ORDER BY FIELD(audtiStatus, '审阅不通过','审核不通过','审批不通过','待试验','待提交','待审阅','待审核','待审批','试验结束') ASC,dispatch_time ASC
+        <if test="roleCode == 'administrators'">
+            AND (
+            (ts.process_status IS NULL AND audti_status = 0) OR
+            (ts.process_status = 0 AND audti_status = 0) OR
+            (ts.process_status = 1 AND audti_status = 2) OR
+            (ts.process_status = 2 AND audti_status = 2) OR
+            (ts.process_status = 3 AND audti_status = 2)
+            )
+        </if>
+          /*不是试验班组-成员或者管理员，无权限查看数据*/
+        <if test="roleCode != 'experimentalTeamMember' and roleCode != 'administrators'">
+            AND ts.team_id = -1
+        </if>
+        <if test="roleCode == 'experimentalTeamMember' and teamId == null">
+            AND ts.team_id = -1
+        </if>
+        ORDER BY FIELD(audtiStatus, '审阅不通过','审核不通过','审批不通过','待试验','待提交','待审阅','待审核','待审批','试验完成') ASC,ts.sample_date DESC
     </select>
     <!--试验详情列表-->
     <select id="getDetailList" resultType="com.bonus.aqgqj.basis.entity.vo.ExperimentalDetailVo">
diff --git a/src/main/resources/mappers/basis/OriginalRecordMapper.xml b/src/main/resources/mappers/basis/OriginalRecordMapper.xml
index f342696..5bc37bb 100644
--- a/src/main/resources/mappers/basis/OriginalRecordMapper.xml
+++ b/src/main/resources/mappers/basis/OriginalRecordMapper.xml
@@ -127,6 +127,6 @@
             (ts.process_status = 4 AND audti_status = 1)
             )
         </if>
-        ORDER BY FIELD(audtiStatus, '审阅不通过','审核不通过','审批不通过','待试验','待提交','待审阅','待审核','待审批','试验结束') ASC,dispatch_time ASC
+        ORDER BY FIELD(audtiStatus, '审阅不通过','审核不通过','审批不通过','待试验','待提交','待审阅','待审核','待审批','试验结束') ASC,ts.sample_date DESC
     </select>
 </mapper>