From ef7df4d9fc18f8dc4aa29fb3073a92ea76159efd Mon Sep 17 00:00:00 2001
From: xiaoCJ <406612557@qq.com>
Date: Mon, 18 Nov 2024 16:38:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=99=E8=82=B2=E8=A7=84?=
 =?UTF-8?q?=E5=88=92=E6=8F=90=E4=BA=A4=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CaseServiceImpl.java         | 102 ++++++++++--------
 1 file changed, 60 insertions(+), 42 deletions(-)

diff --git a/src/main/java/com/sztzjy/money_management/service/impl/CaseServiceImpl.java b/src/main/java/com/sztzjy/money_management/service/impl/CaseServiceImpl.java
index 9273bcc..fa1cd84 100644
--- a/src/main/java/com/sztzjy/money_management/service/impl/CaseServiceImpl.java
+++ b/src/main/java/com/sztzjy/money_management/service/impl/CaseServiceImpl.java
@@ -2093,13 +2093,16 @@ public class CaseServiceImpl implements CaseService {
             }//A目前学费
             if (stuData.getaTuition() == null || stuData.getaTuition().compareTo(rightData.getaTuition()) != 0) {
                 wrongCount += 1;
-            }//A上学时学费
-            if (stuData.getaEduTuition() == null || stuData.getaEduTuition().compareTo(rightData.getaEduTuition()) != 0) {
-                wrongCount += 1;
-            }//A上学前需准备的总学费
-            if (stuData.getaTotalTuition() == null || stuData.getaTotalTuition().compareTo(rightData.getaTotalTuition()) != 0) {
-                wrongCount += 1;
-            }//B求学年龄
+            }
+            //A上学时学费
+//            if (stuData.getaEduTuition() == null || stuData.getaEduTuition().compareTo(rightData.getaEduTuition()) != 0) {
+//                wrongCount += 1;
+//            }
+            //A上学前需准备的总学费
+//            if (stuData.getaTotalTuition() == null || stuData.getaTotalTuition().compareTo(rightData.getaTotalTuition()) != 0) {
+//                wrongCount += 1;
+//            }
+            //B求学年龄
             if (stuData.getbEduAge() == null || !stuData.getbEduAge().equals(rightData.getbEduAge())) {
                 wrongCount += 1;
             }//B求学时间
@@ -2108,13 +2111,16 @@ public class CaseServiceImpl implements CaseService {
             }//B目前学费
             if (stuData.getbTuition() == null || stuData.getbTuition().compareTo(rightData.getbTuition()) != 0) {
                 wrongCount += 1;
-            }//B上学时学费
-            if (stuData.getbEduTuition() == null || stuData.getbEduTuition().compareTo(rightData.getbEduTuition()) != 0) {
-                wrongCount += 1;
-            }//B上学前需准备的总学费
-            if (stuData.getbTotalTuition() == null || stuData.getbTotalTuition().compareTo(rightData.getbTotalTuition()) != 0) {
-                wrongCount += 1;
-            }//C求学年龄
+            }
+            //B上学时学费
+//            if (stuData.getbEduTuition() == null || stuData.getbEduTuition().compareTo(rightData.getbEduTuition()) != 0) {
+//                wrongCount += 1;
+//            }
+            //B上学前需准备的总学费
+//            if (stuData.getbTotalTuition() == null || stuData.getbTotalTuition().compareTo(rightData.getbTotalTuition()) != 0) {
+//                wrongCount += 1;
+//            }
+            // C求学年龄
             if (stuData.getcEduAge() == null || !stuData.getcEduAge().equals(rightData.getcEduAge())) {
                 wrongCount += 1;
             }//C求学时间
@@ -2123,13 +2129,16 @@ public class CaseServiceImpl implements CaseService {
             }//C目前学费
             if (stuData.getcTuition() == null || stuData.getcTuition().compareTo(rightData.getcTuition()) != 0) {
                 wrongCount += 1;
-            }//C上学时学费
-            if (stuData.getcEduTuition() == null || stuData.getcEduTuition().compareTo(rightData.getcEduTuition()) != 0) {
-                wrongCount += 1;
-            }//C上学前需准备的总学费
-            if (stuData.getcTotalTuition() == null || stuData.getcTotalTuition().compareTo(rightData.getcTotalTuition()) != 0) {
-                wrongCount += 1;
-            }//D求学年龄
+            }
+            //C上学时学费
+//            if (stuData.getcEduTuition() == null || stuData.getcEduTuition().compareTo(rightData.getcEduTuition()) != 0) {
+//                wrongCount += 1;
+//            }
+            //C上学前需准备的总学费
+//            if (stuData.getcTotalTuition() == null || stuData.getcTotalTuition().compareTo(rightData.getcTotalTuition()) != 0) {
+//                wrongCount += 1;
+//            }
+            //D求学年龄
             if (stuData.getdEduAge() == null || !stuData.getdEduAge().equals(rightData.getdEduAge())) {
                 wrongCount += 1;
             }//D求学时间
