审查

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>

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;
 
     /**

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

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,