|
|
@@ -105,7 +105,7 @@
|
|
|
<!-- 查询待加工审核的题目 -->
|
|
|
<select id="findQuestionByBookCourseIdAndUserId" 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
|
|
|
@@ -559,6 +559,7 @@
|
|
|
</otherwise>
|
|
|
</choose>
|
|
|
</if>
|
|
|
+ order by CONVERT(eb.book_name USING gbk)
|
|
|
</select>
|
|
|
|
|
|
<!--查询未分配加工人练习册-->
|
|
|
@@ -589,6 +590,7 @@
|
|
|
</otherwise>
|
|
|
</choose>
|
|
|
</if>
|
|
|
+ order by CONVERT(eb.book_name USING gbk)
|
|
|
</select>
|
|
|
|
|
|
<!--查询未分配审核练习册-->
|
|
|
@@ -615,6 +617,7 @@
|
|
|
</otherwise>
|
|
|
</choose>
|
|
|
</if>
|
|
|
+ order by CONVERT(eb.book_name USING gbk)
|
|
|
</select>
|
|
|
|
|
|
<!--查询未审核解析的练习册-->
|
|
|
@@ -632,6 +635,7 @@
|
|
|
</otherwise>
|
|
|
</choose>
|
|
|
</if>
|
|
|
+ order by CONVERT(eb.book_name USING gbk)
|
|
|
</select>
|
|
|
|
|
|
<select id="findUnCorrectAnswerBooks" resultType="com.ssj.service.kmt.dto.ExerciseBookDto">
|
|
|
@@ -648,6 +652,7 @@
|
|
|
</otherwise>
|
|
|
</choose>
|
|
|
</if>
|
|
|
+ order by CONVERT(eb.book_name USING gbk)
|
|
|
</select>
|
|
|
|
|
|
<select id="findCorrectedAnswerBooks" resultType="com.ssj.service.kmt.dto.ExerciseBookDto">
|
|
|
@@ -664,6 +669,7 @@
|
|
|
</otherwise>
|
|
|
</choose>
|
|
|
</if>
|
|
|
+ order by CONVERT(eb.book_name USING gbk)
|
|
|
</select>
|
|
|
|
|
|
<!--查询未校对的练习册-->
|
|
|
@@ -691,6 +697,7 @@
|
|
|
</otherwise>
|
|
|
</choose>
|
|
|
</if>
|
|
|
+ order by CONVERT(eb.book_name USING gbk)
|
|
|
</select>
|
|
|
|
|
|
<!--查询待加工审核的练习册单元 -->
|
|
|
@@ -2006,6 +2013,7 @@
|
|
|
eb.semester, eb.book_type,eb.ai_rollback_import aiRollbackImport
|
|
|
from kmt_exercise_book eb, kmt_exercise_questions eq
|
|
|
where eb.id=eq.exercise_book_id and eq.id=#{questionId} and eb.part_flag != 3
|
|
|
+ order by CONVERT(eb.book_name USING gbk)
|
|
|
</select>
|
|
|
<select id="findExerciseBookCourseByQuestionId" resultType="com.ssj.service.kmt.dto.exercise.ExerciseUnitBookcourseDto">
|
|
|
select ebc.unit_id id, ebc.unit name, ebc.id book_course_id, ebc.period book_course, ebc.period_sort from kmt_exercise_book_course ebc
|
|
|
@@ -2053,6 +2061,7 @@
|
|
|
</if>
|
|
|
</otherwise>
|
|
|
</choose>
|
|
|
+ order by CONVERT(eb.book_name USING gbk)
|
|
|
</select>
|
|
|
|
|
|
<select id="findEditExerciseQuestions" resultType="com.ssj.service.kmt.dto.exercise.ExerciseQuestionEditDto">
|
|
|
@@ -2078,5 +2087,6 @@
|
|
|
<if test="bookName != null and bookName != ''">
|
|
|
and eb.book_name like concat('%',#{bookName},'%')
|
|
|
</if>
|
|
|
+ order by CONVERT(eb.book_name USING gbk)
|
|
|
</select>
|
|
|
</mapper>
|
chen