Merge remote-tracking branch 'origin/baotou-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();
             }
@@ -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 true;
-                return false;
+    }
-            }
+
+    @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;
     }
@@ -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;
     }

src/main/resources/mybatis/mapper/examcheck/exam-check-mapper.xml

@@ -153,13 +153,17 @@
         WHERE
             t1.is_delete = 0
             <if test="examCheckId != null and examCheckId != ''">
-        AND
+                AND t1.exam_check_id = #{examCheckId}
-            t1.exam_check_id = #{examCheckId}
+            </if>
+            <if test="workTypeId != null and workTypeId != ''">
+                AND t1.work_type_id = #{workTypeId}
+            </if>
+            <if test="orgId != null and orgId != ''">
+                AND t1.org_id = #{orgId}
+            </if>
+            <if test="planId != null and planId != ''">
+                AND t1.plan_id = #{planId}
             </if>
-        <if test="planId != null and planId != ''">
-        AND
-        t1.plan_id = #{planId}
-        </if>
     </select>
 
     <!-- 详情 -->
@@ -381,12 +385,16 @@
         management_exam_check t1
         WHERE
         t1.is_delete = 0
+        AND (t1.check_status = 0 OR t1.check_status = 3)
         <if test="workTypeId != null and workTypeId != ''">
             AND t1.work_type_id = #{workTypeId}
         </if>
         <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>

src/main/resources/static/route/examapply/list-check.html

@@ -37,7 +37,7 @@
                             <button type="button" class="layui-btn layui-btn-normal layui-btn-sm" lay-event="updateEvent">
                                 <i class="fa fa-lg fa-edit"></i> 考试申请审核
                             </button>
-                            <button type="button" class="layui-btn layui-btn-normal layui-btn-sm" lay-event="checkMore">
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="checkMore">
                                 <i class="fa fa-lg fa-edit"></i> 考试申请批量审核
                             </button>
                         </div>

src/main/resources/static/route/examcheck/list.html

@@ -37,7 +37,7 @@
                             <button type="button" class="layui-btn layui-btn-normal layui-btn-sm" lay-event="updateEvent">
                                 <i class="fa fa-lg fa-edit"></i> 开班计划审核
                             </button>
-                            <button type="button" class="layui-btn layui-btn-normal layui-btn-sm" lay-event="checkMore">
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="checkMore">
                                 <i class="fa fa-lg fa-edit"></i> 开班计划批量审核
                             </button>
                         </div>