Merge branch '2021-04-28' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ReplacementInstrumentActivityServiceImpl.java

@@ -558,8 +558,6 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
     public void resultSync(){
         //获取所有问卷结果
         List<ReplacementInstrumentActivity> activities = replacementInstrumentActivityDao.findAll(new HashMap<>());
-        //获取所有问题
-        List<QuestionnaireQuestion> questionList = questionnaireQuestionDao.findByTopicId(1);
         List<QuestionnaireUserResult> questionnaireUserResultList = new ArrayList<>();
         for (ReplacementInstrumentActivity activity : activities) {
             String questionResult = activity.getQuestionResult();
@@ -567,6 +565,8 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
                 continue;
             }
             String[] split = questionResult.split("");
+            //获取所有问题
+            List<QuestionnaireQuestion> questionList = questionnaireQuestionDao.findByTopicId(activity.getTopicId());
             for (int i = 0; i < split.length; i++) {
                 QuestionnaireUserResult result = new QuestionnaireUserResult();
                 QuestionnaireQuestion question = questionList.get(i);

mec-biz/src/main/resources/config/mybatis/QuestionnaireUserResultMapper.xml

@@ -146,7 +146,7 @@
 		LEFT JOIN questionnaire_user_result qu1 ON qur.id_ = qu1.user_id_
 		LEFT JOIN questionnaire_question qq ON qq.id_ = qu1.questionnaire_question_id_
 		LEFT JOIN questionnaire_question_item qqi ON FIND_IN_SET(qqi.id_,qu1.questionnaire_question_item_id_list_)
-		GROUP BY qq.id_
+		GROUP BY qu1.user_id_,qq.id_
 		ORDER BY qu1.user_id_
 	</select>
 </mapper>