3.3.1 update

distributed-print/install/mysql/upgrade/3.3.1.sql

@@ -629,3 +629,4 @@ VALUES(2031, '报告数据发生变化', '/api/admin/course/degree/report/change
 UPDATE `sys_privilege` SET `enable` = '0', `front_display` = '0' WHERE (`id` = '515');
 UPDATE `sys_privilege` SET `enable` = '0', `front_display` = '0' WHERE (`id` = '450');
 UPDATE `sys_privilege` SET `enable` = '0', `front_display` = '0' WHERE (`id` = '358');
+update `sys_privilege` set enable = 0, front_display = 0 where parent_id in (358, 450, 515);

distributed-print/src/main/java/com/qmth/distributed/print/api/ExamTaskApplyController.java

@@ -250,7 +250,7 @@ public class ExamTaskApplyController {
     @Transactional(rollbackFor = Exception.class)
     @ApiResponses({@ApiResponse(code = 200, message = "{\"success\":true}", response = Result.class)})
     public Result findExamTaskStudentObject(@RequestParam ExamObjectType examObjectType,
-                                            @RequestParam Long examId,
+                                            @RequestParam(required = false) Long examId,
                                             @RequestParam(required = false) String courseCode) throws Exception {
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
         return ResultUtil.ok(examTaskService.findExamTaskStudentObject(examObjectType, examId, courseCode, requestUser));

teachcloud-common/src/main/java/com/qmth/teachcloud/common/mapper/BasicStudentMapper.java

@@ -58,6 +58,7 @@ public interface BasicStudentMapper extends BaseMapper<BasicStudent> {
      * @return 学生查询结果
      */
     List<BasicStudentResult> findBasicStudentList(@Param("schoolId") Long schoolId,
+                                                  @Param("examId") Long examId,
                                                   @Param("studentCodeList") List<String> studentCodeList);
 
     List<BasicStudentExportDto> listExportData(@Param("queryParams") String queryParams,

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/BasicStudentServiceImpl.java

@@ -95,7 +95,7 @@ public class BasicStudentServiceImpl extends ServiceImpl<BasicStudentMapper, Bas
 
     @Override
     public List<BasicStudentResult> basicStudentList(Long schoolId, Long examId, List<String> studentCodeList) {
-        return this.baseMapper.findBasicStudentList(schoolId, studentCodeList);
+        return this.baseMapper.findBasicStudentList(schoolId, examId, studentCodeList);
     }
 
     @Override

teachcloud-common/src/main/resources/mapper/BasicStudentMapper.xml

@@ -119,11 +119,9 @@
     <select id="findBasicStudentList" resultType="com.qmth.teachcloud.common.bean.result.BasicStudentResult">
         SELECT
             stu.id,
-            student_name AS studentName,
-            student_code AS studentCode,
-            phone_number AS phoneNumber,
-            bc.id AS collegeId,
-            bc.name AS collegeName,
+            stu.student_name AS studentName,
+            stu.student_code AS studentCode,
+            stu.college AS collegeName,
             stu.major AS majorName,
             stu.clazz_id AS clazzId,
             clz.clazz_name AS clazz,
@@ -132,9 +130,7 @@
         FROM
             basic_exam_student stu
                 LEFT JOIN
-            basic_teach_clazz clz ON stu.clazz_id = clz.id AND clz.enable = TRUE
-                LEFT JOIN
-            sys_org bc ON stu.belong_org_id = bc.id
+            basic_teach_clazz clz ON stu.clazz_id = clz.id
         <where>
             <if test="schoolId != null">
                 and stu.school_id = #{schoolId}
@@ -149,7 +145,7 @@
                 </foreach>
             </if>
         </where>
-        ORDER BY stu.create_time DESC
+        ORDER BY stu.create_time
     </select>
     <select id="listExportData" resultType="com.qmth.teachcloud.common.bean.dto.BasicStudentExportDto">
         SELECT