From a0c6add40899feb861776198cf1dcc2edd1bdf5f Mon Sep 17 00:00:00 2001 From: weishengyou <2454197255@qq.com> Date: Wed, 24 Dec 2025 09:14:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E5=B9=B4=E6=A0=87=E7=AD=BE=E9=80=82?= =?UTF-8?q?=E9=85=8D=E5=AD=A6=E7=94=9F=E5=A5=96=E6=83=A9=E3=80=81=E5=AD=A6?= =?UTF-8?q?=E7=94=9F=E8=B5=84=E5=8A=A9=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../comprehensive/CphBiyeApplyController.java | 28 +++++ .../comprehensive/CphGoodApplyController.java | 27 +++++ .../mapper/CphGoodApplyMapper.java | 8 ++ .../service/ICphBiyeApplyService.java | 8 ++ .../service/ICphGoodApplyService.java | 2 + .../service/impl/CphBiyeApplyServiceImpl.java | 54 +++++++++- .../service/impl/CphGoodApplyServiceImpl.java | 101 +++++++++++++++--- .../service/impl/CphLakeApplyServiceImpl.java | 2 +- .../service/impl/KnzzGlApplyServiceImpl.java | 22 +++- .../impl/KnzzTufaApplyServiceImpl.java | 31 +++++- .../service/impl/KnzzZsgApplyServiceImpl.java | 16 ++- .../service/impl/KnzzZzqApplyServiceImpl.java | 16 ++- .../service/impl/SrsKnrdApplyServiceImpl.java | 1 - .../comprehensive/CphGoodApplyMapper.xml | 25 +++++ .../mapper/comprehensive/SrsStuYearMapper.xml | 2 +- 15 files changed, 301 insertions(+), 42 deletions(-) diff --git a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphBiyeApplyController.java b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphBiyeApplyController.java index 7227afa..3d01aed 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphBiyeApplyController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphBiyeApplyController.java @@ -293,6 +293,23 @@ public class CphBiyeApplyController extends BaseController { } } + /** + * 根据标签绑定的学年获取学生体测成绩 + * @param stuNo + * @param tag + * @return + */ + @GetMapping("/listStuSportScoreByTag/{stuNo}") + @ApiOperation("获取学生体测成绩") + public AjaxResult listStuSportScore(@PathVariable("stuNo") String stuNo, String tag) { + boolean hasRole = RoleBool.isHigh(getUserId(), _postService); + if (hasRole) { + return cphBiyeApplyService.listStuSportScore(stuNo, tag); + } else { + return AjaxResult.error(401, "你无权做这些"); + } + } + @GetMapping("/getStuScoreMajorRank/{stuNo}") @ApiOperation("获取我的学业成绩排名") public AjaxResult getStuScoreMajorRank(@PathVariable("stuNo") String stuNo) { @@ -304,6 +321,17 @@ public class CphBiyeApplyController extends BaseController { } } +/** + * 根据标签绑定的学年获取我的体测成绩 + * @return + */ + @GetMapping("/listOwnSportScoreByTag") + @ApiOperation("获取我的体测成绩") + public AjaxResult listOwnSportScore(String tag) { + return cphBiyeApplyService.listStuSportScore(getUsername(), tag); + } + + @GetMapping("/listOwnSportScore") @ApiOperation("获取我的体测成绩") diff --git a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphGoodApplyController.java b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphGoodApplyController.java index 537bc93..b63e0e5 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphGoodApplyController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphGoodApplyController.java @@ -422,6 +422,18 @@ public class CphGoodApplyController extends BaseController { } } + @GetMapping("/listStuScoreClassRankByTag/{stuNo}") + @ApiOperation("根据学年标签查询学生指定学年成绩班级排名") + public AjaxResult listStuScoreClassRank(@PathVariable("stuNo") String stuNo,String tag) { + boolean hasRole = RoleBool.isHigh(getUserId(), _postService); + if (hasRole) { + List list = cphGoodApplyService.listOwnScoreClassRankByTag(stuNo,tag);// + return success(list); + } else { + return AjaxResult.error(401, "你无权做这些"); + } + } + @GetMapping("/listStuYearCourseScore/{stuNo}") @ApiOperation("查询学生学年课程成绩") public TableDataInfo listStuYearCourseScore(@PathVariable("stuNo") String stuNo) { @@ -512,6 +524,21 @@ public class CphGoodApplyController extends BaseController { return success(list); } + /** + * 获取某学生指定学年的班级排名,是由前端查询的学年标签对应的学年 + * @param tag + * @return + * @author zhy + * @date 2023-09-12 11:34:10 + **/ + @GetMapping("/listOwnScoreRankByTag") + @ApiOperation("根据学年标签查询我的成绩班级排名") + public AjaxResult listOwnScoreClassRankByYear(String tag) { + String stuNo = getUsername();//学号 + List list = cphGoodApplyService.listOwnScoreClassRankByTag(stuNo,tag); + return success(list); + } + @GetMapping("/listOwnYearCourseScore") @ApiOperation("查询我的学年课程成绩") public TableDataInfo listOwnYearCourseScore() { diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/CphGoodApplyMapper.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/CphGoodApplyMapper.java index 1847072..6e162ec 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/CphGoodApplyMapper.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/CphGoodApplyMapper.java @@ -52,6 +52,14 @@ public interface CphGoodApplyMapper extends BaseMapper { public List listOwnScoreClassRank(String stuNo); + /** + * 获取某学生指定学年的班级排名,是由前端查询的学年标签对应的学年 + * @param stuNo + * @param tag + * @return + */ + public List listOwnScoreClassRankByTag(@Param("stuNo") String stuNo,@Param("tag") String tag); + public List listOwnYearCourseScore(String stuNo); public List countOwnPass(String stuNo); diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ICphBiyeApplyService.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ICphBiyeApplyService.java index e3c780a..dac4b28 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ICphBiyeApplyService.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ICphBiyeApplyService.java @@ -39,6 +39,14 @@ public interface ICphBiyeApplyService extends IService { public AjaxResult listStuSportScore(String stuNo); + /** + * 根据学年标签绑定的学年获取学生运动成绩 + * @param stuNo + * @param tag + * @return + */ + public AjaxResult listStuSportScore(String stuNo, String tag); + List listOwnApply(); List listView(CphSearch param); diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ICphGoodApplyService.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ICphGoodApplyService.java index a6791b3..c3f3b68 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ICphGoodApplyService.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ICphGoodApplyService.java @@ -57,6 +57,8 @@ public interface ICphGoodApplyService extends IService { public List listOwnScoreClassRank(String stuNo); + public List listOwnScoreClassRankByTag(String stuNo,String tag); + public List listOwnYearCourseScore(String stuNo); public List countOwnPass(String stuNo); diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphBiyeApplyServiceImpl.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphBiyeApplyServiceImpl.java index 1ddb620..650fa54 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphBiyeApplyServiceImpl.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphBiyeApplyServiceImpl.java @@ -70,25 +70,69 @@ public class CphBiyeApplyServiceImpl extends ServiceImpl yearQueryWrapper = new QueryWrapper<>(); - yearQueryWrapper.eq("status",1); + yearQueryWrapper.eq("status",1); //获取当前启用的学年 List nowYear = _yearMapper.selectList(yearQueryWrapper); - + // 提取当前学年ID列表 List nowYearId = new ArrayList<>(); nowYear.forEach(x->{ - nowYearId.add(x.getId()); + nowYearId.add(x.getId());//将当前启用的学年id加入集合中 }); - + // 构建联表查询条件 MPJLambdaWrapper query = JoinWrappers.lambda(CphTotalScore.class) .selectAll(CphTotalScore.class) .selectAs(SrsStuYear::getStuYearName,CphTotalScoreStuYearName::getStuYearName) .leftJoin(SrsStuYear.class,SrsStuYear::getId,CphTotalScore::getStuYearId) .eq(CphTotalScore::getStuNo,stuNo); if(nowYearId.size() != 0){ - query.notIn(CphTotalScore::getStuYearId,nowYearId); + query.notIn(CphTotalScore::getStuYearId,nowYearId);//排除当前启用的学年id,也就是排除当前启用学年(大三学年)的体测成绩 + } + + List list = _totalMapper.selectJoinList(CphTotalScoreStuYearName.class, query); + + return AjaxResult.success(list); + }catch(Exception ex){ + return AjaxResult.error(ex.getMessage()); + } + } + /** + * 获取获取体测成绩 + * @param stuNo + * @return + */ + @Override + public AjaxResult listStuSportScore(String stuNo,String tag){ + try{ + /*这里不需要适应学年标签的原因是： + 水利水电职业技术学院在大三学年是不需要体测的,所以在申请各类奖项时查询的是往年(大一,大二)的体测成绩作为参考 + */ + // + List yearsByTag = _yearMapper.selectYearsByTag(tag); + // 提取当前学年ID列表 + List tagYearId = new ArrayList<>(); + yearsByTag.forEach(x->{ + tagYearId.add(x.getId());//将当前启用的学年id加入集合中 + }); + // 构建联表查询条件 + MPJLambdaWrapper query = JoinWrappers.lambda(CphTotalScore.class) + .selectAll(CphTotalScore.class) + .selectAs(SrsStuYear::getStuYearName,CphTotalScoreStuYearName::getStuYearName) + .leftJoin(SrsStuYear.class,SrsStuYear::getId,CphTotalScore::getStuYearId) + .eq(CphTotalScore::getStuNo,stuNo); + if(tagYearId.size() != 0){ + query.notIn(CphTotalScore::getStuYearId,tagYearId);//排除当前启用的学年id,也就是排除当前标签绑定的学年(大三学年)的体测成绩 } List list = _totalMapper.selectJoinList(CphTotalScoreStuYearName.class, query); diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphGoodApplyServiceImpl.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphGoodApplyServiceImpl.java index 81c82cb..6c72350 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphGoodApplyServiceImpl.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphGoodApplyServiceImpl.java @@ -371,6 +371,17 @@ public class CphGoodApplyServiceImpl extends ServiceImpl listOwnScoreClassRankByTag(String stuNo,String tag) { + return cphGoodApplyMapper.listOwnScoreClassRankByTag(stuNo,tag); + } + @Override public CphClassRankScore getOwnRankByCode(CphSearch param) { return cphGoodApplyMapper.getOwnRankByCode(param); @@ -659,15 +670,27 @@ public class CphGoodApplyServiceImpl extends ServiceImpl yearQuery = new QueryWrapper<>(); + /*QueryWrapper yearQuery = new QueryWrapper<>(); yearQuery.eq("status", 1) .orderByDesc("id") .last("limit 1"); - SrsStuYear year = _yearMapper.selectOne(yearQuery); - if(year == null){ + SrsStuYear year = _yearMapper.selectOne(yearQuery);*/ + /*if(year == null){ throw new RuntimeException("当前未开启学年"); - } + }*/ + /* 此处使用硬编码，请根据实际情况修改。 + 当前功能是获取'评优评先---PYPS'标签对应的学年。 + 涉及到学年标签字典module_tag，需要在字典管理中查询对应的信息。 + 如果在字典管理更改了 学年标签 的信息，此处也要进行相应修改。 + ---尽量避免学年标签字典的更改!!!! */ + //使用学年标签筛选学年 + String yearTag = "PYPS";//<---评优评先 学年标签 + List yearList = _yearMapper.selectYearsByTag(yearTag); + SrsStuYear year = yearList.get(0); + if(!year.getModuleTags().contains("PYPS")){ + throw new RuntimeException("当前学年未关联到评优评先标签!"); + } //类型 CphOwnGoodType cphOwnGoodType = new LambdaQueryChainWrapper<>(cphOwnGoodTypeMapper) .like(CphOwnGoodType::getTypeCode, "SHXS") @@ -728,7 +751,8 @@ public class CphGoodApplyServiceImpl extends ServiceImpl classIdInfo = srsCqScoreMapper.cphTotalScoreClassIdInfo(stuNo);//班级id cphSearch2.setClassId(Long.valueOf(classIdInfo.get(0).toString())); List cphTotalScoreInfos1 = srsCqScoreMapper.classData(cphSearch2); - List cphClassRankScores = cphGoodApplyMapper.listOwnScoreClassRank(stuNo); + //根据标签 PYPS 对应的学年获取班级排名 + List cphClassRankScores = cphGoodApplyMapper.listOwnScoreClassRankByTag(stuNo,yearTag); BigDecimal size = new BigDecimal(cphTotalScoreInfos1.size()); BigDecimal multiplier = new BigDecimal("0.3"); BigDecimal v = size.multiply(multiplier);//计算排名前30% @@ -765,13 +789,25 @@ public class CphGoodApplyServiceImpl extends ServiceImpl yearQuery = new QueryWrapper<>(); + /*QueryWrapper yearQuery = new QueryWrapper<>(); yearQuery.eq("status","1") .last("limit 1"); SrsStuYear year = _yearMapper.selectOne(yearQuery); - if(year == null){ throw new RuntimeException("当前未开启学年"); + }*/ + + /* 此处使用硬编码，请根据实际情况修改。 + 当前功能是获取'评优评先---PYPS'标签对应的学年。 + 涉及到学年标签字典module_tag，需要在字典管理中查询对应的信息。 + 如果在字典管理更改了 学年标签 的信息，此处也要进行相应修改。 + ---尽量避免学年标签字典的更改!!!! */ + //使用学年标签筛选学年 + String yearTag = "PYPS";//<---评优评先 学年标签 + List yearList = _yearMapper.selectYearsByTag(yearTag); + SrsStuYear year = yearList.get(0); + if(!year.getModuleTags().contains("PYPS")){ + throw new RuntimeException("当前学年未关联到评优评先标签!"); } QueryWrapper typeQuery = new QueryWrapper<>(); @@ -852,7 +888,8 @@ public class CphGoodApplyServiceImpl extends ServiceImpl classIdInfo = srsCqScoreMapper.cphTotalScoreClassIdInfo(stuNo);//班级id cphSearch2.setClassId(Long.valueOf(classIdInfo.get(0).toString())); List cphTotalScoreInfos1 = srsCqScoreMapper.classData(cphSearch2); - List cphClassRankScores = cphGoodApplyMapper.listOwnScoreClassRank(stuNo); + //根据学年标签 PYPS 查询排名 + List cphClassRankScores = cphGoodApplyMapper.listOwnScoreClassRankByTag(stuNo,yearTag); BigDecimal size = new BigDecimal(cphTotalScoreInfos1.size()); BigDecimal multiplier = new BigDecimal("0.3"); BigDecimal v = size.multiply(multiplier);//计算排名前30% @@ -977,17 +1014,33 @@ public class CphGoodApplyServiceImpl extends ServiceImpl yearQuery = new QueryWrapper<>(); + /*QueryWrapper yearQuery = new QueryWrapper<>(); yearQuery.eq("status","1") .last("limit 1"); SrsStuYear year = _yearMapper.selectOne(yearQuery); - if(year == null){ throw new RuntimeException("当前未开启学年"); + }*/ + /* 此处使用硬编码，请根据实际情况修改。 + 当前功能是获取'评优评先---PYPS'标签对应的学年。 + 涉及到学年标签字典module_tag，需要在字典管理中查询对应的信息。 + 如果在字典管理更改了 学年标签 的信息，此处也要进行相应修改。 + ---尽量避免学年标签字典的更改!!!! */ + //使用学年标签筛选学年 + String yearTag = "PYPS";//<---评优评先 学年标签 + List yearList = _yearMapper.selectYearsByTag(yearTag); + SrsStuYear year = yearList.get(0); + if(!year.getModuleTags().contains("PYPS")){ + throw new RuntimeException("当前学年未关联到评优评先标签!"); } + String stuNo = getUsername(); //查找该学生个人信息 CphOwnGoodType cphOwnGoodType = new LambdaQueryChainWrapper<>(cphOwnGoodTypeMapper) @@ -997,7 +1050,7 @@ public class CphGoodApplyServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("stu_no",stuNo); ViewStuInfo srsStudent = viewStuInfoMapper.selectOne(queryWrapper); - if (cphOwnGoodType == null) return AjaxResult.error("该项目不存在，请联系管理员"); + if (cphOwnGoodType == null) return AjaxResult.error("该学年对应的项目不存在或者未开放，请联系管理员"); CphSearch cphSearch = new CphSearch(); cphSearch.setMajorId(srsStudent.getMajorId()); @@ -1045,7 +1098,8 @@ public class CphGoodApplyServiceImpl extends ServiceImpl classIdInfo = srsCqScoreMapper.cphTotalScoreClassIdInfo(stuNo);//班级id cphSearch2.setClassId(Long.valueOf(classIdInfo.get(0).toString())); List cphTotalScoreInfos1 = srsCqScoreMapper.classData(cphSearch2); - List cphClassRankScores = cphGoodApplyMapper.listOwnScoreClassRank(stuNo); + //根据学年标签 PYPS 查询该班级的排名 + List cphClassRankScores = cphGoodApplyMapper.listOwnScoreClassRankByTag(stuNo,yearTag); BigDecimal size = new BigDecimal(cphTotalScoreInfos1.size()); BigDecimal multiplier = new BigDecimal("0.40"); BigDecimal v = size.multiply(multiplier);//计算排名前30% @@ -1068,18 +1122,33 @@ public class CphGoodApplyServiceImpl extends ServiceImpl yearQuery = new QueryWrapper<>(); + /*QueryWrapper yearQuery = new QueryWrapper<>(); yearQuery.eq("status",1) .orderByDesc("id") .last("limit 1"); - SrsStuYear year = _yearMapper.selectOne(yearQuery); - if(year == null){ - throw new RuntimeException("学年未开启"); + SrsStuYear year = _yearMapper.selectOne(yearQuery);*/ + /* 此处使用硬编码，请根据实际情况修改。 + 当前功能是获取'评优评先---PYPS'标签对应的学年。 + 涉及到学年标签字典module_tag，需要在字典管理中查询对应的信息。 + 如果在字典管理更改了 学年标签 的信息，此处也要进行相应修改。 + ---尽量避免学年标签字典的更改!!!! */ + //使用学年标签筛选学年 + String yearTag = "PYPS";//<---评优评先 学年标签 + List yearList = _yearMapper.selectYearsByTag(yearTag); + SrsStuYear year = yearList.get(0); + if(!year.getModuleTags().contains("PYPS")){ + throw new RuntimeException("当前学年未关联到评优评先标签!"); } + QueryWrapper typeQuery = new QueryWrapper<>(); typeQuery.like("type_code","YXXSGB") .eq("stu_year_id",year.getId()) diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphLakeApplyServiceImpl.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphLakeApplyServiceImpl.java index ea8e0db..ff0d2a3 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphLakeApplyServiceImpl.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphLakeApplyServiceImpl.java @@ -277,7 +277,7 @@ public class CphLakeApplyServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("stu_no",getUsername()) .eq("stu_year_id",param.getStuYearId()); diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/KnzzGlApplyServiceImpl.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/KnzzGlApplyServiceImpl.java index 9aa3738..cc6a7a1 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/KnzzGlApplyServiceImpl.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/KnzzGlApplyServiceImpl.java @@ -35,6 +35,8 @@ public class KnzzGlApplyServiceImpl extends ServiceImpl yearQuery = new QueryWrapper<>(); + /*QueryWrapper yearQuery = new QueryWrapper<>(); yearQuery.eq("status","1"); yearQuery.last("limit 1"); - SrsStuYear year = _yearMapper.selectOne(yearQuery); - if(year == null){ - throw new Exception("当前学年未启用"); + SrsStuYear year = _yearMapper.selectOne(yearQuery);*/ + + /* 此处使用硬编码，请根据实际情况修改。 + 当前页面的功能是获取'国家励志奖学金---NLZJ'标签对应的学年信息。 + 涉及到学年标签字典module_tag，需要在字典管理中查询对应的信息。 + 如果在字典管理更改了 学年标签 的信息，此处也要进行相应修改。 + 尽量避免学年标签字典的更改!!!! */ + List yearList = _yearMapper.selectYearsByTag("NLZJ"); + + SrsStuYear year = yearList.get(0); + if(!year.getModuleTags().contains("TSKN")){ + throw new Exception("当前学年未关联到国家励志奖学金标签!"); } + Long yearId = year.getId(); QueryWrapper applyQuery = new QueryWrapper<>(); applyQuery.eq("stu_no",stuNo); - applyQuery.eq("stu_year_id",year.getId()); + applyQuery.eq("stu_year_id",yearId); List applyList = knzzGlApplyMapper.selectList(applyQuery); if(applyList!= null && !applyList.isEmpty()){ throw new Exception("当前学年已提交申请"); diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/KnzzTufaApplyServiceImpl.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/KnzzTufaApplyServiceImpl.java index 66984c6..a56dd8d 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/KnzzTufaApplyServiceImpl.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/KnzzTufaApplyServiceImpl.java @@ -36,6 +36,8 @@ public class KnzzTufaApplyServiceImpl extends ServiceImpl yearQuery = new QueryWrapper<>(); + /*QueryWrapper yearQuery = new QueryWrapper<>(); yearQuery.eq("status","1"); yearQuery.last("limit 1"); - SrsStuYear year = _yearMapper.selectOne(yearQuery); - if(year == null){ - throw new Exception("当前学年未启用"); + SrsStuYear year = _yearMapper.selectOne(yearQuery);*/ + + /* 此处使用硬编码，请根据实际情况修改。 + 当前页面的功能是获取'学生特殊困难资助---TSKN'标签对应的学年信息。 + 涉及到学年标签字典module_tag，需要在字典管理中查询对应的信息。 + 如果在字典管理更改了 学年标签 的信息，此处也要进行相应修改。 + 尽量避免学年标签字典的更改!!!!*/ + List yearList = srsStuYearMapper.selectYearsByTag("TSKN");// 此处使用硬编码，请根据实际情况修改。 + SrsStuYear year = yearList.get(0); + + if(!year.getModuleTags().contains("TSKN")){ + throw new Exception("当前学年未关联到学生特殊困难资助标签!"); } QueryWrapper applyQuery = new QueryWrapper<>(); @@ -353,10 +364,20 @@ public class KnzzTufaApplyServiceImpl extends ServiceImpl year = srsStuYearMapper.selectYearsByTag("KNRD"); + //获取对应的学年id + Long yearId = year.get(0).getId(); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("xh",getUsername()); queryWrapper.in("step", "3", "4", "5"); - queryWrapper.eq("stu_year_id", "13"); + queryWrapper.eq("stu_year_id", yearId); queryWrapper.last("limit 1"); SrsKnrdApply srsKnrdApply = _knrdApplyMapper.selectOne(queryWrapper); if(srsKnrdApply == null){ diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/KnzzZsgApplyServiceImpl.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/KnzzZsgApplyServiceImpl.java index 2c84fe8..0efb364 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/KnzzZsgApplyServiceImpl.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/KnzzZsgApplyServiceImpl.java @@ -264,12 +264,20 @@ public class KnzzZsgApplyServiceImpl extends ServiceImpl yearQuery = new QueryWrapper<>(); + /*QueryWrapper yearQuery = new QueryWrapper<>(); yearQuery.eq("status","1"); yearQuery.last("limit 1"); - SrsStuYear year = _yearMapper.selectOne(yearQuery); - if(year == null){ - throw new Exception("当前学年未启用"); + SrsStuYear year = _yearMapper.selectOne(yearQuery);*/ + + /* 此处使用硬编码，请根据实际情况修改。 + 当前页面的功能是获取'中职升高职困难学生学费补助---GZKN'标签对应的学年信息。 + 涉及到学年标签字典module_tag，需要在字典管理中查询对应的信息。 + 如果在字典管理更改了 学年标签 的信息，此处也要进行相应修改。 + ---尽量避免学年标签字典的更改!!!! */ + List yearList = _yearMapper.selectYearsByTag("GZKN"); + SrsStuYear year = yearList.get(0); + if(!year.getModuleTags().contains("GZKN")){ + throw new Exception("当前学年未关联到中职升高职困难学生学费补助标签!"); } QueryWrapper applyQuery = new QueryWrapper<>(); diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/KnzzZzqApplyServiceImpl.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/KnzzZzqApplyServiceImpl.java index adaafb5..03e38b8 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/KnzzZzqApplyServiceImpl.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/KnzzZzqApplyServiceImpl.java @@ -276,12 +276,20 @@ public class KnzzZzqApplyServiceImpl extends ServiceImpl yearQuery = new QueryWrapper<>(); + /*QueryWrapper yearQuery = new QueryWrapper<>(); yearQuery.eq("status","1"); yearQuery.last("limit 1"); - SrsStuYear year = _yearMapper.selectOne(yearQuery); - if(year == null){ - throw new Exception("当前学年未启用"); + SrsStuYear year = _yearMapper.selectOne(yearQuery);*/ + + /* 此处使用硬编码，请根据实际情况修改。 + 当前功能是获取'自治区人民政府奖学金---RMZF'标签对应的学年信息。 + 涉及到学年标签字典module_tag，需要在字典管理中查询对应的信息。 + 如果在字典管理更改了 学年标签 的信息，此处也要进行相应修改。 + ---尽量避免学年标签字典的更改!!!! */ + List yearList = _yearMapper.selectYearsByTag("RMZF"); + SrsStuYear year = yearList.get(0); + if(!year.getModuleTags().contains("RMZF")){ + throw new Exception("当前学年未关联到自治区人民政府奖学金标签!"); } QueryWrapper applyQuery = new QueryWrapper<>(); diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsKnrdApplyServiceImpl.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsKnrdApplyServiceImpl.java index 1052b26..83f040b 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsKnrdApplyServiceImpl.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsKnrdApplyServiceImpl.java @@ -163,7 +163,6 @@ public class SrsKnrdApplyServiceImpl implements ISrsKnrdApplyService { }else if(step == 0){ //新增记录 - record.setStep(0L); diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/CphGoodApplyMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/CphGoodApplyMapper.xml index dfd25a4..ee4e313 100644 --- a/srs-comprehensive/src/main/resources/mapper/comprehensive/CphGoodApplyMapper.xml +++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/CphGoodApplyMapper.xml @@ -87,6 +87,31 @@ left join srs_class as sc on ss.class_id = sc.class_id + +