diff --git a/src/main/java/cn/com/tenlion/service/examapply/IExamApplyService.java b/src/main/java/cn/com/tenlion/service/examapply/IExamApplyService.java index 9822057..35d1d89 100644 --- a/src/main/java/cn/com/tenlion/service/examapply/IExamApplyService.java +++ b/src/main/java/cn/com/tenlion/service/examapply/IExamApplyService.java @@ -193,5 +193,4 @@ public interface IExamApplyService { * @return */ Integer count(Map params); - } \ No newline at end of file diff --git a/src/main/java/cn/com/tenlion/service/examapply/impl/ExamApplyServiceImpl.java b/src/main/java/cn/com/tenlion/service/examapply/impl/ExamApplyServiceImpl.java index 0fa3184..cb7ad09 100644 --- a/src/main/java/cn/com/tenlion/service/examapply/impl/ExamApplyServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/examapply/impl/ExamApplyServiceImpl.java @@ -139,7 +139,7 @@ public class ExamApplyServiceImpl extends DefaultBaseService implements IExamApp } examApplyDao.update(params); // 如果受理通过，则新增一条考场分配数据 - if(1 == examApplyVO.getCheckStatus()) { + if(!StringUtils.isBlank(examApplyVO.getCertificateOffice())) { // 申请考场信息开始 DistributionSaveVO dstributionSaveVO = new DistributionSaveVO(); dstributionSaveVO.setPlanId(examApplyVO.getExamId()); diff --git a/src/main/resources/mybatis/mapper/examapply/exam-apply-mapper.xml b/src/main/resources/mybatis/mapper/examapply/exam-apply-mapper.xml index 0996a0a..eaf5b22 100644 --- a/src/main/resources/mybatis/mapper/examapply/exam-apply-mapper.xml +++ b/src/main/resources/mybatis/mapper/examapply/exam-apply-mapper.xml @@ -312,6 +312,9 @@ management_exam_apply t1 WHERE t1.is_delete = 0 + + AND t1.check_status = #{checkStatus} + AND ( diff --git a/src/main/resources/static/route/examapply/list-check.html b/src/main/resources/static/route/examapply/list-check.html new file mode 100644 index 0000000..f8cf955 --- /dev/null +++ b/src/main/resources/static/route/examapply/list-check.html @@ -0,0 +1,361 @@ + + + + + + + + + + + + + +
+
+
+
+
+
+
+ +
+
+ +
+
+ +
+ +
+
+ + +
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/src/main/resources/static/route/examapply/list.html b/src/main/resources/static/route/examapply/list.html index 4ccde8f..f74638a 100644 --- a/src/main/resources/static/route/examapply/list.html +++ b/src/main/resources/static/route/examapply/list.html @@ -35,7 +35,7 @@ @@ -59,7 +59,7 @@ var laydate = layui.laydate; var common = layui.common; var resizeTimeout = null; - var tableUrl = 'api/examapply/listpage'; + var tableUrl = 'api/examapply/listpage?checkStatus=1'; // 初始化表格 function initTable() { @@ -159,6 +159,54 @@ return rowData; } }, + {field: 'checkStatus', width: 150, title: '审批状态', align:'center', + templet: function(row) { + var rowData = row[this.field]; + if(typeof(rowData) === 'undefined' || rowData === null || rowData === '') { + return '-'; + } + if(rowData == '0') { + rowData = '待审批'; + } + if(rowData == '1') { + rowData = '审批通过'; + } + if(rowData == '2') { + rowData = '审批驳回'; + } + return rowData; + } + }, + {field: 'status', width: 150, title: '考场分配状态', align:'center', + templet: function(row) { + var rowData = row[this.field]; + if(typeof(rowData) === 'undefined' || rowData === null || rowData === '') { + return '-'; + } + if(rowData == '0') { + rowData = '未分配'; + } + if(rowData == '1') { + rowData = '已分配'; + } + return rowData; + } + }, + {field: 'userStatus', width: 150, title: '监考老师分配状态', align:'center', + templet: function(row) { + var rowData = row[this.field]; + if(typeof(rowData) === 'undefined' || rowData === null || rowData === '') { + return '-'; + } + if(rowData == '0') { + rowData = '未分配'; + } + if(rowData == '1') { + rowData = '已分配'; + } + return rowData; + } + }, {field: 'certificateOffice', width: 180, title: '发证机关', align:'center', templet: function(row) { var rowData = row[this.field]; @@ -230,36 +278,6 @@ return rowData; } }, - {field: 'status', width: 150, title: '审批状态', align:'center', - templet: function(row) { - var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; - } - if(rowData == '0') { - rowData = '待审批'; - } - if(rowData == '1') { - rowData = '已审批'; - } - return rowData; - } - }, - {field: 'userStatus', width: 150, title: '监考老师分配状态', align:'center', - templet: function(row) { - var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; - } - if(rowData == '0') { - rowData = '未分配'; - } - if(rowData == '1') { - rowData = '已分配'; - } - return rowData; - } - }, {field: 'selOther', fixed: 'right', width: 150, title: '查看剩余监考老师', align:'center', templet: function(row) { var status = row['status']; diff --git a/src/main/resources/static/route/examapply/update-check.html b/src/main/resources/static/route/examapply/update-check.html new file mode 100644 index 0000000..e41e737 --- /dev/null +++ b/src/main/resources/static/route/examapply/update-check.html @@ -0,0 +1,311 @@ + + + + + + + + + + + + + + +
+
+
+ + 上级列表/ + 编辑内容 + +
+
+
+ 考试申请基本信息 +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ 审核信息 +
+
+
+ +
+ + +
+
+ +
+
+
+ + +
+
+
+
+
+
+
+ + + + + + + \ No newline at end of file diff --git a/src/main/resources/static/route/examapply/update.html b/src/main/resources/static/route/examapply/update.html index b00fdae..08ec50a 100644 --- a/src/main/resources/static/route/examapply/update.html +++ b/src/main/resources/static/route/examapply/update.html @@ -95,13 +95,13 @@
- +
- +
@@ -193,19 +193,6 @@
-
- -
- - -
-
-
@@ -239,15 +226,6 @@ var wangEditorObj = {}; var viewerObj = {}; - form.on('radio(checkStatus)', function (data) { - var val = data.value; - if (2 == val) { - $('#reasonDiv').show(); - } else { - $('#reasonDiv').hide(); - } - }); - // 初始化实操考试地点下拉选择 function initPracticeExamAddressIdSelect(selectValue) { top.restAjax.get(top.restAjax.path('api/institution/list?institutionType=考点信息', []), {}, null, function(code, data, args) { @@ -527,12 +505,6 @@ // 提交表单 form.on('submit(submitForm)', function(formData) { - if(2 == formData.field.checkStatus) { - if(null == formData.field.reason || '' == formData.field.reason || typeof(formData.field.reason) == "undefined") { - top.dialog.msg('退回原因必填'); - return false; - } - } var theoryExamStartTime = new Date($('#theoryExamEndTime').val()).getTime(); var theoryExamEndTime = new Date($('#theoryExamStartTime').val()).getTime(); if(theoryExamEndTime >= theoryExamStartTime) {