From a006657b68c72c7a673e404def085f597c7d8173 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 17 Jul 2024 10:25:28 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=A4=84=E7=90=86=E5=8E=86=E5=8F=B2?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PayPackCompanyProjectServiceImpl.java     | 33 +++++++++++++++----
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java
index 587a888c..4cfc9d4b 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java
@@ -37,8 +37,10 @@ import com.jero.pack.vo.PayPackCompanyProjectInput;
 import com.jero.pack.vo.PayProjectExcel;
 import com.jero.project.common.PayProjectCommon;
 import com.jero.project.entity.PayCommonProject;
+import com.jero.project.entity.PayWorkingGroup;
 import com.jero.project.entity.PayWorkingGroupSubItem;
 import com.jero.project.mapper.PayCommonProjectMapper;
+import com.jero.project.mapper.PayWorkingGroupMapper;
 import com.jero.project.mapper.PayWorkingGroupSubItemMapper;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -83,6 +85,8 @@ public class PayPackCompanyProjectServiceImpl extends ServiceImpl<PayPackCompany
     @Resource
     private PayWorkingGroupSubItemMapper payWorkingGroupSubItemMapper;
     @Resource
+    private PayWorkingGroupMapper payWorkingGroupMapper;
+    @Resource
     private PayMeetingSituationMapper payMeetingSituationMapper;
     @Resource
     private PayMemberProjectSubitemMapper payMemberProjectSubitemMapper;
@@ -443,6 +447,12 @@ public class PayPackCompanyProjectServiceImpl extends ServiceImpl<PayPackCompany
                     if (!new BigDecimal("0.00").equals(old1.getReceivableAmount())){
                         continue;
                     }
+                    String workingGroupId = old1.getWorkingGroupId();
+                    PayWorkingGroup payWorkingGroup = payWorkingGroupMapper.selectById(workingGroupId);
+                    BigDecimal yearChargeA = payWorkingGroup.getYearChargeA();
+                    if (yearChargeA == null || new BigDecimal("0.00").equals(yearChargeA)){
+                        continue;
+                    }
                     PayWorkingGroupSubItem payWorking = null;
                     List<JSONObject> jsonObjects1 = sysBaseAPI.getLogByRequestParam(projectId);
                     if (jsonObjects1.isEmpty()){
@@ -463,14 +473,23 @@ public class PayPackCompanyProjectServiceImpl extends ServiceImpl<PayPackCompany
                         }
                     }
                     if (payWorking == null) {
-                        continue;
+
+                        PayWorkingGroupSubItem project2 = new PayWorkingGroupSubItem();
+                        project2.setId(projectId);
+
+                        project2.setReceivableAmount(yearChargeA);
+                        BigDecimal noTaxAmount = yearChargeA.divide(StaticConfig.TAX_RATE_CALCULATE, 2, RoundingMode.HALF_UP);
+                        project2.setNoTaxAmount(noTaxAmount);
+                        project2.setTax(yearChargeA.subtract(noTaxAmount));
+                        payWorkingGroupSubItemMapper.updateById(project2);
+                    }else {
+                        PayWorkingGroupSubItem project2 = new PayWorkingGroupSubItem();
+                        project2.setId(projectId);
+                        project2.setReceivableAmount(payWorking.getReceivableAmount());
+                        project2.setNoTaxAmount(payWorking.getNoTaxAmount());
+                        project2.setTax(payWorking.getTax());
+                        payWorkingGroupSubItemMapper.updateById(project2);
                     }
-                    PayWorkingGroupSubItem project2 = new PayWorkingGroupSubItem();
-                    project2.setId(projectId);
-                    project2.setReceivableAmount(payWorking.getReceivableAmount());
-                    project2.setNoTaxAmount(payWorking.getNoTaxAmount());
-                    project2.setTax(payWorking.getTax());
-                    payWorkingGroupSubItemMapper.updateById(project2);
                     break;
                 //会员项目
                 case PayIncomeContractCommon.PROJECT_TYPE4: