deason 1 рік тому
батько
коміт
dd3aa9d781

+ 7 - 4
examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/core/questions/api/controller/PaperController.java

@@ -274,8 +274,9 @@ public class PaperController extends ControllerSupport {
     @ApiOperation(value = "查询所有导入试卷(not in paperIds)", notes = "查询所有导入试卷(not in paperIds)")
     @GetMapping(value = "/genPaper/huoge/{curPage}/{pageSize}")
     public ResponseEntity<Object> getGenPapersNotInIds(@ModelAttribute PaperSearchInfo paperSearchInfo,
-                                                       @RequestParam String ids, @PathVariable int curPage, 
-                                                       @PathVariable int pageSize) {
+            @RequestParam(required = false) String ids,
+            @PathVariable int curPage,
+            @PathVariable int pageSize) {
     	User user = getAccessUser();
     	UserDataRule ud = getUserDataRule(DataRuleType.COURSE);
         paperSearchInfo.setOrgId(user.getRootOrgId().toString());
@@ -624,8 +625,10 @@ public class PaperController extends ControllerSupport {
     @ResponseBody
     @ApiOperation(value = "查询所有导入试卷(not in paperIds)", notes = "查询所有导入试卷(not in paperIds)")
     @GetMapping(value = "/importPaper/huoge/{curPage}/{pageSize}")
-    public ResponseEntity<Object> getImportPapersNotInIds(@ModelAttribute PaperSearchInfo paperSearchInfo, @RequestParam String ids, @PathVariable int curPage,
-                                                          @PathVariable int pageSize) {
+    public ResponseEntity<Object> getImportPapersNotInIds(@ModelAttribute PaperSearchInfo paperSearchInfo,
+            @RequestParam(required = false) String ids,
+            @PathVariable int curPage,
+            @PathVariable int pageSize) {
     	User user = getAccessUser();
     	UserDataRule ud = getUserDataRule(DataRuleType.COURSE);
         paperSearchInfo.setOrgId(user.getRootOrgId().toString());

+ 2 - 2
examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/impl/QuesServiceImpl.java

@@ -813,7 +813,7 @@ public class QuesServiceImpl implements QuesService {
                         || QuesStructType.MULTIPLE_ANSWER_QUESTION == subQuestion.getQuestionType()) {
                     List<String> values = QuestionAnswerConvert
                             .parseQuestionOptionAnswerList(subQuestion.getQuesOptions());
-                    // 选择题 - 转换为新答案格式
+                    // 选择题 - todo 转换为新答案格式(多个答案时逗号分隔)
                     answers.add(StringUtils.join(values, ""));
                 } else {
                     List<String> values = QuestionAnswerConvert.parseQuestionAnswerList(subQuestion);
@@ -824,7 +824,7 @@ public class QuesServiceImpl implements QuesService {
             if (QuesStructType.SINGLE_ANSWER_QUESTION == question.getQuestionType()
                     || QuesStructType.MULTIPLE_ANSWER_QUESTION == question.getQuestionType()) {
                 List<String> values = QuestionAnswerConvert.parseQuestionOptionAnswerList(question.getQuesOptions());
-                // 选择题 - 转换为新答案格式
+                // 选择题 - todo 转换为新答案格式(多个答案时逗号分隔)
                 answers.add(StringUtils.join(values, ""));
             } else {
                 List<String> values = QuestionAnswerConvert.parseQuestionAnswerList(question);