xgxt_sd/zhxg_java
16
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-12-24 12:57:43 +08:00
parent 594c88924d dbd6ebfd2e
commit 7eea23df7e
15 changed files with 301 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphBiyeApplyController.java
View File

@@ -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("获取我的体测成绩")

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

@@ -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<CphClassRankScore> 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<CphClassRankScore> list = cphGoodApplyService.listOwnScoreClassRankByTag(stuNo,tag);
return success(list);
}
@GetMapping("/listOwnYearCourseScore")
@ApiOperation("查询我的学年课程成绩")
public TableDataInfo listOwnYearCourseScore() {

8
srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/CphGoodApplyMapper.java
View File

@@ -52,6 +52,14 @@ public interface CphGoodApplyMapper extends BaseMapper<CphGoodApply> {
public List<CphClassRankScore> listOwnScoreClassRank(String stuNo);
/**
* 获取某学生指定学年的班级排名,是由前端查询的学年标签对应的学年
* @param stuNo
* @param tag
* @return
*/
public List<CphClassRankScore> listOwnScoreClassRankByTag(@Param("stuNo") String stuNo,@Param("tag") String tag);
public List<CphCourseNameScore> listOwnYearCourseScore(String stuNo);
public List<CphCoursePassCount> countOwnPass(String stuNo);

8
srs-comprehensive/src/main/java/com/srs/comprehensive/service/ICphBiyeApplyService.java
View File

@@ -39,6 +39,14 @@ public interface ICphBiyeApplyService extends IService<CphBiyeApply> {
public AjaxResult listStuSportScore(String stuNo);
/**
* 根据学年标签绑定的学年获取学生运动成绩
* @param stuNo
* @param tag
* @return
*/
public AjaxResult listStuSportScore(String stuNo, String tag);
List<CphBiyeApplyVo> listOwnApply();
List<CphBiyeApplyVo> listView(CphSearch param);

2
srs-comprehensive/src/main/java/com/srs/comprehensive/service/ICphGoodApplyService.java
View File

@@ -57,6 +57,8 @@ public interface ICphGoodApplyService extends IService<CphGoodApply> {
public List<CphClassRankScore> listOwnScoreClassRank(String stuNo);
public List<CphClassRankScore> listOwnScoreClassRankByTag(String stuNo,String tag);
public List<CphCourseNameScore> listOwnYearCourseScore(String stuNo);
public List<CphCoursePassCount> countOwnPass(String stuNo);

54
srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphBiyeApplyServiceImpl.java
View File

@@ -70,25 +70,69 @@ public class CphBiyeApplyServiceImpl extends ServiceImpl<CphBiyeApplyMapper,CphB
}
}
/**
* 获取获取体测成绩
* @param stuNo
* @return
*/
@Override
public AjaxResult listStuSportScore(String stuNo){
try{
/*这里不需要适应学年标签的原因是：
水利水电职业技术学院在大三学年是不需要体测的,所以在申请各类奖项时查询的是往年(大一,大二)的体测成绩作为参考
*/
// 查询当前开启的学年
QueryWrapper<SrsStuYear> yearQueryWrapper = new QueryWrapper<>();
yearQueryWrapper.eq("status",1);
yearQueryWrapper.eq("status",1); //获取当前启用的学年
List<SrsStuYear> nowYear = _yearMapper.selectList(yearQueryWrapper);
// 提取当前学年ID列表
List<Long> nowYearId = new ArrayList<>();
nowYear.forEach(x->{
nowYearId.add(x.getId());
nowYearId.add(x.getId());//将当前启用的学年id加入集合中
});
// 构建联表查询条件
MPJLambdaWrapper<CphTotalScore> 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<CphTotalScoreStuYearName> 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<SrsStuYear> yearsByTag = _yearMapper.selectYearsByTag(tag);
// 提取当前学年ID列表
List<Long> tagYearId = new ArrayList<>();
yearsByTag.forEach(x->{
tagYearId.add(x.getId());//将当前启用的学年id加入集合中
});
// 构建联表查询条件
MPJLambdaWrapper<CphTotalScore> 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<CphTotalScoreStuYearName> list = _totalMapper.selectJoinList(CphTotalScoreStuYearName.class, query);

101
srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphGoodApplyServiceImpl.java
View File

@@ -371,6 +371,17 @@ public class CphGoodApplyServiceImpl extends ServiceImpl<CphGoodApplyMapper, Cph
return cphGoodApplyMapper.listOwnScoreClassRank(stuNo);
}
/**
* 获取某学生指定学年的班级排名,是由前端查询的学年标签对应的学年
* @param stuNo
* @param tag
* @return
*/
@Override
public List<CphClassRankScore> 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<CphGoodApplyMapper, Cph
//验证申请三好学生资格
public boolean verifyApplySHXS() {
String stuNo = getUsername();//用户
QueryWrapper<SrsStuYear> yearQuery = new QueryWrapper<>();
/*QueryWrapper<SrsStuYear> 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<SrsStuYear> 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<CphGoodApplyMapper, Cph
List<Integer> classIdInfo = srsCqScoreMapper.cphTotalScoreClassIdInfo(stuNo);//班级id
cphSearch2.setClassId(Long.valueOf(classIdInfo.get(0).toString()));
List<CphTotalScoreInfo> cphTotalScoreInfos1 = srsCqScoreMapper.classData(cphSearch2);
List<CphClassRankScore> cphClassRankScores = cphGoodApplyMapper.listOwnScoreClassRank(stuNo);
//根据标签 PYPS 对应的学年获取班级排名
List<CphClassRankScore> 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<CphGoodApplyMapper, Cph
@Override
@Transactional(rollbackFor = Exception.class)
public boolean applySHXS(CphApplySHXS cphApplySHXS) {
QueryWrapper<SrsStuYear> yearQuery = new QueryWrapper<>();
/*QueryWrapper<SrsStuYear> 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<SrsStuYear> yearList = _yearMapper.selectYearsByTag(yearTag);
SrsStuYear year = yearList.get(0);
if(!year.getModuleTags().contains("PYPS")){
throw new RuntimeException("当前学年未关联到评优评先标签!");
}
QueryWrapper<CphOwnGoodType> typeQuery = new QueryWrapper<>();
@@ -852,7 +888,8 @@ public class CphGoodApplyServiceImpl extends ServiceImpl<CphGoodApplyMapper, Cph
List<Integer> classIdInfo = srsCqScoreMapper.cphTotalScoreClassIdInfo(stuNo);//班级id
cphSearch2.setClassId(Long.valueOf(classIdInfo.get(0).toString()));
List<CphTotalScoreInfo> cphTotalScoreInfos1 = srsCqScoreMapper.classData(cphSearch2);
List<CphClassRankScore> cphClassRankScores = cphGoodApplyMapper.listOwnScoreClassRank(stuNo);
//根据学年标签 PYPS 查询排名
List<CphClassRankScore> 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<CphGoodApplyMapper, Cph
@Autowired
private ViewStuInfoMapper viewStuInfoMapper;
/**
* 验证优秀干部申请
* @return
*/
@Override
public AjaxResult verifyApplyYXGB() {
QueryWrapper<SrsStuYear> yearQuery = new QueryWrapper<>();
/*QueryWrapper<SrsStuYear> 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<SrsStuYear> 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<CphGoodApplyMapper, Cph
QueryWrapper<ViewStuInfo> 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<CphGoodApplyMapper, Cph
List<Integer> classIdInfo = srsCqScoreMapper.cphTotalScoreClassIdInfo(stuNo);//班级id
cphSearch2.setClassId(Long.valueOf(classIdInfo.get(0).toString()));
List<CphTotalScoreInfo> cphTotalScoreInfos1 = srsCqScoreMapper.classData(cphSearch2);
List<CphClassRankScore> cphClassRankScores = cphGoodApplyMapper.listOwnScoreClassRank(stuNo);
//根据学年标签 PYPS 查询该班级的排名
List<CphClassRankScore> 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<CphGoodApplyMapper, Cph
return AjaxResult.success("验证成功");
}
/**
* 提交优秀干部申请
* @param cphApplyYxgb
* @return
*/
@Transactional
@Override
public AjaxResult reApplyYxgb(CphApplyYxgb cphApplyYxgb) {
QueryWrapper<SrsStuYear> yearQuery = new QueryWrapper<>();
/*QueryWrapper<SrsStuYear> 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<SrsStuYear> yearList = _yearMapper.selectYearsByTag(yearTag);
SrsStuYear year = yearList.get(0);
if(!year.getModuleTags().contains("PYPS")){
throw new RuntimeException("当前学年未关联到评优评先标签!");
}
QueryWrapper<CphOwnGoodType> typeQuery = new QueryWrapper<>();
typeQuery.like("type_code","YXXSGB")
.eq("stu_year_id",year.getId())

2
srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphLakeApplyServiceImpl.java
View File

@@ -277,7 +277,7 @@ public class CphLakeApplyServiceImpl extends ServiceImpl<CphLakeApplyMapper,CphL
param.setApplyTime(getNowDate());
param.setCreateTime(getNowDate());
param.setCreateBy(getUsername());
//TODO
QueryWrapper<CphTotalScore> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("stu_no",getUsername())
.eq("stu_year_id",param.getStuYearId());

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

@@ -35,6 +35,8 @@ public class KnzzGlApplyServiceImpl extends ServiceImpl<KnzzGlApplyMapper,KnzzGl
@Autowired
private SrsStuYearMapper _yearMapper;
@Override
public AjaxResult doReApply(KnzzGlApply param){
try{
@@ -289,17 +291,27 @@ public class KnzzGlApplyServiceImpl extends ServiceImpl<KnzzGlApplyMapper,KnzzGl
param.stuNo = getUsername();
param.setCreateTime(getNowDate());
param.setCreateBy(getUsername());
QueryWrapper<SrsStuYear> yearQuery = new QueryWrapper<>();
/*QueryWrapper<SrsStuYear> 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<SrsStuYear> yearList = _yearMapper.selectYearsByTag("NLZJ");
SrsStuYear year = yearList.get(0);
if(!year.getModuleTags().contains("TSKN")){
throw new Exception("当前学年未关联到国家励志奖学金标签!");
}
Long yearId = year.getId();
QueryWrapper<KnzzGlApply> applyQuery = new QueryWrapper<>();
applyQuery.eq("stu_no",stuNo);
applyQuery.eq("stu_year_id",year.getId());
applyQuery.eq("stu_year_id",yearId);
List<KnzzGlApply> applyList = knzzGlApplyMapper.selectList(applyQuery);
if(applyList!= null && !applyList.isEmpty()){
throw new Exception("当前学年已提交申请");

31
srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/KnzzTufaApplyServiceImpl.java
View File

@@ -36,6 +36,8 @@ public class KnzzTufaApplyServiceImpl extends ServiceImpl<KnzzTufaApplyMapper,Kn
@Autowired
private SrsStuYearMapper _yearMapper;
@Autowired
private SrsStuYearMapper srsStuYearMapper;
@Override
public AjaxResult doReApply(KnzzTufaApply param){
@@ -300,12 +302,21 @@ public class KnzzTufaApplyServiceImpl extends ServiceImpl<KnzzTufaApplyMapper,Kn
try{
String stuNo = getUsername();
QueryWrapper<SrsStuYear> yearQuery = new QueryWrapper<>();
/*QueryWrapper<SrsStuYear> 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<SrsStuYear> yearList = srsStuYearMapper.selectYearsByTag("TSKN");// 此处使用硬编码，请根据实际情况修改。
SrsStuYear year = yearList.get(0);
if(!year.getModuleTags().contains("TSKN")){
throw new Exception("当前学年未关联到学生特殊困难资助标签!");
}
QueryWrapper<KnzzTufaApply> applyQuery = new QueryWrapper<>();
@@ -353,10 +364,20 @@ public class KnzzTufaApplyServiceImpl extends ServiceImpl<KnzzTufaApplyMapper,Kn
@Override
public AjaxResult getOwnKnrd(){
try{
/* 此处使用硬编码，请根据实际情况修改。
当前页面的功能是获取'困难认定---KNRD'标签对应的学年信息。
涉及到学年标签字典module_tag，需要在字典管理中查询对应的信息。
如果在字典管理更改了 学年标签 的信息，此处也要进行相应修改。
尽量避免学年标签字典的更改!!!!*/
//获取 困难认定 标签对应的学年
List<SrsStuYear> year = srsStuYearMapper.selectYearsByTag("KNRD");
//获取对应的学年id
Long yearId = year.get(0).getId();
QueryWrapper<SrsKnrdApply> 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){

16
srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/KnzzZsgApplyServiceImpl.java
View File

@@ -264,12 +264,20 @@ public class KnzzZsgApplyServiceImpl extends ServiceImpl<KnzzZsgApplyMapper,Knzz
param.stuNo = getUsername();
param.setCreateTime(getNowDate());
param.setCreateBy(getUsername());
QueryWrapper<SrsStuYear> yearQuery = new QueryWrapper<>();
/*QueryWrapper<SrsStuYear> 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<SrsStuYear> yearList = _yearMapper.selectYearsByTag("GZKN");
SrsStuYear year = yearList.get(0);
if(!year.getModuleTags().contains("GZKN")){
throw new Exception("当前学年未关联到中职升高职困难学生学费补助标签!");
}
QueryWrapper<KnzzZsgApply> applyQuery = new QueryWrapper<>();

16
srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/KnzzZzqApplyServiceImpl.java
View File

@@ -276,12 +276,20 @@ public class KnzzZzqApplyServiceImpl extends ServiceImpl<KnzzZzqApplyMapper,Knzz
param.stuNo = getUsername();
param.setCreateTime(getNowDate());
param.setCreateBy(getUsername());
QueryWrapper<SrsStuYear> yearQuery = new QueryWrapper<>();
/*QueryWrapper<SrsStuYear> 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<SrsStuYear> yearList = _yearMapper.selectYearsByTag("RMZF");
SrsStuYear year = yearList.get(0);
if(!year.getModuleTags().contains("RMZF")){
throw new Exception("当前学年未关联到自治区人民政府奖学金标签!");
}
QueryWrapper<KnzzZzqApply> applyQuery = new QueryWrapper<>();

1
srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsKnrdApplyServiceImpl.java
View File

@@ -163,7 +163,6 @@ public class SrsKnrdApplyServiceImpl implements ISrsKnrdApplyService {
}else if(step == 0){
//新增记录
record.setStep(0L);

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

@@ -87,6 +87,31 @@
left join srs_class as sc on ss.class_id = sc.class_id
</select>
<select id="listOwnScoreClassRankByTag" resultType="com.srs.comprehensive.domain.Vo.CphClassRankScore">
select t2.* ,sc.class_name,
(select count(1) from srs_student where `status` = '01' and class_id = sc.class_id) as class_count,
(select count(1) from srs_student as f1
left join srs_class as f2 on f1.class_id = f2.class_id
where f1.`status` = '01' and f2.major_id = sc.major_id and f2.grade_id = sc.grade_id) as major_count
from
(select t1.* from (
select a.stu_no,a.stu_year_id,b.stu_year_name,a.stu_score,a.cph_score,a.sport_score,
RANK() OVER(PARTITION BY c.class_id,a.stu_year_id,d.grade_id ORDER BY a.cph_score DESC ) as cph_class_rank,
RANK() OVER(PARTITION BY c.class_id,a.stu_year_id,d.grade_id ORDER BY a.stu_score DESC ) as stu_class_rank,
RANK() OVER(PARTITION BY d.major_id,a.stu_year_id,d.grade_id ORDER BY a.stu_score DESC ) as stu_major_rank
from cph_total_score as a
left join srs_stu_year as b on a.stu_year_id = b.id
left join srs_student as c on a.stu_no = c.stu_no
left join srs_class as d on c.class_id = d.class_id
)as t1
where t1.stu_no = #{stuNo} and t1.stu_year_id in (
select id from srs_stu_year as b where b.module_tags like concat('%', #{tag}, '%')
)
)as t2
left join srs_student as ss on t2.stu_no = ss.stu_no
left join srs_class as sc on ss.class_id = sc.class_id
</select>
<select id="listOwnYearCourseScore" resultType="CphCourseNameScore">
select a.cj as course_score,b.course_name,c.term_name,d.stu_year_name,a.is_pass,sci.exam_method,a.fzlx
from cph_stu_score_middle as a

2
srs-comprehensive/src/main/resources/mapper/comprehensive/SrsStuYearMapper.xml
View File

@@ -129,7 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="SET" suffixOverrides=",">
<if test="xndm != null">xndm = #{xndm},</if>
<if test="stuYearName != null">stu_year_name = #{stuYearName},</if>
module_tags = #{moduleTags},
<if test="moduleTags != null">module_tags = #{moduleTags},</if>
<if test="startTime != null">start_time = #{startTime},</if>
<if test="endTime != null">end_time = #{endTime},</if>
<if test="delFlag != null">del_flag = #{delFlag},</if>