Merge branch 'error-branch' into bug-branch

ssj-kmt-exercise-service-impl/src/main/java/com/ssj/service/kmt/kmt/service/impl/KmtExerciseServiceImpl.java

@@ -1629,21 +1629,9 @@ public class KmtExerciseServiceImpl implements KmtExerciseService {
 
             List<ExerciseBookCourseClassDto> list = kmtExerciseMapperService.findClassifyQuestionsByIds(questionErrors.stream().map(question -> question.getQuestionId()).collect(Collectors.toList()));
             if  (list != null){
-                for (ExerciseBookCourseClassDto parentQuetion : list){
-                    for (ExerciseQuetionDto childQuestion : parentQuetion.getList()){
-                        for (KmtExerciseQuestionErrors qe : questionErrors){
-                            if (qe.getQuestionId().equals(childQuestion.getQuestionId())){
-                                childQuestion.setFromUserId(qe.getSetErrorUserId());
-                                childQuestion.setToUserId(qe.getErrorUserId());
-                                childQuestion.appendUserNameByIds(users);
-                                childQuestion.setFromUser(kmtExerciseQuestionService.getAuthorityByType(qe.getSetErrorUserAuth()) + childQuestion.getFromUser());
-                                childQuestion.setToUser(kmtExerciseQuestionService.getAuthorityByType(qe.getErrorUserAuth()) + childQuestion.getToUser());
-                                childQuestion.setReason(qe.getErrorReason());
-                                childQuestion.setErrorReasonImage(qe.getErrorReasonImage());
-                                break;
-                            }
-                        }
-                    }
+                //相同的题在不同的角色下被报错
+                for (KmtExerciseQuestionErrors qe : questionErrors){
+                    appendErrorInfo2QuestionList(list, qe, users);
                 }
                 data.put("list", list);
             }
@@ -1655,6 +1643,33 @@ public class KmtExerciseServiceImpl implements KmtExerciseService {
         return data;
     }
 
+    /**
+     * 合并题目列表和错题列表的信息
+     * @param list
+     * @param qe
+     * @param users
+     */
+    private void appendErrorInfo2QuestionList (List<ExerciseBookCourseClassDto> list, KmtExerciseQuestionErrors qe,
+                                               List<TbLibManager> users){
+        if (list != null && qe != null){
+            for (ExerciseBookCourseClassDto parentQuetion : list){
+                for (ExerciseQuetionDto childQuestion : parentQuetion.getList()){
+                    if (qe.getQuestionId().equals(childQuestion.getQuestionId())
+                    && StringUtil.isBlank(childQuestion.getFromUser()) && StringUtil.isBlank(childQuestion.getToUser())){
+                        childQuestion.setFromUserId(qe.getSetErrorUserId());
+                        childQuestion.setToUserId(qe.getErrorUserId());
+                        childQuestion.appendUserNameByIds(users);
+                        childQuestion.setFromUser(kmtExerciseQuestionService.getAuthorityByType(qe.getSetErrorUserAuth()) + childQuestion.getFromUser());
+                        childQuestion.setToUser(kmtExerciseQuestionService.getAuthorityByType(qe.getErrorUserAuth()) + childQuestion.getToUser());
+                        childQuestion.setReason(qe.getErrorReason());
+                        childQuestion.setErrorReasonImage(qe.getErrorReasonImage());
+                        return;
+                    }
+                }
+            }
+        }
+    }
+
     @Override
     public Map<String, Object> findErrorExerciseBooks (String userId, String bookName){
         List<ExerciseBookEditDto> books = kmtExerciseMapper.findErrorExerciseBooks(bookName, userId);

ssj-mybatis-service-impl/src/main/java/com/ssj/service/kmt/exercise/KmtExerciseMapperServiceImpl.java

@@ -41,6 +41,8 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.math.BigDecimal;
@@ -1069,11 +1071,16 @@ public class KmtExerciseMapperServiceImpl implements KmtExerciseMapperService {
     private List<ExerciseBookDto> sortByBookName (List<ExerciseBookDto> list){
         if (list != null){
             Map<String, List<ExerciseBookDto>> temp = new HashMap<>();
+            List<ExerciseBookDto> tempMapList;
             for (ExerciseBookDto item : list){
                 if (temp.containsKey(item.getName())){
-                    temp.get(item.getName()).add(item);
+                    tempMapList = temp.get(item.getName());
+                    tempMapList.add(item);
+                    temp.put(item.getName(), tempMapList);
                 } else {
-                    temp.put(item.getName(), Collections.singletonList(item));
+                    tempMapList = new ArrayList<>();
+                    tempMapList.add(item);
+                    temp.put(item.getName(), tempMapList);
                 }
             }
             ArrayList tempList = new ArrayList(temp.keySet());
@@ -1479,10 +1486,13 @@ public class KmtExerciseMapperServiceImpl implements KmtExerciseMapperService {
         List<Map> tmpList = exerciseQuestionSearchService.findAllExerciseQuestionsByQuestionIds(questionIds);
         List<ExerciseQuetionDto> temps = this.parseMapToExerciseQuestionList(tmpList);
         List<ExerciseQuetionDto> questions = new ArrayList<>();
+        ExerciseQuetionDto qTmp = null;
         for (String questionId : questionIds){
             for (ExerciseQuetionDto temp : temps){
                 if (questionId.equals(temp.getQuestionId())){
-                    questions.add(temp);
+                    qTmp = new ExerciseQuetionDto();
+                    BeanUtils.copyProperties(temp, qTmp);
+                    questions.add(qTmp);
                     break;
                 }
             }