批量上传接口

jkt-admin/src/main/java/com/miaxis/app/controller/question/QuestionCollectionController.java

@@ -107,10 +107,12 @@ public class QuestionCollectionController extends BaseController {
         QuestionCollectionListDTO dto = new QuestionCollectionListDTO();
         dto.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
         List<QuestionCollection> dblist = questionCollectionService.selectQuestionCollectionList(dto);
-        List<Long> questionIds = dblist.stream().map(o -> o.getQuestionId()).collect(Collectors.toList());
+        List<String> questionIds = dblist.stream().map(o -> (o.getQuestionId()+","+o.getKm())).collect(Collectors.toList());
+
+
         List<QuestionCollection> qlist = new ArrayList<QuestionCollection>();
         for (QuestionCollectionDTO questionCollectionDTO : list) {
-            if (questionIds.contains(questionCollectionDTO.getQuestionId())) {
+            if (questionIds.contains(questionCollectionDTO.getQuestionId()+","+questionCollectionDTO.getKm())) {
                 continue;
             }
             QuestionCollection questionCollection = new QuestionCollection();

jkt-admin/src/main/java/com/miaxis/app/controller/question/QuestionWrongController.java

@@ -109,10 +109,10 @@ public class QuestionWrongController extends BaseController{
         QuestionWrongListDTO dto = new QuestionWrongListDTO();
         dto.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
         List<QuestionWrong> dblist = questionWrongService.selectQuestionWrongList(dto);
-        List<Long> questionIds = dblist.stream().map(o -> o.getQuestionId()).collect(Collectors.toList());
+        List<String> questionIds = dblist.stream().map(o -> o.getQuestionId()+","+o.getKm()).collect(Collectors.toList());
         List<QuestionWrong> qlist = new ArrayList<QuestionWrong>();
         for (QuestionWrongDTO questionWrongDTO : list) {
-            if (questionIds.contains(questionWrongDTO.getQuestionId())) {
+            if (questionIds.contains(questionWrongDTO.getQuestionId()+","+questionWrongDTO.getKm())) {
                 continue;
             }
             QuestionWrong questionWrong = new QuestionWrong();