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] =?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<String, Object> 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<String, Object> 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 @@
         <if test="orgId != null and orgId != ''">
             AND t1.org_id = #{orgId}
         </if>
+        <if test="classPlanId != null and classPlanId != ''">
+            AND t1.plan_id = #{classPlanId}
+        </if>
     </select>
 
 </mapper>
\ No newline at end of file