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

修改bug#40877

Browse Source
This commit is contained in:
梁琦涛
2021-10-18 16:14:45 +08:00
parent c28eeb1aa3
commit 1b1703b01c
1 changed files with 13 additions and 13 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
+13 -13
View File
@@ -810,18 +810,18 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
* @Exception
*/
private void setPayIncomeContractEdit(PayIncomeContract payIncomeContract,PayIncomeContract payIncomeContractStatus){
if(!Objects.equals(payIncomeContractStatus.getSignedCompanyTemporaryId(),payIncomeContract.getSignedCompanyId())){
// 企业
PayCompanyManagementTemporary chargeCompanyName = payCompanyManagementTemporaryService.insertCompanyManagementTemporary(payIncomeContract.getSignedCompanyId());
if(Objects.isNull(chargeCompanyName)){
throw new JeroBootException("企业名称为空！");
}
payIncomeContract.setSignedCompanyTemporaryId(chargeCompanyName.getId());
payIncomeContract.setSignedCompanyTemporaryName(chargeCompanyName.getCompanyName());
payCompanyManagementTemporaryService.removeById(payIncomeContract.getSignedCompanyTemporaryId());
}else{
payIncomeContract.setSignedCompanyId(payIncomeContractStatus.getSignedCompanyId());
}
// if(!Objects.equals(payIncomeContractStatus.getSignedCompanyTemporaryId(),payIncomeContract.getSignedCompanyId())){
// // 企业
// PayCompanyManagementTemporary chargeCompanyName = payCompanyManagementTemporaryService.insertCompanyManagementTemporary(payIncomeContract.getSignedCompanyId());
// if(Objects.isNull(chargeCompanyName)){
// throw new JeroBootException("企业名称为空！");
// }
// payIncomeContract.setSignedCompanyTemporaryId(chargeCompanyName.getId());
// payIncomeContract.setSignedCompanyTemporaryName(chargeCompanyName.getCompanyName());
// payCompanyManagementTemporaryService.removeById(payIncomeContractStatus.getSignedCompanyTemporaryId());
// }else{
// payIncomeContract.setSignedCompanyId(payIncomeContractStatus.getSignedCompanyId());
// }
if(!Objects.equals(payIncomeContractStatus.getSignedContactsTemporaryId(),payIncomeContract.getSignedContactsId())){
// 联系人
@@ -831,7 +831,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
}
payIncomeContract.setSignedContactsTemporaryId(contactsName.getId());
payIncomeContract.setSignedContactsTemporaryName(contactsName.getName());
payContactsManagementTemporaryService.removeById(payIncomeContract.getSignedContactsTemporaryId());
payContactsManagementTemporaryService.removeById(payIncomeContractStatus.getSignedContactsTemporaryId());
}else{
payIncomeContract.setSignedContactsId(payIncomeContractStatus.getSignedContactsId());
}