From 3c8dd59769c232ec671e9cf63c71bb78a1894fa7 Mon Sep 17 00:00:00 2001
From: sunzheng <sunzheng.cn>
Date: Wed, 27 Dec 2023 16:52:05 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E9=80=9A=E8=BF=87excel?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=B7=A5=E4=BD=9C=E7=BB=84=E6=88=90=E5=91=98?=
 =?UTF-8?q?=E5=92=8C=E8=B5=84=E6=96=99=E7=BD=91=E5=91=98=E6=88=90=E5=91=98?=
 =?UTF-8?q?=E7=9A=84=E9=BB=98=E8=AE=A4=E7=A8=8E=E7=8E=87=E4=B8=BA6%?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../member/controller/PayMemberProjectSubitemController.java | 5 +++++
 .../service/impl/PayWorkingGroupSubItemServiceImpl.java      | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java
index 96364134..2d67af26 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java
@@ -356,6 +356,11 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
             //复制属性
             BeanUtils.copyProperties(projectSubitemExcel, projectSubitem);
 
+            // 给税率填充默认值 6%
+            if (Objects.isNull(projectSubitem.getTaxRate())) {
+                projectSubitem.setTaxRate(new BigDecimal("0.06"));
+            }
+
             if (errorMessage.isEmpty()) {
                 try {
                     //ValidUtil.validate(projectSubitem);
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
index 1e1eb79b..8622e5ff 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
@@ -595,6 +595,10 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
                         // 校验预估到账日期
                         list.forEach(
                                 p -> {
+                                    // 填充税率为默认值 6%
+                                    if (Objects.isNull(p.getTaxRate())) {
+                                        p.setTaxRate(new BigDecimal("0.06"));
+                                    }
                                     String estimatedArrivalDate = p.getEstimatedArrivalDate();
                                     if (Objects.isNull(estimatedArrivalDate)) {
                                         msg.append("第").append(list.indexOf(p) + 3).append("行预估到账日期不能为空，请修改。<br/>");