From 75bccabb958e7d2bae1912535d8554e4bc199367 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 31 Mar 2023 14:03:17 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=9B=A0=E4=B8=BA=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E6=89=93=E5=8C=85=E4=BC=81=E4=B8=9A=EF=BC=8C=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E5=90=88=E5=90=8C=E5=85=B3=E8=81=94=E9=A1=B9=E7=9B=AE=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PayPackCompanyProjectServiceImpl.java   | 9 +++++++++
 1 file changed, 9 insertions(+)

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 e2ea3140..d78f7bfc 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
@@ -207,11 +207,20 @@ public class PayPackCompanyProjectServiceImpl extends ServiceImpl<PayPackCompany
             PayPackCompany payPackCompany = new PayPackCompany();
             //不存在打包企业 添加打包企业
             if(CollectionUtils.isEmpty(listPayPackCompany)){
+                //获得上一年的打包
+                LambdaQueryWrapper<PayPackCompany> oldWapper = new LambdaQueryWrapper<>();
+                oldWapper.eq(PayPackCompany::getCompanyId,companyId);
+                oldWapper.eq(PayPackCompany::getPackYear,Integer.parseInt(packYear)-1);
+                PayPackCompany old = payPackCompanyService.getOne(oldWapper);
+                if (old == null){
+                    throw new JeroBootException("请先创建打包企业");
+                }
                 PayPackCompany payPackCompanyData = new PayPackCompany();
                 payPackCompanyData.setCompanyId(companyId);
                 payPackCompanyData.setCompanyContactId(contactsId);
                 payPackCompanyData.setPackYear(packYear);
                 payPackCompanyData.setPackContactId(contactsId);
+                payPackCompanyData.setPackPrincipalId(old.getPackPrincipalId());
                 payPackCompany = payPackCompanyService.addPayPackCompany(payPackCompanyData);
             }else{
                 payPackCompany = listPayPackCompany.get(0);