Переглянути джерело

fix:教师团队查询更改

caozixuan 1 рік тому
батько
коміт
64039ed7dc

+ 4 - 6
distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/TeachCourseMapper.java

@@ -36,14 +36,12 @@ public interface TeachCourseMapper extends BaseMapper<TeachCourse> {
     /**
     /**
      * 教师团队分页查询
      * 教师团队分页查询
      *
      *
-     * @param iPage      分页参数
-     * @param examId     考试id
-     * @param courseCode 课程编号
-     * @param userInfo   用户信息(姓名||工号)
+     * @param iPage    分页参数
+     * @param leaderId 课程责任人id
+     * @param userInfo 用户信息(姓名||工号)
      * @return 分页结果
      * @return 分页结果
      */
      */
-    IPage<TeacherTeamResult> findTeacherTeamPage(@Param("iPage") Page<TeacherTeamResult> iPage, @Param("examId") Long examId,
-            @Param("courseCode") String courseCode, @Param("userInfo") String userInfo);
+    IPage<TeacherTeamResult> findTeacherTeamPage(@Param("iPage") Page<TeacherTeamResult> iPage, @Param("leaderId") Long leaderId, @Param("userInfo") String userInfo);
 
 
     /**
     /**
      * 根据机构id查询教师集合
      * 根据机构id查询教师集合

+ 3 - 4
distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/TeachCourseServiceImpl.java

@@ -443,14 +443,13 @@ public class TeachCourseServiceImpl extends ServiceImpl<TeachCourseMapper, Teach
         if (Objects.isNull(teachCourse)) {
         if (Objects.isNull(teachCourse)) {
             throw ExceptionResultEnum.ERROR.exception("教学课程不存在");
             throw ExceptionResultEnum.ERROR.exception("教学课程不存在");
         }
         }
-        Long examId = teachCourse.getExamId();
-        String courseCode = teachCourse.getCourseCode();
+        // 教学课程主管责任人
+        Long leaderId = teachCourse.getUserId();
 
 
         if (SystemConstant.strNotNull(userInfo)) {
         if (SystemConstant.strNotNull(userInfo)) {
             userInfo = SystemConstant.translateSpecificSign(userInfo);
             userInfo = SystemConstant.translateSpecificSign(userInfo);
         }
         }
-        IPage<TeacherTeamResult> page = this.baseMapper.findTeacherTeamPage(new Page<>(pageNumber, pageSize), examId,
-                courseCode, userInfo);
+        IPage<TeacherTeamResult> page = this.baseMapper.findTeacherTeamPage(new Page<>(pageNumber, pageSize), leaderId, userInfo);
         page.getRecords().forEach(e -> {
         page.getRecords().forEach(e -> {
             Long userId = e.getUserId();
             Long userId = e.getUserId();
             List<Long> userIdList = new ArrayList<>();
             List<Long> userIdList = new ArrayList<>();

+ 3 - 6
distributed-print-business/src/main/resources/mapper/TeachCourseMapper.xml

@@ -58,12 +58,9 @@
                 LEFT JOIN
                 LEFT JOIN
             sys_org so ON su.org_id = so.id
             sys_org so ON su.org_id = so.id
         <where>
         <where>
-            su.enable = true
-            <if test="examId != null">
-                AND tc.exam_id = #{examId}
-            </if>
-            <if test="courseCode != null and courseCode != ''">
-                AND tc.course_code = #{courseCode}
+            AND su.enable = true
+            <if test="leaderId != null">
+                AND tc.create_id = #{leaderId}
             </if>
             </if>
             <if test="userInfo != null and userInfo != ''">
             <if test="userInfo != null and userInfo != ''">
                 AND (su.real_name LIKE CONCAT('%',#{userInfo},'%') OR su.code LIKE CONCAT('%',#{userInfo},'%'))
                 AND (su.real_name LIKE CONCAT('%',#{userInfo},'%') OR su.code LIKE CONCAT('%',#{userInfo},'%'))