From dc7cbebff8ee8792b59e2902674d5ad5220192b0 Mon Sep 17 00:00:00 2001 From: Renpc-kilig <308442850@qq.com> Date: Sat, 15 May 2021 16:49:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mybatis/mapper/examcheck/exam-check-mapper.xml | 1 + src/main/resources/static/route/examapply/list-check.html | 2 +- src/main/resources/static/route/examcheck/list.html | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) 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 @@ - From c05deab5188678cd290f42b9650335b70b00ebd5 Mon Sep 17 00:00:00 2001 From: Renpc-kilig <308442850@qq.com> Date: Sat, 15 May 2021 16:51:55 +0800 Subject: [PATCH 2/2] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/examcheck/impl/ExamCheckServiceImpl.java | 8 -------- 1 file changed, 8 deletions(-) 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; }