fix:开课学院学生列表查询排序更改

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/service/ChangNamesService.java

@@ -37,85 +37,85 @@ public interface ChangNamesService {
      * 更新表 't_a_exam_course_college_inspect_dio'
      */
     @Async("analyzeThreadPool")
-    void changeTableTaExamCourseCollegeInspectDio();
+    void changeTableTAExamCourseCollegeInspectDio();
 
     /**
      * 更新表 't_a_exam_course_college_paper_struct'
      */
     @Async("analyzeThreadPool")
-    void changeTableTaExamCourseCollegePaperStruct();
+    void changeTableTAExamCourseCollegePaperStruct();
 
     /**
      * 更新表 't_a_exam_course_college_teacher'
      */
     @Async("analyzeThreadPool")
-    void changeTableTaExamCourseCollegeTeacher();
+    void changeTableTAExamCourseCollegeTeacher();
 
     /**
      * 更新表 't_a_exam_course_difficult'
      */
     @Async("analyzeThreadPool")
-    void changeTableTaExamCourseDifficultService();
+    void changeTableTAExamCourseDifficultService();
 
     /**
      * 更新表 't_a_exam_course_dio'
      */
     @Async("analyzeThreadPool")
-    void changeTableTaExamCourseDio();
+    void changeTableTAExamCourseDio();
 
     /**
      * 更新表 't_a_exam_course_record_dio'
      */
     @Async("analyzeThreadPool")
-    void changeTableTaExamCourseRecordDio();
+    void changeTableTAExamCourseRecordDio();
 
     /**
      * 更新表 't_a_exam_course_record_mod'
      */
     @Async("analyzeThreadPool")
-    void changeTableTaExamCourseRecordMod();
+    void changeTableTAExamCourseRecordMod();
 
     /**
      * 更新表 't_a_exam_course_teacher'
      */
     @Async("analyzeThreadPool")
-    void changeTableTaExamCourseTeacher();
+    void changeTableTAExamCourseTeacher();
 
     /**
      * 更新表 't_a_exam_course_teacher_college_difficult'
      */
     @Async("analyzeThreadPool")
-    void changeTableTaExamCourseTeacherCollegeDifficult();
+    void changeTableTAExamCourseTeacherCollegeDifficult();
 
     /**
      * 更新表 't_a_exam_course_teacher_college_dio'
      */
     @Async("analyzeThreadPool")
-    void changeTableTaExamCourseTeacherCollegeDio();
+    void changeTableTAExamCourseTeacherCollegeDio();
 
     /**
      * 更新表 't_a_exam_course_teacher_college_paper_struct'
      */
     @Async("analyzeThreadPool")
-    void changeTableTaExamCourseTeacherCollegePaperStruct();
+    void changeTableTAExamCourseTeacherCollegePaperStruct();
 
     /**
      * 更新表 't_a_exam_course_teacher_difficult'
      */
     @Async("analyzeThreadPool")
-    void changeTableTaExamCourseTeacherDifficult();
+    void changeTableTAExamCourseTeacherDifficult();
 
     /**
      * 更新表 't_a_exam_course_teacher_dio'
      */
     @Async("analyzeThreadPool")
-    void changeTableTaExamCourseTeacherDio();
+    void changeTableTAExamCourseTeacherDio();
 
     /**
      * 更新表 't_a_exam_course_teacher_paper_struct'
      */
     @Async("analyzeThreadPool")
-    void changeTableTaExamCourseTeacherPaperStruct();
+    void changeTableTAExamCourseTeacherPaperStruct();
 
     /**
      * 更新表 't_a_exam_total'

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/service/impl/ChangNamesServiceImpl.java

@@ -277,7 +277,7 @@ public class ChangNamesServiceImpl implements ChangNamesService {
     }
 
     @Override
-    public void changeTableTaExamCourseCollegeInspectDio() {
+    public void changeTableTAExamCourseCollegeInspectDio() {
         Map<String, String> courseMap = this.findCourseMap();
         Map<Long, String> orgMap = this.findOrgMap();
         taExamCourseCollegeInspectDioService.updateBatchById(taExamCourseCollegeInspectDioService.list().stream().peek(e -> {
@@ -293,7 +293,7 @@ public class ChangNamesServiceImpl implements ChangNamesService {
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void changeTableTaExamCourseCollegePaperStruct() {
+    public void changeTableTAExamCourseCollegePaperStruct() {
         Map<String, String> courseMap = this.findCourseMap();
         Map<Long, String> orgMap = this.findOrgMap();
         taExamCourseCollegePaperStructService.updateBatchById(taExamCourseCollegePaperStructService.list().stream().peek(e -> {
@@ -309,7 +309,7 @@ public class ChangNamesServiceImpl implements ChangNamesService {
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void changeTableTaExamCourseCollegeTeacher() {
+    public void changeTableTAExamCourseCollegeTeacher() {
         Map<String, String> courseMap = this.findCourseMap();
         Map<Long, String> orgMap = this.findOrgMap();
         Map<Long, String> userMap = this.findUserIdNameMap();
@@ -332,7 +332,7 @@ public class ChangNamesServiceImpl implements ChangNamesService {
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void changeTableTaExamCourseDifficultService() {
+    public void changeTableTAExamCourseDifficultService() {
         Map<String, String> courseMap = this.findCourseMap();
         taExamCourseDifficultService.updateBatchById(taExamCourseDifficultService.list().stream()
                 .filter(e -> courseMap.containsKey(e.getCourseCode()))
@@ -343,7 +343,7 @@ public class ChangNamesServiceImpl implements ChangNamesService {
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void changeTableTaExamCourseDio() {
+    public void changeTableTAExamCourseDio() {
         Map<String, String> courseMap = this.findCourseMap();
         taExamCourseDioService.updateBatchById(taExamCourseDioService.list().stream().filter(e -> courseMap.containsKey(e.getCourseCode())).peek(e -> e.setCourseName(courseMap.get(e.getCourseCode()))).collect(Collectors.toList()));
         log.info("表 't_a_exam_course_dio' 更新完成");
@@ -351,7 +351,7 @@ public class ChangNamesServiceImpl implements ChangNamesService {
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void changeTableTaExamCourseRecordDio() {
+    public void changeTableTAExamCourseRecordDio() {
         Map<String, String> courseMap = this.findCourseMap();
         Map<Long, String> orgMap = this.findOrgMap();
         Map<Long, String> userMap = this.findUserIdNameMap();
@@ -367,13 +367,13 @@ public class ChangNamesServiceImpl implements ChangNamesService {
             }
         }).collect(Collectors.toList());
         List<List<TAExamCourseRecordDio>> stepList = SystemConstant.getStepList(taExamCourseRecordDioList);
-        stepList.forEach(e -> complicatedCalculateAsyncService.updateTableTaExamCourseRecordDioBatchById(e));
+        stepList.forEach(e -> complicatedCalculateAsyncService.updateTableTAExamCourseRecordDioBatchById(e));
 //        log.info("表 't_a_exam_course_record_dio' 更新完成");
     }
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void changeTableTaExamCourseRecordMod() {
+    public void changeTableTAExamCourseRecordMod() {
         Map<String, String> courseMap = this.findCourseMap();
         Map<Long, String> orgMap = this.findOrgMap();
         taExamCourseRecordModService.updateBatchById(taExamCourseRecordModService.list().stream().peek(e -> {
@@ -389,7 +389,7 @@ public class ChangNamesServiceImpl implements ChangNamesService {
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void changeTableTaExamCourseTeacher() {
+    public void changeTableTAExamCourseTeacher() {
         Map<String, String> courseMap = this.findCourseMap();
         Map<Long, String> userMap = this.findUserIdNameMap();
         taExamCourseTeacherService.updateBatchById(taExamCourseTeacherService.list().stream().peek(e -> {
@@ -405,7 +405,7 @@ public class ChangNamesServiceImpl implements ChangNamesService {
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void changeTableTaExamCourseTeacherCollegeDifficult() {
+    public void changeTableTAExamCourseTeacherCollegeDifficult() {
         Map<String, String> courseMap = this.findCourseMap();
         Map<Long, String> orgMap = this.findOrgMap();
         Map<Long, String> userMap = this.findUserIdNameMap();
@@ -425,7 +425,7 @@ public class ChangNamesServiceImpl implements ChangNamesService {
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void changeTableTaExamCourseTeacherCollegeDio() {
+    public void changeTableTAExamCourseTeacherCollegeDio() {
         Map<String, String> courseMap = this.findCourseMap();
         Map<Long, String> orgMap = this.findOrgMap();
         Map<Long, String> userMap = this.findUserIdNameMap();
@@ -445,7 +445,7 @@ public class ChangNamesServiceImpl implements ChangNamesService {
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void changeTableTaExamCourseTeacherCollegePaperStruct() {
+    public void changeTableTAExamCourseTeacherCollegePaperStruct() {
         Map<String, String> courseMap = this.findCourseMap();
         Map<Long, String> orgMap = this.findOrgMap();
         Map<Long, String> userMap = this.findUserIdNameMap();
@@ -465,7 +465,7 @@ public class ChangNamesServiceImpl implements ChangNamesService {
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void changeTableTaExamCourseTeacherDifficult() {
+    public void changeTableTAExamCourseTeacherDifficult() {
         Map<String, String> courseMap = this.findCourseMap();
         Map<Long, String> userMap = this.findUserIdNameMap();
         taExamCourseTeacherDifficultService.updateBatchById(taExamCourseTeacherDifficultService.list().stream().peek(e -> {
@@ -481,7 +481,7 @@ public class ChangNamesServiceImpl implements ChangNamesService {
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void changeTableTaExamCourseTeacherDio() {
+    public void changeTableTAExamCourseTeacherDio() {
         Map<String, String> courseMap = this.findCourseMap();
         Map<Long, String> userMap = this.findUserIdNameMap();
         taExamCourseTeacherDioService.updateBatchById(taExamCourseTeacherDioService.list().stream().peek(e -> {
@@ -497,7 +497,7 @@ public class ChangNamesServiceImpl implements ChangNamesService {
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void changeTableTaExamCourseTeacherPaperStruct() {
+    public void changeTableTAExamCourseTeacherPaperStruct() {
         Map<String, String> courseMap = this.findCourseMap();
         Map<Long, String> userMap = this.findUserIdNameMap();
         taExamCourseTeacherPaperStructService.updateBatchById(taExamCourseTeacherPaperStructService.list().stream().peek(e -> {

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/service/impl/CourseUnitOperateServiceImpl.java

@@ -244,20 +244,20 @@ public class CourseUnitOperateServiceImpl implements CourseUnitOperateService {
         changNamesService.changeTableTAExamCourse();
         changNamesService.changeTableTAExamCourseClazz();
         changNamesService.changeTableTAExamCourseCollegeInspect();
-        changNamesService.changeTableTaExamCourseCollegeInspectDio();
-        changNamesService.changeTableTaExamCourseCollegePaperStruct();
-        changNamesService.changeTableTaExamCourseCollegeTeacher();
-        changNamesService.changeTableTaExamCourseDifficultService();
-        changNamesService.changeTableTaExamCourseDio();
-        changNamesService.changeTableTaExamCourseRecordDio();
-        changNamesService.changeTableTaExamCourseRecordMod();
-        changNamesService.changeTableTaExamCourseTeacher();
-        changNamesService.changeTableTaExamCourseTeacherCollegeDifficult();
-        changNamesService.changeTableTaExamCourseTeacherCollegeDio();
-        changNamesService.changeTableTaExamCourseTeacherCollegePaperStruct();
-        changNamesService.changeTableTaExamCourseTeacherDifficult();
-        changNamesService.changeTableTaExamCourseTeacherDio();
-        changNamesService.changeTableTaExamCourseTeacherPaperStruct();
+        changNamesService.changeTableTAExamCourseCollegeInspectDio();
+        changNamesService.changeTableTAExamCourseCollegePaperStruct();
+        changNamesService.changeTableTAExamCourseCollegeTeacher();
+        changNamesService.changeTableTAExamCourseDifficultService();
+        changNamesService.changeTableTAExamCourseDio();
+        changNamesService.changeTableTAExamCourseRecordDio();
+        changNamesService.changeTableTAExamCourseRecordMod();
+        changNamesService.changeTableTAExamCourseTeacher();
+        changNamesService.changeTableTAExamCourseTeacherCollegeDifficult();
+        changNamesService.changeTableTAExamCourseTeacherCollegeDio();
+        changNamesService.changeTableTAExamCourseTeacherCollegePaperStruct();
+        changNamesService.changeTableTAExamCourseTeacherDifficult();
+        changNamesService.changeTableTAExamCourseTeacherDio();
+        changNamesService.changeTableTAExamCourseTeacherPaperStruct();
         changNamesService.changeTableTAExamTotal();
         changNamesService.changeTableTAPaperStruct();
     }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/templete/service/ComplicatedCalculateAsyncService.java

@@ -17,5 +17,5 @@ public interface ComplicatedCalculateAsyncService {
      * @param taExamCourseRecordDioList taExamCourseRecordDioList
      */
     @Async("analyzeThreadPool")
-    void updateTableTaExamCourseRecordDioBatchById(List<TAExamCourseRecordDio> taExamCourseRecordDioList);
+    void updateTableTAExamCourseRecordDioBatchById(List<TAExamCourseRecordDio> taExamCourseRecordDioList);
 }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/templete/service/impl/ComplicatedCalculateAsyncServiceImpl.java

