haozq
/
ah_sz_gqj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

审核

This commit is contained in:
cwchen 2024-07-25 11:18:46 +08:00
parent 70990463f9
commit 21a1d0243c
2 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/resources/mappers/basis/ExperimentalMapper.xml
View File

@ -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 = 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') or (roleCode == 'experimentalTeamMember' and teamId == null)">
<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,dispatch_time ASC
ORDER BY FIELD(audtiStatus, '审阅不通过','审核不通过','审批不通过','待试验','待提交','待审阅','待审核','待审批','试验完成') ASC,ts.sample_date DESC
</select>
<!--试验详情列表-->
<select id="getDetailList" resultType="com.bonus.aqgqj.basis.entity.vo.ExperimentalDetailVo">

2
src/main/resources/mappers/basis/OriginalRecordMapper.xml
View File

@ -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>