Merge remote-tracking branch 'origin/main'

srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphGoodApplyController.java

@@ -94,7 +94,9 @@ public class CphGoodApplyController extends BaseController {
         Object total = ajaxResult.get("data");
         Page page = (Page) total;
         list.add("rwgl-" + page.getTotal());
+        String username = new String();
         return AjaxResult.success(list);
+
     }
 
     @PreAuthorize("@ss.hasPermi('home:fdy:undo1')")

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

@@ -517,6 +517,9 @@ 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
+        where a.apply_status = 6 and a.stu_no = #{stuNo}
     </select>