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

修改bug#40547

Browse Source
This commit is contained in:
梁琦涛
2021-10-18 14:08:06 +08:00
parent 85f526883b
commit c2ba2a8515
2 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java
+11 -4
View File
@@ -241,12 +241,19 @@ public class PayCommonProjectServiceImpl extends ServiceImpl<PayCommonProjectMap
*/
private void deleteProject(String id){
PayCommonProject payCommonProject = payCommonProjectService.getById(id);
// 到账！=0 || 开票！=0 || 邮寄！=0
if(!Objects.equals(payCommonProject.getInAccount(),PayProjectCommon.IN_ACCOUNT0)
|| !Objects.equals(payCommonProject.getMakeInvoice(),PayProjectCommon.MAKE_INVOICE0)
|| !Objects.equals(payCommonProject.getMail(),PayProjectCommon.MAIL0)){
// 到账！=0
if(!Objects.equals(payCommonProject.getInAccount(),PayProjectCommon.IN_ACCOUNT0)){
throw new JeroBootException("项目已有到账信息不可删除！");
}
// 开票！=0
if(!Objects.equals(payCommonProject.getMakeInvoice(),PayProjectCommon.MAKE_INVOICE0)){
throw new JeroBootException("项目已有开票信息不可删除！");
}
// 邮寄！=0
if(!Objects.equals(payCommonProject.getMail(),PayProjectCommon.MAIL0)){
throw new JeroBootException("项目已有邮寄信息不可删除！");
}
// 校验项目是否已关联合同 抛异常
payIncomeContractService.getPayIncomeContractAssociated(Collections.singletonList(payCommonProject.getId()));
// 如果已打报，同步删除打包关联
jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
+10 -4
View File
@@ -606,12 +606,18 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
*/
private void deleteProject(String id){
PayWorkingGroupSubItem payWorkingGroupSubItem = payWorkingGroupSubItemService.getById(id);
// 到账！=0 || 开票！=0 || 邮寄！=0
if(!Objects.equals(payWorkingGroupSubItem.getInAccount(),PayProjectCommon.IN_ACCOUNT0)
|| !Objects.equals(payWorkingGroupSubItem.getMakeInvoice(),PayProjectCommon.MAKE_INVOICE0)
|| !Objects.equals(payWorkingGroupSubItem.getMail(),PayProjectCommon.MAIL0)){
// 到账！=0
if(!Objects.equals(payWorkingGroupSubItem.getInAccount(),PayProjectCommon.IN_ACCOUNT0)){
throw new JeroBootException("项目已有到账信息不可删除！");
}
// 开票！=0
if(!Objects.equals(payWorkingGroupSubItem.getMakeInvoice(),PayProjectCommon.MAKE_INVOICE0)){
throw new JeroBootException("项目已有开票信息不可删除！");
}
// 邮寄！=0
if(!Objects.equals(payWorkingGroupSubItem.getMail(),PayProjectCommon.MAIL0)){
throw new JeroBootException("项目已有邮寄信息不可删除！");
}
// 校验项目是否已关联合同 抛异常
payIncomeContractService.getPayIncomeContractAssociated(Collections.singletonList(payWorkingGroupSubItem.getId()));
// 如果已打报，同步删除打包关联