Merge branch 'main' of http://10.10.14.176:3000/huanghai/ccDangJianExam

src/main/java/com/dsideal/FengHuang/Exam/Controller/ExamController.java

@@ -2,6 +2,7 @@ package com.dsideal.FengHuang.Exam.Controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.dsideal.FengHuang.Exam.Model.ExamModel;
+import com.dsideal.FengHuang.Interceptor.EmptyInterface;
 import com.dsideal.FengHuang.Interceptor.IsNumericInterface;
 import com.dsideal.FengHuang.Util.CommonUtil;
 import com.dsideal.FengHuang.Util.CookieUtil;
@@ -33,6 +34,7 @@ public class ExamController extends Controller {
      * @param tel
      */
     @Before({POST.class})
+    @EmptyInterface({"person_name","ks","tel"})
     public void addPerson(String person_name, String ks, String tel) {
         Kv kv = em.addPerson(person_name, ks, tel);
         if (kv.getBoolean("success")) {
@@ -76,6 +78,7 @@ public class ExamController extends Controller {
      * @param order_id
      */
     @Before({GET.class})
+    @IsNumericInterface({"order_id","finish"})
     public void getQuestion(int order_id, int finish) {
         String person_id = getCookie("person_id");
         if (finish == 1 && em.HaveJiaoJuan(person_id) <= 0) {
@@ -96,6 +99,8 @@ public class ExamController extends Controller {
      * @param reply
      */
     @Before({POST.class})
+    @EmptyInterface({"reply"})
+    @IsNumericInterface({"order_id"})
     public void save(int order_id, String reply) {
         String person_id = getCookie("person_id");
         int result = em.save(person_id, order_id, reply);
@@ -172,6 +177,7 @@ public class ExamController extends Controller {
      * @param person_id
      */
     @Before({POST.class})
+    @EmptyInterface({"person_id"})
     public void delPerson(String person_id) {
         em.delPerson(person_id);
         Kv kv = Kv.by("success", true);

src/main/resource/ExcelExportTemplate/exam.json

@@ -21,7 +21,7 @@
       "width": 40
     },
     {
-      "show_column_name": "结束时间",
+      "show_column_name": "交卷时间",
       "list_column_name": "end_time",
       "width": 40
     }