学生资助、学生奖惩、学籍异动内容修改

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

@@ -192,7 +192,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <sql id="selectSrsKnrdApplyVo">
-        select * from srs_knrd_apply
+        select t.knrd_type as knlx, a.*
+        from srs_knrd_apply as a
+        left join srs_knrd_type as t
+          on t.stu_no = a.xh
+         and t.stu_year_id = a.stu_year_id
     </sql>
 
     <select id="selectSrsKnrdApplyList" parameterType="SrsKnrdApply" resultMap="SrsKnrdApplyResult">
@@ -247,11 +251,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectSrsKnrdApplyById" parameterType="Long" resultMap="SrsKnrdApplyResult">
         <include refid="selectSrsKnrdApplyVo"/>
-        where id = #{id}
+        where a.id = #{id}
     </select>
     <select id="selectSrsKnrdApplyBysfz" resultType="com.srs.comprehensive.domain.SrsKnrdApply">
         <include refid="selectSrsKnrdApplyVo"/>
-        where sfzhm = #{sfzhm} and stu_year_id = #{stuYearId}
+        where a.sfzhm = #{sfzhm} and a.stu_year_id = #{stuYearId}
     </select>
     <select id="selectsfzhm" resultType="com.srs.comprehensive.domain.SrsKnrdApply">
         select * from srs_student where id_card=#{sfzhm}