diff --git a/src/main/resources/mappers/basis/ExamineMapper.xml b/src/main/resources/mappers/basis/ExamineMapper.xml index 01948cd..4a189a0 100644 --- a/src/main/resources/mappers/basis/ExamineMapper.xml +++ b/src/main/resources/mappers/basis/ExamineMapper.xml @@ -76,7 +76,7 @@ AND ts.team_id = -1 /*班组长-审阅*/ - + AND process_status = 1 AND audti_status = 0 /*技术负责人-审核*/ diff --git a/src/main/resources/mappers/basis/ExperimentalMapper.xml b/src/main/resources/mappers/basis/ExperimentalMapper.xml index 5e3a913..9843c1e 100644 --- a/src/main/resources/mappers/basis/ExperimentalMapper.xml +++ b/src/main/resources/mappers/basis/ExperimentalMapper.xml @@ -298,8 +298,15 @@ AND INSTR(tsd.sampleDevCode,#{devTypeCode}) + /*试验班组成员-待试验/待提交/审阅不通过展示/审核不通过展示/审批不通过展示*/ - AND ts.team_id = #{teamId} + 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 = 1 AND audti_status = 2) OR + (ts.process_status = 2 AND audti_status = 2) OR + (ts.process_status = 3 AND audti_status = 2) + ) AND ts.team_id = -1