LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

收入合同完善

Browse Source
This commit is contained in:
梁琦涛
2021-09-17 16:03:43 +08:00
parent 806112aa68
commit 3b1f0175b0
5 changed files with 95 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java
+28 -27
View File
@@ -147,21 +147,21 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
checkPayIncomeContractInstallment(listPayIncomeContractInstallment,payIncomeContract);
// 选择了打包，创建打包企业
if(Objects.equals(payIncomeContract.getPack(),PayIncomeContractCommon.PACK1)){
LambdaQueryWrapper<PayPackCompany> queryPayPackCompany = new LambdaQueryWrapper<>();
queryPayPackCompany.eq(PayPackCompany::getCompanyId,payIncomeContract.getSignedCompanyId());
queryPayPackCompany.eq(PayPackCompany::getPackYear,payIncomeContract.getPackYear());
List<PayPackCompany> listPayPackCompany = payPackCompanyService.list(queryPayPackCompany);
//不存在打包企业 添加打包企业
if(CollectionUtils.isEmpty(listPayPackCompany)){
PayPackCompany payPackCompanyData = new PayPackCompany();
payPackCompanyData.setCompanyId(payIncomeContract.getSignedCompanyId());
payPackCompanyData.setCompanyContactId(payIncomeContract.getSignedContactsId());
payPackCompanyData.setPackYear(payIncomeContract.getPackYear());
payPackCompanyData.setPackContactId(payIncomeContract.getSignedContactsId());
payPackCompanyService.addPayPackCompany(payPackCompanyData);
}
}
// if(Objects.equals(payIncomeContract.getPack(),PayIncomeContractCommon.PACK1)){
// LambdaQueryWrapper<PayPackCompany> queryPayPackCompany = new LambdaQueryWrapper<>();
// queryPayPackCompany.eq(PayPackCompany::getCompanyId,payIncomeContract.getSignedCompanyId());
// queryPayPackCompany.eq(PayPackCompany::getPackYear,payIncomeContract.getPackYear());
// List<PayPackCompany> listPayPackCompany = payPackCompanyService.list(queryPayPackCompany);
// //不存在打包企业 添加打包企业
// if(CollectionUtils.isEmpty(listPayPackCompany)){
// PayPackCompany payPackCompanyData = new PayPackCompany();
// payPackCompanyData.setCompanyId(payIncomeContract.getSignedCompanyId());
// payPackCompanyData.setCompanyContactId(payIncomeContract.getSignedContactsId());
// payPackCompanyData.setPackYear(payIncomeContract.getPackYear());
// payPackCompanyData.setPackContactId(payIncomeContract.getSignedContactsId());
// payPackCompanyService.addPayPackCompany(payPackCompanyData);
// }
// }
return payIncomeContract;
}
@@ -385,6 +385,17 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
throw new JeroBootException("打包合同不可关联会议项目！");
}
// 更新项目id
// p.setProjectId(listPayWorkingGroupSubItem.get(0).getId());
// projectOutput.setProjectId(listPayWorkingGroupSubItem.get(0).getId());
// projectOutput.setProjectType(PayIncomeContractCommon.PROJECT_TYPE2);
// projectOutput.setChargeProject(payWorkingGroup.getWorkingGroupProject());
// projectOutput.setChargeProject(listPayWorkingGroupSubItem.get(0).getChargeProject());
// projectOutput.setChargeCompanyName(listPayWorkingGroupSubItem.get(0).getChargeCompanyTemporaryName());
// projectOutput.setContactsName(listPayWorkingGroupSubItem.get(0).getChargeCompanyTemporaryName());
// projectOutput.setPaidAmount(listPayWorkingGroupSubItem.get(0).getPaidAmount());
// projectOutput.setReceivableAmount(listPayWorkingGroupSubItem.get(0).getReceivableAmount());
// todo 会议项目
break;
case PayIncomeContractCommon.PROJECT_TYPE4:
@@ -722,16 +733,6 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
PayIncomeContract payIncomeContract = payIncomeContractService.checkContractNum(contractNum);
// 能关联上合同
if(!Objects.isNull(payIncomeContract)){
if(Objects.equals(payIncomeContract.getStatus(),PayIncomeContractCommon.STATUS2)){
throw new JeroBootException("关联合同状态为待审核不可以进行关联！");
}
if(Objects.equals(payIncomeContract.getStatus(),PayIncomeContractCommon.STATUS3)){
throw new JeroBootException("关联合同状态为已通过不可以进行关联！");
}
if(Objects.equals(payIncomeContract.getStatus(),PayIncomeContractCommon.STATUS5)){
throw new JeroBootException("关联合同状态为已存档不可以进行关联！");
}
if(!Objects.equals(payIncomeContract.getSignedCompanyId(),companyId)){
throw new JeroBootException("关联合同中签订单位与项目中来款企业不匹配！");
}
@@ -744,8 +745,8 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
public void insertPayIncomeContract(PayIncomeContract payIncomeContract,String projectId,Integer projectType) {
// 合同存在 && 合同状态不为草稿，不为未通过 关联合同
if(!Objects.isNull(payIncomeContract)){
if(payIncomeContract.getStatus() == PayIncomeContractCommon.STATUS1 && payIncomeContract.getStatus() == PayIncomeContractCommon.STATUS4){
throw new JeroBootException("合同状态为草稿状态，不能进行关联！");
if(payIncomeContract.getStatus() == PayIncomeContractCommon.STATUS1){
throw new JeroBootException("合同状态为草稿状态不可关联！");
}
PayIncomeContractAssociated payIncomeContractAssociated = new PayIncomeContractAssociated();
payIncomeContractAssociated.setContractId(payIncomeContract.getId());