Merge branch 'main' of http://47.112.118.149:10082/xgxt_sd/zhxg_java

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

@@ -495,21 +495,19 @@
         union
         select concat('knzz-',count(a.id)) as `all`
         from knzz_tufa_apply as a
-        where a.apply_status = 1
+        where a.apply_status = 3
         /*宁博  6、困难资助-国家励志奖学金-学工审核代办*/
         union
         select concat('knzzgl-',count(a.id)) as `all`
         from knzz_gl_apply as a
         left join view_stu_info as b on a.stu_no = b.stu_no
-        where a.apply_status = 1
+        where a.apply_status = 3
+        -- 陈冠元 困难资助-自治区人民政府奖学金-学工审核代办
         union
-        select concat('xszb-',count(a.id)) as `all`
+        select concat('knzzzzq-',count(a.id)) as `all`
-        from rt_stu_id_reissue as a
+        from knzz_zzq_apply as a
-        where a.inspection_progress = 1
+        left join view_stu_info as b on a.stu_no = b.stu_no
-        union
+        where a.apply_status = 3
-        select concat('zxzm-',count(a.id)) as `all`
-        from rt_stu_at_school as a
-        where a.xgstatus = 0
     </select>
 
     <select id="countStuUnDo" resultType="String" parameterType="String">
@@ -593,13 +591,19 @@
         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}
+        where a.apply_status = 2 and b.dept_id = #{id}
         /*宁博  6、困难资助-国家励志奖学金-学务审核代办*/
         union
         select concat('knzzgl-',count(a.id)) as `all`
         from knzz_gl_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}
+        where a.apply_status = 2 and b.dept_id = #{id}
+        -- 陈冠元 困难资助-自治区人民政府奖学金-学校审核代办
+        union
+        select concat('knzzzzq-',count(a.id)) as `all`
+        from knzz_zzq_apply as a
+        left join view_stu_info as b on a.stu_no = b.stu_no
+        where a.apply_status = 2 and b.dept_id = #{id}
     </select>
 
     <select id="countFdyUnDo" resultType="String" parameterType="String">
@@ -670,16 +674,12 @@
         from knzz_gl_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('xszb-',count(a.id)) as `all`
+        select concat('knzzzzq-',count(a.id)) as `all`
-        from rt_stu_id_reissue as a
+        from knzz_zzq_apply as a
-                 left join view_stu_info as b on a.stu_no = b.stu_no
+        left join view_stu_info as b on a.stu_no = b.stu_no
-        where  b.t_no = #{tNo} and a.inspection_progress = 0
+        where a.apply_status = 1 and b.dept_id = #{id}
-        union
-        select concat('zxzm-',count(a.id)) as `all`
-        from rt_stu_at_school as a
-                 left join view_stu_info as d on a.student_id = d.stu_no
-        where  d.t_no = #{tNo} and a.status = 0
     </select>