浏览代码

课程目标达成度修改

wangliang 1 年之前
父节点
当前提交
238fbf47c4

+ 2 - 1
distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/ExamStudentMapper.java

@@ -58,8 +58,9 @@ public interface ExamStudentMapper extends BaseMapper<ExamStudent> {
      * 查询班级和老师信息
      *
      * @param examId
+     * @param courseCode
      * @param paperNumber
      * @return
      */
-    ExamStudentDto queryByExamIdAndPaperNumber(@Param("examId") Long examId, @Param("paperNumber") String paperNumber);
+    ExamStudentDto queryExamStudent(@Param("examId") Long examId, @Param("courseCode") String courseCode, @Param("paperNumber") String paperNumber);
 }

+ 2 - 1
distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/ExamStudentService.java

@@ -50,8 +50,9 @@ public interface ExamStudentService extends IService<ExamStudent> {
      * 查询班级和老师信息
      *
      * @param examId
+     * @param courseCode
      * @param paperNumber
      * @return
      */
-    ExamStudentDto queryByExamIdAndPaperNumber(Long examId, String paperNumber);
+    ExamStudentDto queryExamStudent(Long examId, String courseCode, String paperNumber);
 }

+ 3 - 2
distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamStudentServiceImpl.java

@@ -125,11 +125,12 @@ public class ExamStudentServiceImpl extends ServiceImpl<ExamStudentMapper, ExamS
      * 查询班级和老师信息
      *
      * @param examId
+     * @param courseCode
      * @param paperNumber
      * @return
      */
     @Override
-    public ExamStudentDto queryByExamIdAndPaperNumber(Long examId, String paperNumber) {
-        return this.baseMapper.queryByExamIdAndPaperNumber(examId, paperNumber);
+    public ExamStudentDto queryExamStudent(Long examId, String courseCode, String paperNumber) {
+        return this.baseMapper.queryExamStudent(examId, courseCode, paperNumber);
     }
 }

+ 1 - 1
distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/TRBasicInfoServiceImpl.java

@@ -385,7 +385,7 @@ public class TRBasicInfoServiceImpl extends ServiceImpl<TRBasicInfoMapper, TRBas
         BasicSemester basicSemester = basicSemesterService.selectByExamId(markPaper.getExamId());
         Objects.requireNonNull(basicSemester, "未找到学期信息");
 
-        ExamStudentDto examStudentDto = examStudentService.queryByExamIdAndPaperNumber(markPaper.getExamId(), markPaper.getPaperNumber());
+        ExamStudentDto examStudentDto = examStudentService.queryExamStudent(markPaper.getExamId(), markPaper.getCourseCode(), markPaper.getPaperNumber());
         String teachingObject = Objects.nonNull(examStudentDto) ? examStudentDto.getClazzNames() : null;
         String teacher = Objects.nonNull(examStudentDto) ? examStudentDto.getTeacherNames() : null;
 

+ 5 - 1
distributed-print-business/src/main/resources/mapper/ExamStudentMapper.xml

@@ -245,17 +245,21 @@
                               es.id = ms.id)
     </select>
 
-    <select id="queryByExamIdAndPaperNumber" resultType="com.qmth.distributed.print.business.bean.dto.ExamStudentDto">
+    <select id="queryExamStudent" resultType="com.qmth.distributed.print.business.bean.dto.ExamStudentDto">
         SELECT
             GROUP_CONCAT(DISTINCT es.teach_clazz_name) as clazzNames,
             GROUP_CONCAT(DISTINCT su.real_name) as teacherNames
         FROM
             exam_student es
             left join sys_user su on su.id = es.teacher_id
+            left join exam_detail_course edc on edc.id = exam_detail_course_id
         <where>
             <if test="examId != null and examId != ''">
                 AND es.exam_id = #{examId}
             </if>
+            <if test="courseCode != null and courseCode != ''">
+                AND edc.course_code = #{courseCode}
+            </if>
             <if test="paperNumber != null and paperNumber != ''">
                 AND es.paper_number = #{paperNumber}
             </if>