This commit is contained in:
cwchen 2024-07-26 10:39:52 +08:00
parent 360e670728
commit d894162748
4 changed files with 6 additions and 21 deletions

View File

@ -20,7 +20,7 @@ import java.util.Map;
public interface OriginalRecordMapper { public interface OriginalRecordMapper {
/** /**
* 原始记录列表 * 审查记录列表
* *
* @param dto * @param dto
* @return List<ExperimentalVo> * @return List<ExperimentalVo>

View File

@ -36,7 +36,6 @@ public class ExperimentalDetailVo {
/** /**
* 规格型号 * 规格型号
*/ */
@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
private String devModule; private String devModule;
/** /**

View File

@ -29,24 +29,10 @@
DATE_FORMAT(ts.sample_date, '%Y-%m-%d') AS sampleDate, DATE_FORMAT(ts.sample_date, '%Y-%m-%d') AS sampleDate,
tt.team_name AS teamName, tt.team_name AS teamName,
ts.process_status AS status, ts.process_status AS status,
<if test="roleCode == 'experimentalTeamLeader'"> CASE WHEN process_status = 1 AND audti_status = 0 THEN '待审阅'
CASE WHEN process_status = 1 AND audti_status = 0 THEN '待审阅' WHEN process_status = 2 AND audti_status = 0 THEN '待审核'
END AS audtiStatus, WHEN process_status = 3 AND audti_status = 0 THEN '待审批'
</if> END AS audtiStatus,
<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>
ts.remarks ts.remarks
FROM tb_sample ts FROM tb_sample ts
LEFT JOIN tb_custom tc ON ts.custom_id = tc.id LEFT JOIN tb_custom tc ON ts.custom_id = tc.id

View File

@ -3,7 +3,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.aqgqj.basis.dao.OriginalRecordMapper"> <mapper namespace="com.bonus.aqgqj.basis.dao.OriginalRecordMapper">
<!--原始记录列表--> <!--审查记录列表-->
<select id="getList" resultType="com.bonus.aqgqj.basis.entity.vo.ExperimentalVo"> <select id="getList" resultType="com.bonus.aqgqj.basis.entity.vo.ExperimentalVo">
SELECT ts.id, SELECT ts.id,
tc.custom_name AS customName, tc.custom_name AS customName,