fix 因为没有打包企业，导致合同关联项目失败。

2023-03-31 14:03:17 +08:00
parent 6d3343d2e3
commit 75bccabb95
1 changed files with 9 additions and 0 deletions
@@ -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);