Merge remote-tracking branch 'origin/main'

srs-comprehensive/src/main/resources/mapper/comprehensive/CphProRankingMapper.xml

@@ -55,17 +55,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
     <select id="getRankList" parameterType="CphProRank" resultType="CphProRank">
-        SELECT a.id,a.stu_no,ss.name as xsxm,b.class_name, CASE WHEN c.stu_year_name IS NULL THEN '未知' ELSE c.stu_year_name END AS
+        SELECT a.id,a.stu_no,b.stu_name as xsxm,b.class_name, CASE WHEN c.stu_year_name IS NULL THEN '未知' ELSE c.stu_year_name END AS
         stu_year_name, course_credit, total_credit, total_score, course_num, avg_score, avg_credit, ranking, nopass
         from cph_pro_ranking as a
-        left join srs_class as b on a.class_id=b.class_id
+        left join view_stu_info as b on a.stu_no=b.stu_no
         left join srs_stu_year as c on a.stu_year_id=c.id
-        left join srs_student ss on a.stu_no = ss.stu_no
         <where>
             <if test="stuNo != null  and stuNo != ''"> and a.stu_no = #{stuNo}</if>
-            <if test="xsxm != null  and xsxm != ''"> and xsxm = #{xsxm}</if>
+            <if test="xsxm != null  and xsxm != ''"> and b.stu_name = #{xsxm}</if>
-            <if test="classId != null "> and a.class_id = #{classId}</if>
+            <if test="classId != null "> and b.class_id = #{classId}</if>
-            <if test="classCode != null  and classCode != ''"> and a.class_code = #{classCode}</if>
+            <if test="classCode != null  and classCode != ''"> and b.class_code = #{classCode}</if>
             <if test="stuYearId != null "> and a.stu_year_id = #{stuYearId}</if>
             <if test="courseCredit != null "> and course_credit = #{courseCredit}</if>
             <if test="totalCredit != null "> and total_credit = #{totalCredit}</if>