开班计划审核

考试申请审核

src/main/java/cn/com/tenlion/service/examcheck/IExamCheckService.java

@@ -201,9 +201,20 @@ public interface IExamCheckService {
 
     /**
      * 开办申请记录查询
+     * 通过返回true
+     * 不存在、待审核、退回返回false
      * @param workTypeId
      * @param orgId
      * @return
      */
     Boolean getExamCheck(String workTypeId, String orgId);
+
+    /**
+     * 开办申请记录查询
+     * 不存在、待审核、退回返回true
+     * @param workTypeId
+     * @param orgId
+     * @return
+     */
+    Boolean getExamCheckFailOrBack(String workTypeId, String orgId);
 }

src/main/java/cn/com/tenlion/service/examcheck/impl/ExamCheckServiceImpl.java

@@ -242,10 +242,30 @@ 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 getExamCheckFailOrBack(String workTypeId, String orgId) {
+        Map<String, Object> params = new HashMap<>(1);
+        params.put("workTypeId", workTypeId);
+        params.put("orgId", orgId);
+        ExamCheckDTO examCheckDTO = examCheckDao.getExamCheck(params);
+        if(null != examCheckDTO) {
+            return true;
+        }else {
+            if(0 == examCheckDTO.getCheckStatus() || 3 == examCheckDTO.getCheckStatus()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     /**
      * 开班计划统计
      * checkStatus == 2 通过率

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

@@ -156,6 +156,10 @@
         AND
             t1.exam_check_id = #{examCheckId}
             </if>
+        <if test="planId != null and planId != ''">
+        AND
+        t1.plan_id = #{planId}
+        </if>
     </select>
 
     <!-- 详情 -->
@@ -377,7 +381,6 @@
         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>

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

@@ -172,6 +172,8 @@
         var $win = $(window);
         var table = layui.table;
         var admin = layui.admin;
+        var layer = layui.layer;
+        var laytpl = layui.laytpl;
         var laydate = layui.laydate;
         var common = layui.common;
         var resizeTimeout = null;
@@ -301,6 +303,20 @@
                                 }
                                 return rowData;
                             }
+                        },
+                        {field: 'status', width: 180, title: '查看考场信息', align:'center',
+                            templet: function(row) {
+                                var rowData = row[this.field];
+                                if(typeof(rowData) === 'undefined' || rowData === null || rowData === '') {
+                                    return '-';
+                                }
+                                if(rowData != '1') {
+                                    rowData = '<a class="layui-btn layui-btn-warm layui-btn-xs">暂无考场信息</a>';
+                                }else {
+                                    rowData = '<a class="layui-btn layui-btn-xs" lay-event="addressShow">查看考场信息</a>';
+                                }
+                                return rowData;
+                            }
                         }
                     ]
                 ],
@@ -361,6 +377,7 @@
             });
         }
 
+        // 考场信息分配
         function sentExamMsg(planIds) {
             layer.open({
                 type: 2,
@@ -503,6 +520,21 @@
             });
         }
 
+        function addressShow(data) {
+            layer.open({
+                type: 2,
+                title: false,
+                closeBtn: 0,
+                area: ['100%', '100%'],
+                shadeClose: true,
+                anim: 2,
+                content: top.restAjax.path('route/examination/distribution/show.html?planId={planId}', [data.examId]),
+                end: function() {
+                    reloadTable();
+                }
+            });
+        }
+
         //监听行单击事件
         table.on('tool(dataTable)', function(obj){
             var data = obj.data;
@@ -512,6 +544,8 @@
             }else if('selOther' == obj.event) {
                 // 查看剩余监考老师
                 selOther(data);
+            }else if('addressShow' == obj.event) {
+                addressShow(data)
             }
         });
     });

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

@@ -178,7 +178,6 @@
         var common = layui.common;
         var resizeTimeout = null;
         var tableUrl = 'api/examcheck/listpage';
-        var aaa = '1111'
 
         // 初始化表格
         function initTable() {
@@ -233,15 +232,6 @@
                                 return rowData;
                             }
                         },
-                        {field: 'planPersonNum', width: 180, title: '计划人数', align:'center',
-                            templet: function(row) {
-                                var rowData = row.classPlanDTO[this.field];
-                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
-                                    return '-';
-                                }
-                                return rowData;
-                            }
-                        },
                         {field: 'planStartTime', width: 180, title: '计划开始时间', align:'center',
                             templet: function(row) {
                                 var rowData = row.classPlanDTO[this.field];

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

@@ -49,12 +49,6 @@
                         <input type="text" id="orgName" name="orgName" class="layui-input" value="" placeholder="请输入考试机构"  maxlength="255" readonly>
                     </div>
                 </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label">计划人数</label>
-                    <div class="layui-input-block">
-                        <input type="number" id="planPersonNum" name="planPersonNum" class="layui-input" value="" placeholder="请输入计划人数"  maxlength="255" readonly>
-                    </div>
-                </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label" style="width: 120px;">计划开始时间</label>
                     <div class="layui-input-block" style="margin-left: 120px;">