共用标签

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

@@ -145,9 +145,21 @@ public class KmtExerciseQuestionServiceImpl extends BaseServiceImpl<KmtExerciseQ
         if (StringUtils.isNotBlank(request.getPeriodId())){
             List<ExerciseQuetionDto> questions = null;
             if (StringUtil.isNotBlank(request.getQuestionId())){
+                String temp = kmtExerciseMapper.findDifferentExerciseBookId(request.getQuestionId().trim());
                 questions = kmtExerciseMapper.findExerciseQuestionByQuestionId(request.getQuestionId().trim(), page);
+                if (StringUtil.isNotBlank(temp)){
+                    for (ExerciseQuetionDto q : questions){
+                        q.setIsCommonFlag(q.getIsCommonFlag() == 0 ? 1 : 0);
+                    }
+                }
             } else {
+                String temp = kmtExerciseMapper.findDifferentExerciseBookIdByBookId(request.getBookId());
                 questions = kmtExerciseMapperService.findQuestionByBookCourseIdAndUserId(request, page,  userId);
+                if (StringUtil.isNotBlank(temp)){
+                    for (ExerciseQuetionDto q : questions){
+                        q.setIsCommonFlag(q.getIsCommonFlag() == 0 ? 1 : 0);
+                    }
+                }
             }
             kmtExerciseService.appendQuestionDtoDataFromJSONFile(questions);
             list = this.getQuestionGroupList(questions, true);

ssj-kmt-exercise-service/src/main/java/com/ssj/service/kmt/dto/ExerciseQuetionDto.java

@@ -90,6 +90,8 @@ public class ExerciseQuetionDto implements Serializable {
 
     private String questionImage;
 
+    private int isCommonFlag;
+
     @JSONField(serialize = false)
     private String handleUserId;
 
@@ -708,4 +710,12 @@ public class ExerciseQuetionDto implements Serializable {
     public void setOriginAnswer(String originAnswer) {
         this.originAnswer = originAnswer;
     }
+
+    public int getIsCommonFlag() {
+        return isCommonFlag;
+    }
+
+    public void setIsCommonFlag(int isCommonFlag) {
+        this.isCommonFlag = isCommonFlag;
+    }
 }

ssj-mybatis-service-impl/src/main/java/com/ssj/service/mapper/KmtExerciseMapper.java

@@ -1226,4 +1226,11 @@ public interface KmtExerciseMapper {
 
     List<ExerciseQuestionEditDto> findEditExerciseQuestions (@Param("exerciseBookId") String exerciseBookId,
                                     Page page);
+
+    @Select("select eb.id from kmt_exercise_book eb, kmt_exercise_questions eq where eb.book_id=eq.book_id" +
+            " and eq.id=#{questionId} and eb.book_type=3 limit 1")
+    String findDifferentExerciseBookId (@Param("questionId") String questionId);
+
+    @Select("select eb.id from kmt_exercise_book eb where eb.book_id=#{bookId} and eb.book_type=3 limit 1")
+    String findDifferentExerciseBookIdByBookId (@Param("bookId") String bookId);
 }

ssj-mybatis-service-impl/src/main/resources/mybatis/mapper/KmtExerciseMapper.xml

@@ -2013,7 +2013,7 @@
 
     <select id="findExerciseQuestionByQuestionId" resultType="com.ssj.service.kmt.dto.ExerciseQuetionDto">
         select eq.id question_id, eq.course_name, eb.handle_user_id, eb.auditing_user_id, eb.analysis_user_id, eb.analysis_auditer_id, eq.book_course_id course_id,
-        eq.big_question_index, eq.small_question_name small_question_index,
+        eq.big_question_index, eq.small_question_name small_question_index, eq.is_common_flag,
         eq.deal_status question_status, eq.create_time, eq.remark reason, eq.from_user_id, eq.to_user_id,
         eq.question_type question_types, eq.difficulty_level difficulty_levels, eq.real_exam_type real_exam_types,
         eq.training_skill training_skills, eq.parent_id, eq.proofread_status, eq.question_path, eq.num, eq.create_time