3.3.1 update

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ConditionServiceImpl.java

@@ -100,7 +100,7 @@ public class ConditionServiceImpl implements ConditionService {
         // 入库审核（41）
         else if ("41".equals(privilegeIdString)) {
             return conditionMapper.listCourseForAudit(semesterId, examId, enable);
-        }// 入库审核（42）
+        }// 卷库查询（42）
         else if ("42".equals(privilegeIdString)) {
             return conditionMapper.listCourseForQuery(examId, dpr);
         }
@@ -117,7 +117,9 @@ public class ConditionServiceImpl implements ConditionService {
             }
             dpr = basicRoleDataPermissionService.findDataPermission(privilegeId);
             return conditionMapper.listCourseForScore(semesterId, examId, basicCourses, MarkPaperStatus.FINISH.name(), dpr);
-        } else if ("491".equals(privilegeIdString)) {
+        }
+        // 评卷入口
+        else if ("491".equals(privilegeIdString)) {
             return conditionMapper.listCourseForEntrance(examId, sysUser.getId(), MarkPaperStatus.FORMAL.name());
         }
         // 评卷设置（897）、评卷管理（917）、成绩检查（946）

distributed-print-business/src/main/resources/mapper/ConditionMapper.xml

@@ -87,7 +87,7 @@
     </select>
     <select id="listCourseForApply" resultType="com.qmth.teachcloud.common.entity.BasicCourse">
         SELECT
-            et.course_code code,
+            distinct et.course_code code,
             et.course_name name
         FROM
             exam_task et
@@ -100,7 +100,6 @@
                 and et.user_id = #{userId}
             </if>
         </where>
-        order by et.create_time desc
     </select>
     <select id="listCourseForAudit" resultType="com.qmth.teachcloud.common.entity.BasicCourse">
         SELECT
@@ -389,7 +388,7 @@
                 and exists (select 1 from mark_paper mp where mp.exam_id = mg.exam_id and mp.paper_number = mg.paper_number and mp.status = #{status})
             </if>
         </where>
-        order by mug.id desc
+        order by mg.course_code
     </select>
     <select id="listPaperNumberForEntrance" resultType="java.lang.String">
         SELECT
@@ -410,11 +409,11 @@
                 and exists (select 1 from mark_paper mp where mp.exam_id = mg.exam_id and mp.paper_number = mg.paper_number and mp.status = #{status})
             </if>
         </where>
-        order by mug.id desc
+        order by mg.paper_number
     </select>
     <select id="listCourseFromMarkPaper" resultType="com.qmth.teachcloud.common.entity.BasicCourse">
         SELECT
-            mp.course_code code,
+            distinct mp.course_code code,
             mp.course_name name
         FROM
             mark_paper mp
@@ -431,11 +430,10 @@
                 </foreach>
             </if>
         </if>
-        order by mp.id desc
     </select>
     <select id="listPaperNumberFromMarkPaper" resultType="java.lang.String">
         SELECT
-        mp.paper_number paperNumber
+            mp.paper_number paperNumber
         FROM
         mark_paper mp
         LEFT JOIN sys_user su ON mp.user_id = su.id
@@ -454,7 +452,6 @@
                 </foreach>
             </if>
         </if>
-        order by mp.id desc
     </select>
     <select id="listCourseFromExamTask" resultType="com.qmth.teachcloud.common.entity.BasicCourse">
         SELECT
@@ -480,7 +477,6 @@
                 </if>
             </if>
         </where>
-        order by a.create_time desc
     </select>
     <select id="listPaperNumberFromExamTask" resultType="java.lang.String">
         SELECT
@@ -537,7 +533,6 @@
                 </if>
             </if>
         </where>
-        order by IFNULL(g.update_time, a.update_time) desc, a.paper_number desc
     </select>
     <select id="listPaperNumberForQuery" resultType="java.lang.String">
         SELECT
@@ -568,6 +563,6 @@
                 </if>
             </if>
         </where>
-        order by IFNULL(g.update_time, a.update_time) desc, a.paper_number desc
+        order by IFNULL(g.update_time, a.update_time) desc
     </select>
 </mapper>