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 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);