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:
zhy
2025-10-18 19:18:25 +08:00
parent 80279a0586 f994fc391e
commit 374a508737
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
srs-admin/src/main/java/com/srs/web/controller/comprehensive/KnzzGlApplyController.java
View File

@@ -202,7 +202,7 @@ public class KnzzGlApplyController extends BaseController {
/** /**
* 获取国家励志奖学金详细信息 * 获取国家励志奖学金详细信息
*/ */
@PreAuthorize("@ss.hasPermi('comprehensive:knzzGlApply:query')") // @PreAuthorize("@ss.hasPermi('comprehensive:knzzGlApply:query')")
@GetMapping(value = "/{id}") @GetMapping(value = "/{id}")
@ApiOperation("获取国家励志奖学金详细信息") @ApiOperation("获取国家励志奖学金详细信息")
public AjaxResult getInfo(@PathVariable("id") Long id) public AjaxResult getInfo(@PathVariable("id") Long id)
@@ -225,7 +225,7 @@ public class KnzzGlApplyController extends BaseController {
/** /**
* 修改国家励志奖学金 * 修改国家励志奖学金
*/ */
@PreAuthorize("@ss.hasPermi('comprehensive:knzzGlApply:edit')") // @PreAuthorize("@ss.hasPermi('comprehensive:knzzGlApply:edit')")
@Log(title = "国家励志奖学金", businessType = BusinessType.UPDATE) @Log(title = "国家励志奖学金", businessType = BusinessType.UPDATE)
@PostMapping("/update") @PostMapping("/update")
@ApiOperation("修改国家励志奖学金") @ApiOperation("修改国家励志奖学金")

6
srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/KnzzGlApplyServiceImpl.java
View File

@@ -107,9 +107,9 @@ public class KnzzGlApplyServiceImpl extends ServiceImpl<KnzzGlApplyMapper,KnzzGl
throw new Exception("申请不存在"); throw new Exception("申请不存在");
} }
if(!Objects.equals(apply.getStuNo(), getUsername())){ // if(!Objects.equals(apply.getStuNo(), getUsername())){
throw new Exception("只能修改自己的申请"); // throw new Exception("只能修改自己的申请");
} // }
if(!Objects.equals(apply.getApplyStatus(), "1")){ if(!Objects.equals(apply.getApplyStatus(), "1")){
throw new Exception("申请已处理"); throw new Exception("申请已处理");

2
srs-stureg/src/main/resources/mapper/stureg/SrsStuRegCountMapper.xml
View File

@@ -238,7 +238,7 @@
select s.tools_type,case when r.xy='经济管理学院' then '长堽校区' select s.tools_type,case when r.xy='经济管理学院' then '长堽校区'
when r.xy='信息工程学院' then '长堽校区' else '里建校区' end as xq when r.xy='信息工程学院' then '长堽校区' else '里建校区' end as xq
from srs_at_station s inner join srs_stu_reg r on s.ksh=r.ksh where s.create_time>CURDATE()-INTERVAL 90 DAY ) t from srs_at_station s inner join srs_stu_reg r on s.ksh=r.ksh where s.create_time>CURDATE()-INTERVAL 90 DAY ) t
group by tools_type,xq order by xq,totalnum desc group by tools_type,xq order by xq,count(1) desc
</select> </select>