@@ -2138,13 +2147,16 @@ public class CaseServiceImpl implements CaseService {
             }//D目前学费
             if (stuData.getdTuition() == null || stuData.getdTuition().compareTo(rightData.getdTuition()) != 0) {
                 wrongCount += 1;
-            }//D上学时学费
-            if (stuData.getdEduTuition() == null || stuData.getdEduTuition().compareTo(rightData.getdEduTuition()) != 0) {
-                wrongCount += 1;
-            }//D上学前需准备的总学费
-            if (stuData.getdTotalTuition() == null || stuData.getdTotalTuition().compareTo(rightData.getdTotalTuition()) != 0) {
-                wrongCount += 1;
-            }//E求学年龄
+            }
+            //D上学时学费
+//            if (stuData.getdEduTuition() == null || stuData.getdEduTuition().compareTo(rightData.getdEduTuition()) != 0) {
+//                wrongCount += 1;
+//            }
+            //D上学前需准备的总学费
+//            if (stuData.getdTotalTuition() == null || stuData.getdTotalTuition().compareTo(rightData.getdTotalTuition()) != 0) {
+//                wrongCount += 1;
+//            }
+            //E求学年龄
             if (stuData.geteEduAge() == null || !stuData.geteEduAge().equals(rightData.geteEduAge())) {
                 wrongCount += 1;
             }//E求学时间
@@ -2153,13 +2165,16 @@ public class CaseServiceImpl implements CaseService {
             }//E目前学费
             if (stuData.geteTuition() == null || stuData.geteTuition().compareTo(rightData.geteTuition()) != 0) {
                 wrongCount += 1;
-            }//E上学时学费
-            if (stuData.geteEduTuition() == null || stuData.geteEduTuition().compareTo(rightData.geteEduTuition()) != 0) {
-                wrongCount += 1;
-            }//E上学前需准备的总学费
-            if (stuData.geteTotalTuition() == null || stuData.geteTotalTuition().compareTo(rightData.geteTotalTuition()) != 0) {
-                wrongCount += 1;
-            }//F求学年龄
+            }
+            //E上学时学费
+//            if (stuData.geteEduTuition() == null || stuData.geteEduTuition().compareTo(rightData.geteEduTuition()) != 0) {
+//                wrongCount += 1;
+//            }
+            //E上学前需准备的总学费
+//            if (stuData.geteTotalTuition() == null || stuData.geteTotalTuition().compareTo(rightData.geteTotalTuition()) != 0) {
+//                wrongCount += 1;
+//            }
+            //F求学年龄
             if (stuData.getfEduAge() == null || !stuData.getfEduAge().equals(rightData.getfEduAge())) {
                 wrongCount += 1;
             }//F求学时间
@@ -2168,13 +2183,16 @@ public class CaseServiceImpl implements CaseService {
             }//F目前学费
             if (stuData.getfTuition() == null || stuData.getfTuition().compareTo(rightData.getfTuition()) != 0) {
                 wrongCount += 1;
-            }//F上学时学费
-            if (stuData.getfEduTuition() == null || stuData.getfEduTuition().compareTo(rightData.getfEduTuition()) != 0) {
-                wrongCount += 1;
-            }//F上学前需准备的总学费
-            if (stuData.getfTotalTuition() == null || stuData.getfTotalTuition().compareTo(rightData.getfTotalTuition()) != 0) {
-                wrongCount += 1;
-            }//商业保险
+            }
+//            //F上学时学费
+//            if (stuData.getfEduTuition() == null || stuData.getfEduTuition().compareTo(rightData.getfEduTuition()) != 0) {
+//                wrongCount += 1;
+//            }
+//            //F上学前需准备的总学费
+//            if (stuData.getfTotalTuition() == null || stuData.getfTotalTuition().compareTo(rightData.getfTotalTuition()) != 0) {
+//                wrongCount += 1;
+//            }
+            //商业保险
             if (stuData.getInsurance() == null || stuData.getInsurance().compareTo(rightData.getInsurance()) != 0) {
                 wrongCount += 1;
             }//储蓄计划