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-22 11:25:31 +08:00
parent d4364775e5
commit bb40372664
10 changed files with 280 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java
-2
View File
@@ -67,8 +67,6 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
private ISysBaseAPI sysBaseAPI;
@Autowired
private IPayIncomeContractAssociatedService payIncomeContractAssociatedService;
// todo 缺少定时任务验证分期信息发送短信
/**
* 分页列表查询
jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java
+46 -10
View File
@@ -145,7 +145,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
log.info("收入合同-添加异常",e);
throw new JeroBootException("合同名称已存在！");
}
setPayIncomeContract(payIncomeContract,null);
setPayIncomeContractAdd(payIncomeContract);
payIncomeContract.setStatus(PayIncomeContractCommon.STATUS1);
payIncomeContractService.save(payIncomeContract);
@@ -272,10 +272,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
}
// 校验金额
checkPayIncomeContractInstallment(listPayIncomeContractInstallment,payIncomeContract);
setPayIncomeContract(payIncomeContract,payIncomeContractStatus);
// 先删除临时表企业信息，联系人信息，邮寄联系人信息
payCompanyManagementTemporaryService.removeById(payIncomeContract.getSignedCompanyTemporaryId());
payContactsManagementTemporaryService.removeByIds(Collections.singletonList(payIncomeContract.getSignedContactsTemporaryId()));
setPayIncomeContractEdit(payIncomeContract,payIncomeContractStatus);
payIncomeContractService.updateById(payIncomeContract);
}
@@ -500,7 +497,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
throw new JeroBootException("关联记录不存在！");
}
if(!Objects.equals(input.getContractId(),payIncomeContractAssociated.getContractId())){
throw new JeroBootException("关联id不能为空！");
throw new JeroBootException("合同id不能为空！");
}
PayIncomeContract payIncomeContract = payIncomeContractService.getById(payIncomeContractAssociated.getContractId());
if(Objects.isNull(payIncomeContract)){
@@ -664,8 +661,42 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
* @Return
* @Exception
*/
private void setPayIncomeContract(PayIncomeContract payIncomeContract,PayIncomeContract payIncomeContractStatus){
if(Objects.isNull(payIncomeContractStatus) || !Objects.equals(payIncomeContractStatus.getSignedCompanyTemporaryId(),payIncomeContract.getSignedCompanyId())){
private void setPayIncomeContractAdd(PayIncomeContract payIncomeContract){
// 企业
PayCompanyManagementTemporary chargeCompanyName = payCompanyManagementTemporaryService.insertCompanyManagementTemporary(payIncomeContract.getSignedCompanyId());
if(Objects.isNull(chargeCompanyName)){
throw new JeroBootException("企业名称为空！");
}
payIncomeContract.setSignedCompanyTemporaryId(chargeCompanyName.getId());
payIncomeContract.setSignedCompanyTemporaryName(chargeCompanyName.getCompanyName());
// 联系人
PayContactsManagementTemporary contactsName = payContactsManagementTemporaryService.insertContactsManagementTemporary(payIncomeContract.getSignedContactsId());
if(Objects.isNull(contactsName)){
throw new JeroBootException("联系人名称为空！");
}
payIncomeContract.setSignedContactsTemporaryId(contactsName.getId());
payIncomeContract.setSignedContactsTemporaryName(contactsName.getName());
// 负责人名称
SysUser principalName = sysUserService.getById(payIncomeContract.getPrincipalId());
if(Objects.isNull(principalName)){
throw new JeroBootException("负责人名称为空！");
}
payIncomeContract.setPrincipalId(principalName.getId());
payIncomeContract.setPrincipalName(principalName.getRealname());
}
/**
* @Description 插入企业信息，联系人信息到临时表，更新项目记录
* @Author lqt
* @Date 2021/8/31
* @Param payCommonProject
* @Return
* @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)){
@@ -673,9 +704,12 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
}
payIncomeContract.setSignedCompanyTemporaryId(chargeCompanyName.getId());
payIncomeContract.setSignedCompanyTemporaryName(chargeCompanyName.getCompanyName());
payCompanyManagementTemporaryService.removeById(payIncomeContract.getSignedCompanyTemporaryId());
}else{
payIncomeContract.setSignedCompanyId(payIncomeContractStatus.getSignedCompanyId());
}
if(Objects.isNull(payIncomeContractStatus) || !Objects.equals(payIncomeContractStatus.getSignedContactsTemporaryId(),payIncomeContract.getSignedContactsId())){
if(!Objects.equals(payIncomeContractStatus.getSignedContactsTemporaryId(),payIncomeContract.getSignedContactsId())){
// 联系人
PayContactsManagementTemporary contactsName = payContactsManagementTemporaryService.insertContactsManagementTemporary(payIncomeContract.getSignedContactsId());
if(Objects.isNull(contactsName)){
@@ -683,9 +717,11 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
}
payIncomeContract.setSignedContactsTemporaryId(contactsName.getId());
payIncomeContract.setSignedContactsTemporaryName(contactsName.getName());
payContactsManagementTemporaryService.removeById(payIncomeContract.getSignedContactsTemporaryId());
}else{
payIncomeContract.setSignedContactsId(payIncomeContractStatus.getSignedContactsId());
}
// 负责人名称
SysUser principalName = sysUserService.getById(payIncomeContract.getPrincipalId());
if(Objects.isNull(principalName)){