fix:bugfix

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/TeachCourseResult.java

@@ -25,6 +25,9 @@ public class TeachCourseResult {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long createId;
 
+    @ApiModelProperty(value = "创建人名称")
+    private String creatorName;
+
     @ApiModelProperty(value = "创建时间")
     private Long createTime;
 
@@ -67,6 +70,14 @@ public class TeachCourseResult {
         this.createId = createId;
     }
 
+    public String getCreatorName() {
+        return creatorName;
+    }
+
+    public void setCreatorName(String creatorName) {
+        this.creatorName = creatorName;
+    }
+
     public Long getCreateTime() {
         return createTime;
     }

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

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

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

@@ -445,11 +445,12 @@ public class TeachCourseServiceImpl extends ServiceImpl<TeachCourseMapper, Teach
         }
         // 教学课程主管责任人
         Long leaderId = teachCourse.getCreateId();
+        String courseCode = teachCourse.getCourseCode();
 
         if (SystemConstant.strNotNull(userInfo)) {
             userInfo = SystemConstant.translateSpecificSign(userInfo);
         }
-        IPage<TeacherTeamResult> page = this.baseMapper.findTeacherTeamPage(new Page<>(pageNumber, pageSize), leaderId, userInfo);
+        IPage<TeacherTeamResult> page = this.baseMapper.findTeacherTeamPage(new Page<>(pageNumber, pageSize), courseCode, leaderId, userInfo);
         page.getRecords().forEach(e -> {
             Long userId = e.getUserId();
             List<Long> userIdList = new ArrayList<>();

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

@@ -25,7 +25,7 @@
         FROM
             basic_exam_student bes
                 LEFT JOIN
-            basic_course bc ON bes.course_code = bc.code
+            basic_course bc ON bes.course_code = bc.code AND bes.school_id = bc.school_id
                 LEFT JOIN
             basic_teach_clazz tbc ON bes.clazz_id = tbc.id
                 LEFT JOIN
@@ -94,7 +94,7 @@
         FROM
             basic_exam_student bes
                 LEFT JOIN
-            basic_course bc ON bes.course_code = bc.code
+            basic_course bc ON bes.course_code = bc.code AND bes.school_id = bc.school_id
                 LEFT JOIN
             basic_teach_clazz tbc ON bes.clazz_id = tbc.id
                 LEFT JOIN

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

@@ -11,13 +11,16 @@
             tc.create_id AS createId,
             tc.create_time AS createTime,
             tc.user_id AS userId,
+            cr.real_name AS creatorName,
             su.real_name AS userName
         FROM
             teach_course tc
                 INNER JOIN
             basic_course bc ON tc.school_id = bc.school_id AND tc.course_code = bc.code AND bc.enable = TRUE
                 LEFT JOIN
-            sys_user su on tc.user_id = su.id
+            sys_user su ON tc.user_id = su.id
+                LEFT JOIN
+            sys_user cr ON tc.create_id = cr.id
         <where>
             <if test="schoolId != null">
                 AND tc.school_id = #{schoolId}
@@ -59,6 +62,9 @@
             sys_org so ON su.org_id = so.id
         <where>
             AND su.enable = true
+            <if test="courseCode != null and courseCode != ''">
+                AND tc.course_code = #{courseCode}
+            </if>
             <if test="leaderId != null">
                 AND tc.create_id = #{leaderId}
             </if>