张延森 3 years ago
parent
commit
9b284bb2dd

+ 1
- 0
.gitignore View File

39
 /deploy/*.zip
39
 /deploy/*.zip
40
 /deploy/.fun/
40
 /deploy/.fun/
41
 /deploy/.env
41
 /deploy/.env
42
+/deploy/.s/
42
 
43
 
43
 cert/
44
 cert/

+ 26
- 23
src/main/java/com/yunzhi/training/controller/TaSignClassController.java View File

74
 
74
 
75
         iTaSignClassService.removeBySign(signId);
75
         iTaSignClassService.removeBySign(signId);
76
 
76
 
77
-        List<TaSignClass> updateList = new ArrayList<>();
78
-        List<TaSignClass> saveList = new ArrayList<>();
79
-
80
-        for (TaSignClass signClass : signClassList) {
81
-            signClass.setSignId(signId);
82
-            if (null == signClass.getSerialNo()) {
83
-                saveList.add(signClass);
84
-            } else {
85
-                updateList.add(signClass);
86
-            }
87
-        }
88
-
89
-        if (saveList.size() > 0) {
90
-            if (!iTaSignClassService.saveBatch(saveList)) {
91
-                return ResponseBean.error("操作失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
92
-            }
93
-        }
94
-
95
-        if (updateList.size() > 0) {
96
-            if (!iTaSignClassService.updateBatchById(updateList)) {
97
-                return ResponseBean.error("操作失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
98
-            }
77
+//        List<TaSignClass> updateList = new ArrayList<>();
78
+//        List<TaSignClass> saveList = new ArrayList<>();
79
+//
80
+//        for (TaSignClass signClass : signClassList) {
81
+//            signClass.setSignId(signId);
82
+//            if (null == signClass.getSerialNo()) {
83
+//                saveList.add(signClass);
84
+//            } else {
85
+//                updateList.add(signClass);
86
+//            }
87
+//        }
88
+//
89
+//        if (saveList.size() > 0) {
90
+//            if (!iTaSignClassService.saveBatch(saveList)) {
91
+//                return ResponseBean.error("操作失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
92
+//            }
93
+//        }
94
+//
95
+//        if (updateList.size() > 0) {
96
+//            if (!iTaSignClassService.updateBatchById(updateList)) {
97
+//                return ResponseBean.error("操作失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
98
+//            }
99
+//        }
100
+        if (!iTaSignClassService.saveBatch(signClassList)) {
101
+            return ResponseBean.error("操作失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
99
         }
102
         }
100
 
103
 
101
-        return ResponseBean.success("success");
104
+        return ResponseBean.success(signClassList);
102
     }
105
     }
103
 
106
 
104
     /**
107
     /**

+ 2
- 1
src/main/java/com/yunzhi/training/service/impl/TaQuePersonServiceImpl.java View File

69
             }
69
             }
70
 
70
 
71
             String answerOptStr = questionPerson.getAnswerOpt();
71
             String answerOptStr = questionPerson.getAnswerOpt();
72
-            if (StringUtils.isEmpty(answerOptStr)) {
72
+            String answerText = questionPerson.getAnswerText();
73
+            if (StringUtils.isEmpty(answerOptStr) && StringUtils.isEmpty(answerText)) {
73
                 throw new Exception("存在未作答的题目");
74
                 throw new Exception("存在未作答的题目");
74
             }
75
             }
75
 
76