Merge remote-tracking branch 'origin/main'

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.srs.comprehensive.mapper.CphGoodApplyMapper">
 
     <resultMap type="CphGoodApply" id="CphGoodApplyResult">
@@ -491,6 +491,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select concat('zx-',count(a.id)) as `all`
         from srs_zxj_apply as a
         where a.`step` = 3
+        <!--        知无涯 教务困难资助-->
+        union
+        select concat('knzz-',count(a.id)) as `all`
+        from knzz_tufa_apply as a
+        where a.apply_status = 1
     </select>
 
     <select id="countStuUnDo" resultType="String" parameterType="String">
@@ -517,8 +522,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select concat('zx-',count(a.id)) as `all`
         from srs_zxj_apply as a
         where a.`step` = 4 and a.xh = #{stuNo}
-         union select concat('yxgb-',count(a.id)) as `all`
+        <!--            知无涯 学生困难资助申请驳回-->
-        from cph_good_apply as a
+        union
+        select concat('knzz-',count(a.id)) as `all`
+        from knzz_tufa_apply as a
         where a.apply_status = 6 and a.stu_no = #{stuNo}
     </select>
 
@@ -567,6 +574,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN sys_menu m on rm.menu_id = m.menu_id
         where r.role_key ='stumanger' and m.component = 'poverty/xw'
         )
+        <!--       知无涯 学务困难资助     -->
+        union
+        select concat('knzz-',count(a.id)) as `all`
+        from knzz_tufa_apply as a
+        left join view_stu_info as b on a.stu_no = b.stu_no
+        where a.apply_status = 1 and b.dept_id = #{id}
     </select>
 
     <select id="countFdyUnDo" resultType="String" parameterType="String">
@@ -613,6 +626,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join sys_dept as c on b.dept_code = c.dept_code
         left join view_stu_info as d on a.stu_no = d.stu_no
         where  b.zdls_no = #{tNo} and a.apply_status = '1'
+        <!--        知无涯 辅导员困难资助-->
+        union
+        select concat('knzz-',count(a.id)) as `all`
+        from knzz_tufa_apply as a
+        left join view_stu_info as b on a.stu_no = b.stu_no
+        where a.apply_status = 1 and b.t_no = #{tNo}
+        <!-- 知无涯 统计待审核的离校申请 -->
+        union
+        select concat('leave-',count(a.return_school_id)) as `all`
+        from sur_itinerary as a
+        left join view_stu_info as b on a.stu_no = b.stu_no
+        where a.leave_status = 1 and b.t_no = #{tNo}
     </select>
 
 
@@ -636,6 +661,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                                      LEFT JOIN sys_menu m on rm.menu_id = m.menu_id
                 where r.role_key ='Junior_college_leader'
             )
+<!--            知无涯 书记困难资助-->
+        union
+        select concat('knzz-',count(a.id)) as `all`
+        from knzz_tufa_apply as a
+                 left join view_stu_info as b on a.stu_no = b.stu_no
+        where a.apply_status = 1 and b.dept_id = #{id}
 
     </select>