@@ -21,7 +21,7 @@ public class ComplicatedCalculateAsyncServiceImpl implements ComplicatedCalculat
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void updateTableTaExamCourseRecordDioBatchById(List<TAExamCourseRecordDio> taExamCourseRecordDioList) {
+    public void updateTableTAExamCourseRecordDioBatchById(List<TAExamCourseRecordDio> taExamCourseRecordDioList) {
         taExamCourseRecordDioService.updateBatchById(taExamCourseRecordDioList);
     }
 }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/utils/RandomNameUtil.java

@@ -1,8 +1,6 @@
 package com.qmth.teachcloud.report.business.utils;
 
-import java.util.Arrays;
 import java.util.Random;
-import java.util.stream.Collectors;
 
 /**
  * @Description: 随机名生成类

teachcloud-report-business/src/main/resources/mapper/TBExamStudentMapper.xml

@@ -197,9 +197,17 @@
                 </foreach>
             </if>
         </where> ) t
-        <if test="column != null and column != '' and order != null and order != ''">
-            order by t.${column} ${order}
-        </if>
+<!--        <if test="column != null and column != '' and order != null and order != ''">-->
+<!--            order by t.${column} ${order}-->
+<!--        </if>-->
+        <choose>
+            <when test="column != null and column != '' and order != null and order != ''">
+                order by t.${column} ${order}
+            </when>
+            <otherwise>
+                order by t.courseCode ASC,t.current DESC,t.studentCode ASC
+            </otherwise>
+        </choose>
     </select>
 
     <select id="listInspectCollegeResult"