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

Compare commits

base: xgxt_sd:f994fc391ee1b14248777b34cf11dd91fa69d3ed
Branches Tags
xgxt_sd:main
...
compare: xgxt_sd:374a5087373d2e632164ba50740e37375e7c49c1
Branches Tags
xgxt_sd:main

2 Commits
f994fc391e ... 374a508737

Author SHA1 Message Date
zhy
374a508737 Merge remote-tracking branch 'origin/main' 2025-10-18 19:18:25 +08:00
zhy
80279a0586 优干提交判断 测试 2025-10-18 19:18:18 +08:00
1 changed files with 42 additions and 8 deletions
Expand all files Collapse all files

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

@@ -574,11 +574,20 @@ public class CphGoodApplyServiceImpl extends ServiceImpl<CphGoodApplyMapper, Cph
// 各科平均成绩75分以上含70分
List<CphStuScoreMiddleDto> cphStuScoreMiddleDtos = new LambdaQueryChainWrapper<>(cphStuScoreMiddleDtoMapper)
.eq(CphStuScoreMiddleDto::getStuNo, stuNo)
.eq(CphStuScoreMiddleDto::getXndm, year.xndm)
.list();
BigDecimal Grade = new BigDecimal(0);
for (CphStuScoreMiddleDto cphStuScoreMiddleDto : cphStuScoreMiddleDtos) {
BigDecimal bigDecimal = new BigDecimal(cphStuScoreMiddleDto.getCj());
Grade = Grade.add(bigDecimal);
if(cphStuScoreMiddleDto.getCj().equals("不及格")){
throw new RuntimeException("有不及格成绩，无法申请");
}
if(cphStuScoreMiddleDto.getCj().equals("及格")){
BigDecimal bigDecimal = new BigDecimal("60.00");
Grade = Grade.add(bigDecimal);
}else{
BigDecimal bigDecimal = new BigDecimal(cphStuScoreMiddleDto.getCj());
Grade = Grade.add(bigDecimal);
}
}
if (Grade.divide(new BigDecimal(cphStuScoreMiddleDtos.size()), 2, RoundingMode.HALF_UP)
.compareTo(new BigDecimal(70)) < 0) {
@@ -678,8 +687,16 @@ public class CphGoodApplyServiceImpl extends ServiceImpl<CphGoodApplyMapper, Cph
|| Objects.equals(cphStuScoreMiddleDto.getCj(), "NULL")) {
continue;
}
BigDecimal bigDecimal = new BigDecimal(cphStuScoreMiddleDto.getCj());
Grade = Grade.add(bigDecimal);
if(cphStuScoreMiddleDto.getCj().equals("不及格")){
throw new RuntimeException("有不及格成绩，无法申请");
}
if(cphStuScoreMiddleDto.getCj().equals("及格")){
BigDecimal bigDecimal = new BigDecimal("60.00");
Grade = Grade.add(bigDecimal);
}else{
BigDecimal bigDecimal = new BigDecimal(cphStuScoreMiddleDto.getCj());
Grade = Grade.add(bigDecimal);
}
}
if (Grade.divide(new BigDecimal(cphStuScoreMiddleDtos.size()), 2, RoundingMode.HALF_UP)
.compareTo(new BigDecimal(75)) < 0) {
@@ -784,6 +801,7 @@ public class CphGoodApplyServiceImpl extends ServiceImpl<CphGoodApplyMapper, Cph
// 各科平均成绩75分以上含75分
LambdaQueryWrapper<CphStuScoreMiddleDto> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(CphStuScoreMiddleDto::getStuNo, stuNo);
queryWrapper.eq(CphStuScoreMiddleDto::getXndm, year.getXndm());
List<CphStuScoreMiddleDto> cphStuScoreMiddleDtos = cphStuScoreMiddleDtoMapper
.selectList(queryWrapper);
BigDecimal Grade = new BigDecimal(0);
@@ -794,8 +812,16 @@ public class CphGoodApplyServiceImpl extends ServiceImpl<CphGoodApplyMapper, Cph
|| Objects.equals(cphStuScoreMiddleDto.getCj(), "NULL")) {
continue;
}
BigDecimal bigDecimal = new BigDecimal(cphStuScoreMiddleDto.getCj());
Grade = Grade.add(bigDecimal);
if(cphStuScoreMiddleDto.getCj().equals("不及格")){
throw new RuntimeException("有不及格成绩，无法申请");
}
if(cphStuScoreMiddleDto.getCj().equals("及格")){
BigDecimal bigDecimal = new BigDecimal("60.00");
Grade = Grade.add(bigDecimal);
}else{
BigDecimal bigDecimal = new BigDecimal(cphStuScoreMiddleDto.getCj());
Grade = Grade.add(bigDecimal);
}
}
if (Grade.divide(new BigDecimal(cphStuScoreMiddleDtos.size()), 2, RoundingMode.HALF_UP)
.compareTo(new BigDecimal(75)) < 0) {
@@ -993,8 +1019,16 @@ public class CphGoodApplyServiceImpl extends ServiceImpl<CphGoodApplyMapper, Cph
.list();
BigDecimal Grade = new BigDecimal(0);
for (CphStuScoreMiddleDto cphStuScoreMiddleDto : cphStuScoreMiddleDtos) {
BigDecimal bigDecimal = new BigDecimal(cphStuScoreMiddleDto.getCj());
Grade = Grade.add(bigDecimal);
if(cphStuScoreMiddleDto.getCj().equals("不及格")){
throw new RuntimeException("有不及格成绩，无法申请");
}
if(cphStuScoreMiddleDto.getCj().equals("及格")){
BigDecimal bigDecimal = new BigDecimal("60.00");
Grade = Grade.add(bigDecimal);
}else{
BigDecimal bigDecimal = new BigDecimal(cphStuScoreMiddleDto.getCj());
Grade = Grade.add(bigDecimal);
}
}
if (Grade.divide(new BigDecimal(cphStuScoreMiddleDtos.size()), 2, RoundingMode.HALF_UP)
.compareTo(new BigDecimal(70)) < 0) {