会员修改临时企业,联系人
This commit is contained in:
+54
-8
@@ -125,7 +125,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
|
||||
log.info("支出合同-添加异常",e);
|
||||
throw new JeroBootException("合同编号已存在!");
|
||||
}
|
||||
setPaySpendingContract(paySpendingContract);
|
||||
setPaySpendingContractAdd(paySpendingContract);
|
||||
paySpendingContractService.save(paySpendingContract);
|
||||
StringBuilder msgPaySpendingContractInstallment = new StringBuilder();
|
||||
if(!CollectionUtils.isEmpty(listPaySpendingContractInstallment)){
|
||||
@@ -218,7 +218,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
|
||||
if(!StringUtils.isBlank(msgPaySpendingContractInstallment)){
|
||||
throw new JeroBootException(msgPaySpendingContractInstallment.toString());
|
||||
}
|
||||
setPaySpendingContract(paySpendingContract);
|
||||
setPaySpendingContractEdit(paySpendingContract,paySpendingContractStatus);
|
||||
paySpendingContractService.updateById(paySpendingContract);
|
||||
}
|
||||
|
||||
@@ -518,7 +518,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
|
||||
paySpendingContract.setAccountStatus(PayIncomeContractCommon.ACCOUNT_STATUS1);
|
||||
}
|
||||
paySpendingContract.setNoTaxAmount(paySpendingContract.getContractAmount().divide(new BigDecimal("1").add(paySpendingContract.getRate().divide(new BigDecimal("100")))));
|
||||
setPaySpendingContract(paySpendingContract);
|
||||
setPaySpendingContractAdd(paySpendingContract);
|
||||
paySpendingContractService.save(paySpendingContract);
|
||||
List<PaySpendingContractInstallment> listPaySpendingContractInstallment = p.getListInstallment();
|
||||
if(!CollectionUtils.isEmpty(listPaySpendingContractInstallment)){
|
||||
@@ -720,17 +720,67 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
|
||||
* @Return
|
||||
* @Exception
|
||||
*/
|
||||
private void setPaySpendingContract(PaySpendingContract paySpendingContract){
|
||||
private void setPaySpendingContractAdd(PaySpendingContract paySpendingContract){
|
||||
// 企业
|
||||
PayCompanyManagementTemporary chargeCompanyName = payCompanyManagementTemporaryService.insertCompanyManagementTemporary(paySpendingContract.getSignedCompanyId());
|
||||
if(Objects.isNull(chargeCompanyName)){
|
||||
throw new JeroBootException("企业名称为空!");
|
||||
}
|
||||
paySpendingContract.setSignedCompanyTemporaryId(chargeCompanyName.getId());
|
||||
paySpendingContract.setSignedCompanyTemporaryName(chargeCompanyName.getCompanyName());
|
||||
|
||||
// 联系人
|
||||
PayContactsManagementTemporary contactsName = payContactsManagementTemporaryService.insertContactsManagementTemporary(paySpendingContract.getSignedContactsId());
|
||||
if(Objects.isNull(contactsName)){
|
||||
throw new JeroBootException("联系人名称为空!");
|
||||
}
|
||||
paySpendingContract.setSignedContactsTemporaryId(contactsName.getId());
|
||||
paySpendingContract.setSignedContactsTemporaryName(contactsName.getName());
|
||||
|
||||
// 负责人名称
|
||||
SysUser principalName = sysUserService.getById(paySpendingContract.getPrincipalId());
|
||||
if(Objects.isNull(principalName)){
|
||||
throw new JeroBootException("负责人名称为空!");
|
||||
}
|
||||
paySpendingContract.setPrincipalId(principalName.getId());
|
||||
paySpendingContract.setPrincipalName(principalName.getRealname());
|
||||
}
|
||||
|
||||
/**
|
||||
* @Description 插入企业信息,联系人信息到临时表,更新项目记录
|
||||
* @Author lqt
|
||||
* @Date 2021/8/31
|
||||
* @Param payCommonProject
|
||||
* @Return
|
||||
* @Exception
|
||||
*/
|
||||
private void setPaySpendingContractEdit(PaySpendingContract paySpendingContract,PaySpendingContract paySpendingContractStatus){
|
||||
if(!Objects.equals(paySpendingContractStatus.getSignedCompanyTemporaryId(),paySpendingContract.getSignedCompanyId())){
|
||||
// 企业
|
||||
PayCompanyManagementTemporary chargeCompanyName = payCompanyManagementTemporaryService.insertCompanyManagementTemporary(paySpendingContract.getSignedCompanyId());
|
||||
if(Objects.isNull(chargeCompanyName)){
|
||||
throw new JeroBootException("企业名称为空!");
|
||||
}
|
||||
paySpendingContract.setSignedCompanyTemporaryId(chargeCompanyName.getId());
|
||||
paySpendingContract.setSignedCompanyTemporaryName(chargeCompanyName.getCompanyName());
|
||||
payCompanyManagementTemporaryService.removeById(paySpendingContract.getSignedCompanyTemporaryId());
|
||||
}else{
|
||||
paySpendingContract.setSignedCompanyId(paySpendingContractStatus.getSignedCompanyId());
|
||||
}
|
||||
|
||||
if(!Objects.equals(paySpendingContractStatus.getSignedContactsTemporaryId(),paySpendingContract.getSignedContactsId())){
|
||||
// 联系人
|
||||
PayContactsManagementTemporary contactsName = payContactsManagementTemporaryService.insertContactsManagementTemporary(paySpendingContract.getSignedContactsId());
|
||||
if(Objects.isNull(contactsName)){
|
||||
throw new JeroBootException("联系人名称为空!");
|
||||
}
|
||||
paySpendingContract.setSignedContactsTemporaryId(contactsName.getId());
|
||||
paySpendingContract.setSignedContactsTemporaryName(contactsName.getName());
|
||||
payContactsManagementTemporaryService.removeById(paySpendingContract.getSignedContactsTemporaryId());
|
||||
}else{
|
||||
paySpendingContract.setSignedContactsId(paySpendingContractStatus.getSignedContactsId());
|
||||
}
|
||||
|
||||
// 负责人名称
|
||||
SysUser principalName = sysUserService.getById(paySpendingContract.getPrincipalId());
|
||||
if(Objects.isNull(principalName)){
|
||||
@@ -738,9 +788,5 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
|
||||
}
|
||||
paySpendingContract.setPrincipalId(principalName.getId());
|
||||
paySpendingContract.setPrincipalName(principalName.getRealname());
|
||||
paySpendingContract.setSignedContactsTemporaryId(contactsName.getId());
|
||||
paySpendingContract.setSignedContactsTemporaryName(contactsName.getName());
|
||||
paySpendingContract.setSignedCompanyTemporaryId(chargeCompanyName.getId());
|
||||
paySpendingContract.setSignedCompanyTemporaryName(chargeCompanyName.getCompanyName());
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user