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 6b167ef..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(); } @@ -242,10 +243,19 @@ 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; + } + + @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; } @@ -258,10 +268,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..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} - @@ -381,12 +385,16 @@ 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} AND t1.org_id = #{orgId} + + AND t1.plan_id = #{classPlanId} + \ No newline at end of file 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 @@ -