提交一波

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

@@ -72,13 +72,13 @@ public class QuestionCollectionController extends BaseController {
 
         List<QuestionCollection> qlist = new ArrayList<QuestionCollection>();
         for (QuestionColYunDTO colDTO : col.getCols()) {
-            if (questionIdsStr.contains(colDTO.getQuestionId()+","+col.getKm())) {
+            if (questionIdsStr.contains(colDTO.getId()+","+col.getKm())) {
                 continue;
             }
             QuestionCollection questionCollection = new QuestionCollection();
             questionCollection.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
             questionCollection.setKm(col.getKm());
-            questionCollection.setQuestionId(colDTO.getQuestionId());
+            questionCollection.setQuestionId(colDTO.getId());
             Date crDate = new Date(colDTO.getTimestamp());
             questionCollection.setCreateTime(crDate);
             qlist.add(questionCollection);
@@ -107,7 +107,7 @@ public class QuestionCollectionController extends BaseController {
             QuestionCollection questionCollection = new QuestionCollection();
             questionCollection.setUserId(userId);
             questionCollection.setKm(col.getKm());
-            questionCollection.setQuestionId(colDTO.getQuestionId());
+            questionCollection.setQuestionId(colDTO.getId());
             Date crDate = new Date(colDTO.getTimestamp());
             questionCollection.setCreateTime(crDate);
             qlist.add(questionCollection);

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

@@ -69,13 +69,13 @@ public class QuestionWrongController extends BaseController {
 
         List<QuestionWrong> qlist = new ArrayList<QuestionWrong>();
         for (QuestionWgYunDTO wgYunDTO : wrong.getWrongs()) {
-            if (questionIdsStr.contains(wgYunDTO.getQuestionId() + "," + wrong.getKm())) {
+            if (questionIdsStr.contains(wgYunDTO.getId() + "," + wrong.getKm())) {
                 continue;
             }
             QuestionWrong questionWrong = new QuestionWrong();
             questionWrong.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
             questionWrong.setKm(wrong.getKm());
-            questionWrong.setQuestionId(wgYunDTO.getQuestionId());
+            questionWrong.setQuestionId(wgYunDTO.getId());
             Date crDate = new Date(wgYunDTO.getTimestamp() * 1000);
             questionWrong.setCreateTime(crDate);
             qlist.add(questionWrong);
@@ -104,7 +104,7 @@ public class QuestionWrongController extends BaseController {
             QuestionWrong questionWrong = new QuestionWrong();
             questionWrong.setUserId(userId);
             questionWrong.setKm(wrong.getKm());
-            questionWrong.setQuestionId(wgYunDTO.getQuestionId());
+            questionWrong.setQuestionId(wgYunDTO.getId());
             Date crDate = new Date(wgYunDTO.getTimestamp());
             questionWrong.setCreateTime(crDate);
             qlist.add(questionWrong);