收入合同修改
This commit is contained in:
+54
-6
@@ -57,7 +57,7 @@ public class PayPackCompanyServiceImpl extends ServiceImpl<PayPackCompanyMapper,
|
||||
log.error("",e);
|
||||
throw new JeroBootException("该年份下已存在此打包企业!");
|
||||
}
|
||||
setPayPackCompany(payPackCompany);
|
||||
setPayPackCompanyAdd(payPackCompany);
|
||||
payPackCompanyService.save(payPackCompany);
|
||||
return payPackCompany;
|
||||
}
|
||||
@@ -84,10 +84,7 @@ public class PayPackCompanyServiceImpl extends ServiceImpl<PayPackCompanyMapper,
|
||||
log.error("",e);
|
||||
throw new JeroBootException("该年份下已存在此打包企业!");
|
||||
}
|
||||
setPayPackCompany(payPackCompany);
|
||||
// 删除历史数据
|
||||
payCompanyManagementTemporaryService.removeById(payPackCompanyOld.getCompanyTemporaryId());
|
||||
payContactsManagementTemporaryService.removeByIds(Arrays.asList(payPackCompanyOld.getCompanyContactTemporaryId(),payPackCompanyOld.getPackContactTemporaryId()));
|
||||
setPayPackCompanyEdit(payPackCompany,payPackCompanyOld);
|
||||
payPackCompanyService.updateById(payPackCompany);
|
||||
}
|
||||
|
||||
@@ -104,7 +101,7 @@ public class PayPackCompanyServiceImpl extends ServiceImpl<PayPackCompanyMapper,
|
||||
* @Return
|
||||
* @Exception
|
||||
*/
|
||||
private PayPackCompany setPayPackCompany(PayPackCompany payPackCompany){
|
||||
private PayPackCompany setPayPackCompanyAdd(PayPackCompany payPackCompany){
|
||||
// 企业
|
||||
PayCompanyManagementTemporary chargeCompanyName = payCompanyManagementTemporaryService.insertCompanyManagementTemporary(payPackCompany.getCompanyId());
|
||||
if(Objects.isNull(chargeCompanyName)){
|
||||
@@ -128,4 +125,55 @@ public class PayPackCompanyServiceImpl extends ServiceImpl<PayPackCompanyMapper,
|
||||
payPackCompany.setPackContactTemporaryName(mailContactsName.getName());
|
||||
return payPackCompany;
|
||||
}
|
||||
|
||||
/**
|
||||
* @Description 插入企业信息,联系人信息到临时表,更新项目记录
|
||||
* @Author lqt
|
||||
* @Date 2021/8/31
|
||||
* @Param payCommonProject
|
||||
* @Return
|
||||
* @Exception
|
||||
*/
|
||||
private PayPackCompany setPayPackCompanyEdit(PayPackCompany payPackCompany,PayPackCompany payPackCompanyOld){
|
||||
|
||||
if(!Objects.equals(payPackCompanyOld.getCompanyTemporaryId(),payPackCompany.getCompanyId())){
|
||||
// 企业
|
||||
PayCompanyManagementTemporary chargeCompanyName = payCompanyManagementTemporaryService.insertCompanyManagementTemporary(payPackCompany.getCompanyId());
|
||||
if(Objects.isNull(chargeCompanyName)){
|
||||
throw new JeroBootException("企业名称为空!");
|
||||
}
|
||||
payPackCompany.setCompanyTemporaryId(chargeCompanyName.getId());
|
||||
payPackCompany.setCompanyTemporaryName(chargeCompanyName.getCompanyName());
|
||||
payCompanyManagementTemporaryService.removeById(payPackCompanyOld.getCompanyTemporaryId());
|
||||
}else{
|
||||
payPackCompany.setCompanyId(payPackCompanyOld.getCompanyId());
|
||||
}
|
||||
if(!Objects.equals(payPackCompanyOld.getCompanyContactTemporaryId(),payPackCompany.getCompanyContactId())){
|
||||
// 企业联系人
|
||||
PayContactsManagementTemporary contactsName = payContactsManagementTemporaryService.insertContactsManagementTemporary(payPackCompany.getCompanyContactId());
|
||||
if(Objects.isNull(contactsName)){
|
||||
throw new JeroBootException("企业联系人名称为空!");
|
||||
}
|
||||
payPackCompany.setCompanyContactTemporaryId(contactsName.getId());
|
||||
payPackCompany.setCompanyContactTemporaryName(contactsName.getName());
|
||||
payContactsManagementTemporaryService.removeById(payPackCompanyOld.getCompanyContactTemporaryId());
|
||||
}else{
|
||||
payPackCompany.setCompanyContactId(payPackCompanyOld.getCompanyContactId());
|
||||
}
|
||||
|
||||
if(Objects.equals(payPackCompanyOld.getPackContactTemporaryId(),payPackCompanyOld.getPackContactId())){
|
||||
// 邮寄联系人
|
||||
PayContactsManagementTemporary mailContactsName = payContactsManagementTemporaryService.insertContactsManagementTemporary(payPackCompany.getPackContactId());
|
||||
if(Objects.isNull(mailContactsName)){
|
||||
throw new JeroBootException("邮寄联系人名称为空!");
|
||||
}
|
||||
payPackCompany.setPackContactTemporaryId(mailContactsName.getId());
|
||||
payPackCompany.setPackContactTemporaryName(mailContactsName.getName());
|
||||
payContactsManagementTemporaryService.removeById(payPackCompanyOld.getPackContactTemporaryId());
|
||||
|
||||
}else{
|
||||
payPackCompany.setPackContactId(payPackCompanyOld.getPackContactId());
|
||||
}
|
||||
return payPackCompany;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user