From 80279a0586f6215f845a14b96428c63d71be7966 Mon Sep 17 00:00:00 2001
From: zhy <17877871893@163.com>
Date: Sat, 18 Oct 2025 19:18:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=B9=B2=E6=8F=90=E4=BA=A4=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=20=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CphGoodApplyServiceImpl.java | 50 ++++++++++++++++---
 1 file changed, 42 insertions(+), 8 deletions(-)

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 417cfdb..ee81433 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
@@ -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) {