From d894162748d1c23d965890fd4262486afdce8661 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Fri, 26 Jul 2024 10:39:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aqgqj/basis/dao/OriginalRecordMapper.java |  2 +-
 .../basis/entity/vo/ExperimentalDetailVo.java |  1 -
 .../resources/mappers/basis/ExamineMapper.xml | 22 ++++---------------
 .../mappers/basis/OriginalRecordMapper.xml    |  2 +-
 4 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/bonus/aqgqj/basis/dao/OriginalRecordMapper.java b/src/main/java/com/bonus/aqgqj/basis/dao/OriginalRecordMapper.java
index f6cc67b..59c8b52 100644
--- a/src/main/java/com/bonus/aqgqj/basis/dao/OriginalRecordMapper.java
+++ b/src/main/java/com/bonus/aqgqj/basis/dao/OriginalRecordMapper.java
@@ -20,7 +20,7 @@ import java.util.Map;
 public interface OriginalRecordMapper {
 
     /**
-     * 原始记录列表
+     * 审查记录列表
      *
      * @param dto
      * @return List<ExperimentalVo>
diff --git a/src/main/java/com/bonus/aqgqj/basis/entity/vo/ExperimentalDetailVo.java b/src/main/java/com/bonus/aqgqj/basis/entity/vo/ExperimentalDetailVo.java
index 16d9bcb..266b630 100644
--- a/src/main/java/com/bonus/aqgqj/basis/entity/vo/ExperimentalDetailVo.java
+++ b/src/main/java/com/bonus/aqgqj/basis/entity/vo/ExperimentalDetailVo.java
@@ -36,7 +36,6 @@ public class ExperimentalDetailVo {
     /**
      * 规格型号
      */
-    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private String devModule;
 
     /**
diff --git a/src/main/resources/mappers/basis/ExamineMapper.xml b/src/main/resources/mappers/basis/ExamineMapper.xml
index 1abd5e0..6de865a 100644
--- a/src/main/resources/mappers/basis/ExamineMapper.xml
+++ b/src/main/resources/mappers/basis/ExamineMapper.xml
@@ -29,24 +29,10 @@
         DATE_FORMAT(ts.sample_date, '%Y-%m-%d') AS sampleDate,
         tt.team_name AS teamName,
         ts.process_status AS status,
-        <if test="roleCode == 'experimentalTeamLeader'">
-            CASE WHEN process_status = 1 AND audti_status = 0 THEN '待审阅'
-            END AS audtiStatus,
-        </if>
-        <if test="roleCode == 'technicalDirector'">
-            CASE WHEN process_status = 2 AND audti_status = 0 THEN '待审核'
-            END AS audtiStatus,
-        </if>
-        <if test="roleCode=='centerManager'">
-            CASE WHEN process_status = 3 AND audti_status = 0 THEN '待审批'
-            END AS audtiStatus,
-        </if>
-        <if test="roleCode == 'administrators'">
-            CASE WHEN process_status = 1 AND audti_status = 0 THEN '待审阅'
-            WHEN process_status = 2 AND audti_status = 0 THEN '待审核'
-            WHEN process_status = 3 AND audti_status = 0 THEN '待审批'
-            END AS audtiStatus,
-        </if>
+        CASE WHEN process_status = 1 AND audti_status = 0 THEN '待审阅'
+        WHEN process_status = 2 AND audti_status = 0 THEN '待审核'
+        WHEN process_status = 3 AND audti_status = 0 THEN '待审批'
+        END AS audtiStatus,
         ts.remarks
         FROM tb_sample ts
         LEFT JOIN tb_custom tc ON ts.custom_id = tc.id
diff --git a/src/main/resources/mappers/basis/OriginalRecordMapper.xml b/src/main/resources/mappers/basis/OriginalRecordMapper.xml
index 8ba18f4..e0ceb06 100644
--- a/src/main/resources/mappers/basis/OriginalRecordMapper.xml
+++ b/src/main/resources/mappers/basis/OriginalRecordMapper.xml
@@ -3,7 +3,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bonus.aqgqj.basis.dao.OriginalRecordMapper">
 
-    <!--原始记录列表-->
+    <!--审查记录列表-->
     <select id="getList" resultType="com.bonus.aqgqj.basis.entity.vo.ExperimentalVo">
         SELECT ts.id,
         tc.custom_name AS customName,