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/4] =?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/4] =?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; } From 82620ebe6c43dc6662138c6bb898c28aee76a03d Mon Sep 17 00:00:00 2001 From: Renpc-kilig <308442850@qq.com> Date: Sat, 15 May 2021 17:15:29 +0800 Subject: [PATCH 3/4] =?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/IExamCheckService.java | 10 ++++++++++ .../examcheck/impl/ExamCheckServiceImpl.java | 16 +++++++++++++++- .../mapper/examcheck/exam-check-mapper.xml | 3 +++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/src/main/java/cn/com/tenlion/service/examcheck/IExamCheckService.java b/src/main/java/cn/com/tenlion/service/examcheck/IExamCheckService.java index b980bd3..e83afe2 100644 --- a/src/main/java/cn/com/tenlion/service/examcheck/IExamCheckService.java +++ b/src/main/java/cn/com/tenlion/service/examcheck/IExamCheckService.java @@ -209,6 +209,16 @@ public interface IExamCheckService { */ Boolean getExamCheck(String workTypeId, String orgId); + /** + * 开办申请记录查询 + * 通过返回true + * 不存在、待审核、退回返回false + * @param workTypeId + * @param orgId + * @return + */ + Boolean getPlanExamCheck(String workTypeId, String orgId, String classPlanId); + /** * 开办申请记录查询 * 不存在、待审核、退回返回true 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 eb7c9d2..7e11d6c 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 @@ -115,10 +115,11 @@ public class ExamCheckServiceImpl extends DefaultBaseService implements IExamChe setAppUpdateInfo(token, params); } examCheckDao.update(params); + ExamCheckDTO examCheckDTO = get(examCheckId); // 开班计划审核通过以后，调用机构接口，删除机构相关信息 if(2 == examCheckVO.getCheckStatus()) { try { - applyStudentsService.saveCopeApply(examCheckVO.getOrgId(), examCheckVO.getWorkTypeId(), examCheckVO.getPlanId()); + applyStudentsService.saveCopeApply(examCheckDTO.getOrgId(), examCheckDTO.getWorkTypeId(), examCheckDTO.getPlanId()); }catch (Exception e) { e.printStackTrace(); } @@ -246,6 +247,19 @@ public class ExamCheckServiceImpl extends DefaultBaseService implements IExamChe return true; } + @Override + public Boolean getPlanExamCheck(String workTypeId, String orgId, String classPlanId) { + Map params = new HashMap<>(1); + params.put("workTypeId", workTypeId); + params.put("orgId", orgId); + params.put("classPlanId", classPlanId); + ExamCheckDTO examCheckDTO = examCheckDao.getExamCheck(params); + if(null == examCheckDTO) { + return false; + } + return true; + } + @Override public Boolean getExamCheckFailOrBack(String workTypeId, String orgId) { Map params = new HashMap<>(1); 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 12452fe..65432d3 100644 --- a/src/main/resources/mybatis/mapper/examcheck/exam-check-mapper.xml +++ b/src/main/resources/mybatis/mapper/examcheck/exam-check-mapper.xml @@ -388,6 +388,9 @@ AND t1.org_id = #{orgId} + + AND t1.plan_id = #{classPlanId} + \ No newline at end of file From b8b32bd6b3fe253c025097239c3536308a6eaf6a Mon Sep 17 00:00:00 2001 From: Renpc-kilig <308442850@qq.com> Date: Sat, 15 May 2021 17:21:54 +0800 Subject: [PATCH 4/4] =?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 --- .../mapper/examcheck/exam-check-mapper.xml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 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 65432d3..b77da81 100644 --- a/src/main/resources/mybatis/mapper/examcheck/exam-check-mapper.xml +++ b/src/main/resources/mybatis/mapper/examcheck/exam-check-mapper.xml @@ -153,13 +153,17 @@ WHERE t1.is_delete = 0 - AND - t1.exam_check_id = #{examCheckId} + AND t1.exam_check_id = #{examCheckId} + + + AND t1.work_type_id = #{workTypeId} + + + AND t1.org_id = #{orgId} + + + AND t1.plan_id = #{planId} - - AND - t1.plan_id = #{planId} -