diff --git a/src/main/java/cn/com/tenlion/service/examcheck/impl/ExamCheckServiceImpl.java b/src/main/java/cn/com/tenlion/service/examcheck/impl/ExamCheckServiceImpl.java index 6b167ef..eb7c9d2 100644 --- a/src/main/java/cn/com/tenlion/service/examcheck/impl/ExamCheckServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/examcheck/impl/ExamCheckServiceImpl.java @@ -242,10 +242,6 @@ public class ExamCheckServiceImpl extends DefaultBaseService implements IExamChe ExamCheckDTO examCheckDTO = examCheckDao.getExamCheck(params); if(null == examCheckDTO) { return false; - }else { - if(0 == examCheckDTO.getCheckStatus() || 3 == examCheckDTO.getCheckStatus()) { - return false; - } } return true; } @@ -258,10 +254,6 @@ public class ExamCheckServiceImpl extends DefaultBaseService implements IExamChe ExamCheckDTO examCheckDTO = examCheckDao.getExamCheck(params); if(null == examCheckDTO) { return true; - }else { - if(0 == examCheckDTO.getCheckStatus() || 3 == examCheckDTO.getCheckStatus()) { - return true; - } } return false; } diff --git a/src/main/resources/mybatis/mapper/examcheck/exam-check-mapper.xml b/src/main/resources/mybatis/mapper/examcheck/exam-check-mapper.xml index 77d65c9..12452fe 100644 --- a/src/main/resources/mybatis/mapper/examcheck/exam-check-mapper.xml +++ b/src/main/resources/mybatis/mapper/examcheck/exam-check-mapper.xml @@ -381,6 +381,7 @@ management_exam_check t1 WHERE t1.is_delete = 0 + AND (t1.check_status = 0 OR t1.check_status = 3) AND t1.work_type_id = #{workTypeId} diff --git a/src/main/resources/static/route/examapply/list-check.html b/src/main/resources/static/route/examapply/list-check.html index 58bb762..d015166 100644 --- a/src/main/resources/static/route/examapply/list-check.html +++ b/src/main/resources/static/route/examapply/list-check.html @@ -37,7 +37,7 @@ - diff --git a/src/main/resources/static/route/examcheck/list.html b/src/main/resources/static/route/examcheck/list.html index 3bb77b5..7a79101 100644 --- a/src/main/resources/static/route/examcheck/list.html +++ b/src/main/resources/static/route/examcheck/list.html @@ -37,7 +37,7 @@ -