From 51503da0f52d39f8440ccbb7dfee720212ec8c98 Mon Sep 17 00:00:00 2001
From: sunzheng <sunzheng.cn>
Date: Mon, 15 Jul 2024 15:26:27 +0800
Subject: [PATCH] =?UTF-8?q?update:=E6=89=B9=E9=87=8F=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=97=B6=E8=87=AA=E5=8A=A8=E8=B5=8B=E5=80=BC=E7=A8=8E=E7=8E=87?=
 =?UTF-8?q?,=E7=A8=8E=E9=A2=9D,=E6=9C=AA=E7=A8=8E=E9=87=91=E9=A2=9D?=
 =?UTF-8?q?=E7=AD=89=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PayWorkingGroupSubItemController.java         | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
index e80d6876..0cb8691c 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
@@ -59,6 +59,7 @@ import org.springframework.web.servlet.ModelAndView;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.time.LocalDate;
 import java.time.YearMonth;
 import java.time.format.DateTimeFormatter;
@@ -463,12 +464,22 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
          for (String workingGroupId : workingGroupIdsArr) {
 			 PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(workingGroupId);
 			 BigDecimal yearChargeA = payWorkingGroup.getYearChargeA();
+			 BigDecimal taxRate = new BigDecimal("0.06");
+			 payWorkingGroupSubItem.setTaxRate(taxRate);
 			 if (Objects.isNull(yearChargeA)) {
 				 payWorkingGroupSubItem.setReceivableAmount(BigDecimal.ZERO);
-			 }else {
+				 payWorkingGroupSubItem.setTax(BigDecimal.ZERO);
+				 payWorkingGroupSubItem.setNoTaxAmount(BigDecimal.ZERO);
+			 } else {
 				 payWorkingGroupSubItem.setReceivableAmount(yearChargeA);
+				 // 计算未税金额
+				 BigDecimal noTaxAmount = yearChargeA.divide(taxRate.add(BigDecimal.ONE), 2, RoundingMode.HALF_UP);
+				 // 计算税额
+				 BigDecimal tax = yearChargeA.subtract(noTaxAmount).setScale(2, RoundingMode.HALF_UP);
+				 payWorkingGroupSubItem.setTax(tax);
+				 payWorkingGroupSubItem.setNoTaxAmount(noTaxAmount);
 			 }
-             payWorkingGroupSubItem.setId(null);
+			 payWorkingGroupSubItem.setId(null);
              List<PayWorkingGroupSubItemContacts> payWorkingGroupSubItemContactsList =
                      payWorkingGroupSubItem.getPayWorkingGroupSubItemContactsList();
              payWorkingGroupSubItemContactsList.forEach(p -> p.setId(null));