From 013766fc04a1d41ca109d67e2f0d827b057c827c Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Wed, 24 Jul 2024 16:12:41 +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/OriginalRecordMapper.xml    | 29 ++++++++++++++-----
 .../static/js/basis/originalRecord.js         |  2 +-
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/mappers/basis/OriginalRecordMapper.xml b/src/main/resources/mappers/basis/OriginalRecordMapper.xml
index 4412cae..2953db7 100644
--- a/src/main/resources/mappers/basis/OriginalRecordMapper.xml
+++ b/src/main/resources/mappers/basis/OriginalRecordMapper.xml
@@ -15,7 +15,14 @@
         DATE_FORMAT(ts.sample_date, '%Y-%m-%d') AS sampleDate,
         tt.team_name AS teamName,
         ts.process_status AS status,
-        <if test="roleCode == 'experimentalTeamMember' or roleCode = 'administrators'">
+        <if test="roleCode == 'experimentalTeamMember'">
+            CASE WHEN ts.process_status = 1 AND ts.audti_status = 0 THEN '待审阅'
+            WHEN ts.process_status = 2 AND ts.audti_status = 0 THEN '待审核'
+            WHEN ts.process_status = 3 AND ts.audti_status = 0 THEN '待审批'
+            WHEN ts.process_status = 4 AND ts.audti_status = 1 THEN '试验完成'
+            END AS audtiStatus,
+        </if>
+        <if test="roleCode == 'experimentalTeamLeader' or roleCode = 'administrators'">
             CASE 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 '审核不通过'
@@ -24,14 +31,11 @@
             WHEN ts.process_status = 4 AND ts.audti_status = 1 THEN '试验完成'
             END AS audtiStatus,
         </if>
-        <if test="roleCode == 'experimentalTeamLeader'">
-            CASE WHEN ts.process_status = 1 AND ts.audti_status = 2 THEN '审阅不通过'
-            WHEN process_status > 1 THEN '待审核'
-            END AS audtiStatus,
-        </if>
         <if test="roleCode == 'technicalDirector'">
             CASE WHEN ts.process_status = 2 AND ts.audti_status = 2 THEN '审核不通过'
-            WHEN process_status > 2 THEN '待审批'
+            WHEN ts.process_status = 3 AND ts.audti_status = 0 THEN '待审批'
+            WHEN ts.process_status = 3 AND ts.audti_status = 2 THEN '审批不通过'
+            WHEN ts.process_status = 4 AND ts.audti_status = 1 THEN '试验完成'
             END AS audtiStatus,
         </if>
         <if test="roleCode=='centerManager'">
@@ -112,6 +116,17 @@
              (ts.process_status = 4 AND audti_status = 1)
             )
         </if>
+        /*管理员-审阅不通过/待审核/审核不通过/待审批/审批不通过/试验完成*/
+        <if test="roleCode == 'administrators'">
+            AND (
+            (ts.process_status = 1 AND audti_status = 2) OR
+            (ts.process_status = 2 AND audti_status = 0) OR
+            (ts.process_status = 2 AND audti_status = 2) OR
+            (ts.process_status = 3 AND audti_status = 0) OR
+            (ts.process_status = 3 AND audti_status = 2) OR
+            (ts.process_status = 4 AND audti_status = 1)
+            )
+        </if>
         ORDER BY FIELD(audtiStatus, '审阅不通过','审核不通过','审批不通过','待试验','待提交','待审阅','待审核','待审批','试验结束') ASC,dispatch_time ASC
     </select>
     <!--原始记录审查详情列表-->
diff --git a/src/main/resources/static/js/basis/originalRecord.js b/src/main/resources/static/js/basis/originalRecord.js
index 035bfd8..1f65acf 100644
--- a/src/main/resources/static/js/basis/originalRecord.js
+++ b/src/main/resources/static/js/basis/originalRecord.js
@@ -20,7 +20,7 @@ layui.use(['form', 'layer', 'table', 'laydate'], function () {
 function pages(pageNum, pageSize, typeNum) {
     let params = getReqParams(pageNum, pageSize, typeNum);
     $.ajax({
-        url: dataUrl + "/examine/getList",
+        url: dataUrl + "/originalRecord/getList",
         headers: {
             "token": tokens
         },