Merge branch 'baotou-signup' of e.coding.net:tsteam/btsaqscksfwpt/system-examination-signup into baotou-signup

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

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);

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>