收入合同完善
This commit is contained in:
梁琦涛
+4
-1
@@ -140,6 +140,7 @@
|
||||
sit.amount_receivable AS receivableAmount,
|
||||
sit.paid_amount AS paidAmount,
|
||||
meeting.director_name AS principalName,
|
||||
sit.company_contact_name AS contactsName,
|
||||
pica.create_time AS createTime
|
||||
FROM pay_income_contract_associated pica
|
||||
JOIN pay_meeting_situation sit ON pica.project_id = sit.id
|
||||
@@ -157,6 +158,7 @@
|
||||
msub.amount_receivable AS receivableAmount,
|
||||
msub.paid_amount AS paidAmount,
|
||||
pmp.director_name AS principalName,
|
||||
msub.company_contact_name AS contactsName,
|
||||
pica.create_time AS createTime
|
||||
FROM pay_income_contract_associated pica
|
||||
JOIN pay_member_project_subitem msub ON pica.project_id = msub.id
|
||||
@@ -173,7 +175,8 @@
|
||||
tmsub.company_name AS chargeCompanyName,
|
||||
tmsub.amount_receivable AS receivableAmount,
|
||||
tmsub.paid_amount AS paidAmount,
|
||||
tmember.director_name AS principalName,
|
||||
'' AS principalName,
|
||||
tmsub.liaison_man AS contactsName,
|
||||
pica.create_time AS createTime
|
||||
FROM pay_income_contract_associated pica
|
||||
JOIN tb_member_project_subitem tmsub ON pica.project_id = tmsub.id
|
||||
|
||||
+3
-58
@@ -87,8 +87,6 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
|
||||
@Autowired
|
||||
private IPayWorkingGroupSubItemService payWorkingGroupSubItemService;
|
||||
@Autowired
|
||||
private ProjectPackService projectPackService;
|
||||
@Autowired
|
||||
private IPayPackCompanyService payPackCompanyService;
|
||||
@Autowired
|
||||
private IPayPackCompanyProjectService payPackCompanyProjectService;
|
||||
@@ -174,7 +172,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
|
||||
if(CollectionUtils.isEmpty(listPayPackCompany)){
|
||||
PayPackCompany payPackCompanyData = new PayPackCompany();
|
||||
payPackCompanyData.setCompanyId(payIncomeContract.getSignedCompanyId());
|
||||
payPackCompanyData.setCompanyContactId(payIncomeContract.getSignedCompanyId());
|
||||
payPackCompanyData.setCompanyContactId(payIncomeContract.getSignedContactsId());
|
||||
payPackCompanyData.setPackYear(payIncomeContract.getPackYear());
|
||||
payPackCompanyData.setPackContactId(payIncomeContract.getSignedContactsId());
|
||||
payPackCompanyService.addPayPackCompany(payPackCompanyData);
|
||||
@@ -323,7 +321,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
|
||||
// 添加打包企业
|
||||
// 合同选择了打包，查看打包年份&&打包企业是否存在
|
||||
if(Objects.equals(payIncomeContract.getPack(),PayIncomeContractCommon.PACK1)){
|
||||
setPack(payCommonProject.getChargeCompanyId(),payCommonProject.getContactsId(),payIncomeContract.getPackYear(),payCommonProject.getId(),payIncomeContract.getPack(),payCommonProject.getReceivableAmount(),payCommonProject.getPaidAmount());
|
||||
payPackCompanyProjectService.setPack(payCommonProject.getChargeCompanyId(),payCommonProject.getContactsId(),payIncomeContract.getPackYear(),payCommonProject.getId(),PayIncomeContractCommon.PROJECT_TYPE1,payIncomeContract.getPack());
|
||||
}
|
||||
}
|
||||
projectOutput.setProjectId(payCommonProject.getId());
|
||||
@@ -369,7 +367,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
|
||||
// 添加打包企业
|
||||
// 合同选择了打包，查看打包年份&&打包企业是否存在
|
||||
if(Objects.equals(payIncomeContract.getPack(),PayIncomeContractCommon.PACK1)){
|
||||
setPack(listPayWorkingGroupSubItem.get(0).getChargeCompanyId(),listPayWorkingGroupSubItem.get(0).getContactsIdOne(),payIncomeContract.getPackYear(),listPayWorkingGroupSubItem.get(0).getId(),payIncomeContract.getPack(),listPayWorkingGroupSubItem.get(0).getReceivableAmount(),listPayWorkingGroupSubItem.get(0).getPaidAmount());
|
||||
payPackCompanyProjectService.setPack(listPayWorkingGroupSubItem.get(0).getChargeCompanyId(),listPayWorkingGroupSubItem.get(0).getContactsIdOne(),payIncomeContract.getPackYear(),listPayWorkingGroupSubItem.get(0).getId(),PayIncomeContractCommon.PROJECT_TYPE2,payIncomeContract.getPack());
|
||||
}
|
||||
}
|
||||
// 更新项目id
|
||||
@@ -403,53 +401,6 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
|
||||
return listProjectOutput;
|
||||
}
|
||||
/**
|
||||
* @Description 添加打包企业
|
||||
* @Author lqt
|
||||
* @Date 2021/9/12
|
||||
* @Param
|
||||
* @Return
|
||||
* @Exception
|
||||
*/
|
||||
private void setPack(String companyId, String contactsId, String packYear, String projectId, Integer pack, BigDecimal receivableAmount,BigDecimal paidAmount){
|
||||
// 合同选择了打包，查看打包年份&&打包企业是否存在
|
||||
if(Objects.equals(pack,PayIncomeContractCommon.PACK1)){
|
||||
LambdaQueryWrapper<PayPackCompany> queryPayPackCompany = new LambdaQueryWrapper<>();
|
||||
queryPayPackCompany.eq(PayPackCompany::getCompanyId,companyId);
|
||||
queryPayPackCompany.eq(PayPackCompany::getPackYear,packYear);
|
||||
List<PayPackCompany> listPayPackCompany = payPackCompanyService.list(queryPayPackCompany);
|
||||
PayPackCompany payPackCompany = new PayPackCompany();
|
||||
//不存在打包企业 添加打包企业
|
||||
if(CollectionUtils.isEmpty(listPayPackCompany)){
|
||||
PayPackCompany payPackCompanyData = new PayPackCompany();
|
||||
payPackCompanyData.setCompanyId(companyId);
|
||||
payPackCompanyData.setCompanyContactId(contactsId);
|
||||
payPackCompanyData.setPackYear(packYear);
|
||||
payPackCompanyData.setPackContactId(contactsId);
|
||||
payPackCompanyService.addPayPackCompany(payPackCompanyData);
|
||||
LambdaQueryWrapper<PayPackCompany> queryPayPackCompanyNew = new LambdaQueryWrapper<>();
|
||||
queryPayPackCompanyNew.eq(PayPackCompany::getCompanyId,companyId);
|
||||
queryPayPackCompanyNew.eq(PayPackCompany::getPackYear,packYear);
|
||||
List<PayPackCompany> listPayPackCompanyNew = payPackCompanyService.list(queryPayPackCompanyNew);
|
||||
payPackCompany = listPayPackCompanyNew.get(0);
|
||||
}else{
|
||||
payPackCompany = listPayPackCompany.get(0);
|
||||
}
|
||||
// 更新打包实收金额
|
||||
LambdaUpdateWrapper<PayPackCompany> updatePayPackCompany = new LambdaUpdateWrapper<>();
|
||||
updatePayPackCompany.eq(PayPackCompany::getPackChargeTotal,payPackCompany.getPackChargeTotal().add(receivableAmount));
|
||||
updatePayPackCompany.eq(PayPackCompany::getReceiptExpense,payPackCompany.getReceiptExpense().add(paidAmount));
|
||||
updatePayPackCompany.set(PayPackCompany::getId,payPackCompany.getId());
|
||||
payPackCompanyService.update(updatePayPackCompany);
|
||||
// 添加打包企业成员
|
||||
PayPackCompanyProject payPackCompanyProject = new PayPackCompanyProject();
|
||||
payPackCompanyProject.setPackId(payPackCompany.getId());
|
||||
payPackCompanyProject.setProjectId(projectId);
|
||||
payPackCompanyProject.setCome(PayIncomeContractCommon.COME1);
|
||||
payPackCompanyProject.setProjectId(PayIncomeContractCommon.PROJECT_TYPE1);
|
||||
payPackCompanyProjectService.save(payPackCompanyProject);
|
||||
}
|
||||
}
|
||||
/**
|
||||
* @Description 验证项目是否被合同关联
|
||||
* @Author lqt
|
||||
* @Date 2021/9/6
|
||||
@@ -634,7 +585,6 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
|
||||
throw new JeroBootException("请输入拒绝说明！");
|
||||
}
|
||||
if(Objects.equals(payIncomeContractAudit.getContractStatus(),PayIncomeContractCommon.STATUS3)){
|
||||
// todo 缺少插入合同邮寄表
|
||||
payIncomeContractAudit.setExplainRemarks("");
|
||||
}
|
||||
|
||||
@@ -782,11 +732,6 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
|
||||
if(!Objects.equals(payIncomeContract.getSignedCompanyId(),companyId)){
|
||||
throw new JeroBootException("关联合同中签订单位与项目中来款企业不匹配！");
|
||||
}
|
||||
PayIncomeContractAssociated payIncomeContractAssociated = new PayIncomeContractAssociated();
|
||||
payIncomeContractAssociated.setContractId(payIncomeContract.getId());
|
||||
payIncomeContractAssociated.setProjectType(Integer.parseInt(PayProjectCommon.PROJECT_TYPE1));
|
||||
payIncomeContractAssociated.setProjectId(projectId);
|
||||
payIncomeContractAssociatedService.save(payIncomeContractAssociated);
|
||||
return payIncomeContract;
|
||||
}
|
||||
return null;
|
||||
|
||||
Reference in New Issue
Block a user