xgxt_sd/zhxg_java
15
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
15976874561
2025-08-15 18:06:39 +08:00
parent 5b47e7c5f2 e42d199af4
commit 18337b5876
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

3
srs-comprehensive/src/main/resources/mapper/comprehensive/CphGoodApplyMapper.xml
View File

@@ -517,6 +517,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select concat('zx-',count(a.id)) as `all` select concat('zx-',count(a.id)) as `all`
from srs_zxj_apply as a from srs_zxj_apply as a
where a.`step` = 4 and a.xh = #{stuNo} 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> </select>