From 938294409b889427fd501504801c7a4b20997e1b Mon Sep 17 00:00:00 2001
From: cyf009 <591388323@qq.com>
Date: Fri, 21 Feb 2025 13:11:56 +0800
Subject: [PATCH] 111111

---
 .../command/IncomeCommandServiceImpl.java     | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/IncomeCommandServiceImpl.java b/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/IncomeCommandServiceImpl.java
index f9ee3249..9b6a676b 100644
--- a/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/IncomeCommandServiceImpl.java
+++ b/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/IncomeCommandServiceImpl.java
@@ -270,6 +270,10 @@ public class IncomeCommandServiceImpl  extends BaseCommandAbstractService<Income
                     cmd.getSalaryScale(),cmd.getTransportationSubsidy(),cmd.getSalaryCompensation()):incomeSpecialRepository.findById(cmd.getIncomeSpecialId());
             if(cmd.getIncomeTypeName().equals("搴斾氦璐㈡斂涓撴埛娆�"))
             {
+                if(Objects.isNull(cmd.getHotelExpense()))
+                    cmd.setHotelExpense(BigDecimal.ZERO.stripTrailingZeros());
+                if(Objects.isNull(cmd.getEducationFee()))
+                    cmd.setEducationFee(BigDecimal.ZERO.stripTrailingZeros());
                 BigDecimal adm=cmd.getHotelExpense().add(cmd.getTuition()).add(cmd.getEducationFee());
                 if(incomeAggregate.getIncomeAmount().compareTo(adm)!=0 )
                 {
@@ -280,6 +284,27 @@ public class IncomeCommandServiceImpl  extends BaseCommandAbstractService<Income
             }
             if(cmd.getIncomeTypeName().equals("A-宸ヨ祫閫€鍥�"))
             {
+                if(Objects.isNull(cmd.getAnnuity()))
+                    cmd.setAnnuity(BigDecimal.ZERO.stripTrailingZeros());
+                if(Objects.isNull(cmd.getMedicalInsurance()))
+                    cmd.setMedicalInsurance(BigDecimal.ZERO.stripTrailingZeros());
+
+                if(Objects.isNull(cmd.getUnemploymentInsurance()))
+                    cmd.setUnemploymentInsurance(BigDecimal.ZERO.stripTrailingZeros());
+
+                if(Objects.isNull(cmd.getUnionDues()))
+                    cmd.setUnionDues(BigDecimal.ZERO.stripTrailingZeros());
+                if(Objects.isNull(cmd.getPositionSalary()))
+                    cmd.setPositionSalary(BigDecimal.ZERO.stripTrailingZeros());
+                if(Objects.isNull(cmd.getSalaryScale()))
+                    cmd.setSalaryScale(BigDecimal.ZERO.stripTrailingZeros());
+
+                if(Objects.isNull(cmd.getTransportationSubsidy()))
+                    cmd.setTransportationSubsidy(BigDecimal.ZERO.stripTrailingZeros());
+
+                if(Objects.isNull(cmd.getSalaryCompensation()))
+                    cmd.setSalaryCompensation(BigDecimal.ZERO.stripTrailingZeros());
+
                 BigDecimal am=cmd.getAnnuity().add(cmd.getMedicalInsurance())
                         .add(cmd.getUnemploymentInsurance())
                         .add(cmd.getUnionDues())
@@ -297,6 +322,11 @@ public class IncomeCommandServiceImpl  extends BaseCommandAbstractService<Income
             }
             if(cmd.getIncomeTypeName().equals("瀹氭湡瀛樻"))
             {
+                if(Objects.isNull(cmd.getPrincipal()))
+                    cmd.setPrincipal(BigDecimal.ZERO.stripTrailingZeros());
+                if(Objects.isNull(cmd.getInterest()))
+                    cmd.setInterest(BigDecimal.ZERO.stripTrailingZeros());
+
                 BigDecimal amount=cmd.getPrincipal().add(cmd.getInterest());
                 if(incomeAggregate.getIncomeAmount().compareTo(amount)!=0)
                 {
-- 
GitLab