From 778766a9e741046bbcfc6dca104a5dd98b410dfc Mon Sep 17 00:00:00 2001
From: Renpc-kilig <308442850@qq.com>
Date: Wed, 12 May 2021 15:12:29 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=80=83=E8=AF=95=E7=94=B3=E8=AF=B7bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mybatis/mapper/examapply/exam-apply-mapper.xml    | 2 ++
 1 file changed, 2 insertions(+)

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 8c0b978..3fbf998 100644
--- a/src/main/resources/mybatis/mapper/examapply/exam-apply-mapper.xml
+++ b/src/main/resources/mybatis/mapper/examapply/exam-apply-mapper.xml
@@ -73,6 +73,7 @@
             theory_exam_end_time,
             payment_voucher,
             payment_voucher_num,
+            exam_apply_num,
             status,
             user_status,
             check_status,
@@ -92,6 +93,7 @@
             #{theoryExamEndTime},
             #{paymentVoucher},
             #{paymentVoucherNum},
+            #{examApplyNum},
             #{status},
             #{userStatus},
             #{checkStatus},

From 1927a79fa7a59f821769b45b41554b28be2efa62 Mon Sep 17 00:00:00 2001
From: Renpc-kilig <308442850@qq.com>
Date: Wed, 12 May 2021 15:18:03 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=80=83=E8=AF=95=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=96=B0=E5=A2=9E=E6=8F=90=E4=BA=A4=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/route/examapply/update-check.html  | 65 ++++++++++---------
 1 file changed, 36 insertions(+), 29 deletions(-)

diff --git a/src/main/resources/static/route/examapply/update-check.html b/src/main/resources/static/route/examapply/update-check.html
index ec23f2c..36cad71 100644
--- a/src/main/resources/static/route/examapply/update-check.html
+++ b/src/main/resources/static/route/examapply/update-check.html
@@ -262,39 +262,46 @@
         
         // 提交表单
         form.on('submit(submitForm)', function(formData) {
-            if(3 == formData.field.checkStatus) {
-                if(null == formData.field.reason || '' == formData.field.reason || typeof(formData.field.reason) == "undefined") {
-                    top.dialog.msg('退回原因必填');
-                    return false;
+            layer.confirm('审核一旦通过，将无法进行修改', {
+                btn: ['确定','取消'] //按钮
+            }, function(){
+                if(3 == formData.field.checkStatus) {
+                    if(null == formData.field.reason || '' == formData.field.reason || typeof(formData.field.reason) == "undefined") {
+                        top.dialog.msg('退回原因必填');
+                        return false;
+                    }
                 }
-            }
-            formData.field.examId = classPlanId;
-            formData.field.planName = $('#planName').val();
-            formData.field.planPersonNum = $('#planPersonNum').val();
-            top.dialog.confirm(top.dataMessage.commit, function(index) {
-                top.dialog.close(index);
-                var loadLayerIndex;
-                top.restAjax.put(top.restAjax.path('api/examapply/update/{examApplyId}', [examApplyId]), formData.field, null, function(code, data) {
-                    var layerIndex = top.dialog.msg(top.dataMessage.updateSuccess, {
-                        time: 0,
-                        btn: [top.dataMessage.button.yes, top.dataMessage.button.no],
-                        shade: 0.3,
-                        yes: function(index) {
-                            top.dialog.close(index);
-                            window.location.reload();
-                        },
-                        btn2: function() {
-                            closeBox();
-                        }
+                formData.field.examId = classPlanId;
+                formData.field.planName = $('#planName').val();
+                formData.field.planPersonNum = $('#planPersonNum').val();
+                top.dialog.confirm(top.dataMessage.commit, function(index) {
+                    top.dialog.close(index);
+                    var loadLayerIndex;
+                    top.restAjax.put(top.restAjax.path('api/examapply/update/{examApplyId}', [examApplyId]), formData.field, null, function(code, data) {
+                        var layerIndex = top.dialog.msg(top.dataMessage.updateSuccess, {
+                            time: 0,
+                            btn: [top.dataMessage.button.yes, top.dataMessage.button.no],
+                            shade: 0.3,
+                            yes: function(index) {
+                                top.dialog.close(index);
+                                window.location.reload();
+                            },
+                            btn2: function() {
+                                closeBox();
+                            }
+                        });
+                    }, function(code, data) {
+                        top.dialog.msg(data.msg);
+                    }, function() {
+                        loadLayerIndex = top.dialog.msg(top.dataMessage.committing, {icon: 16, time: 0, shade: 0.3});
+                    }, function() {
+                        top.dialog.close(loadLayerIndex);
                     });
-                }, function(code, data) {
-                    top.dialog.msg(data.msg);
-                }, function() {
-                    loadLayerIndex = top.dialog.msg(top.dataMessage.committing, {icon: 16, time: 0, shade: 0.3});
-                }, function() {
-                    top.dialog.close(loadLayerIndex);
                 });
+            }, function(){
+                return false;
             });
+
             return false;
         });