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

修改bug#40863

Browse Source
This commit is contained in:
梁琦涛
2021-10-18 13:31:41 +08:00
parent 63a150f78a
commit 78805be6c3
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java
+2 -2
View File
@@ -145,10 +145,10 @@ public class PayPayMemberProjectSubitemServiceImpl extends ServiceImpl<PayMember
// 校验项目是否已关联合同
PayIncomeContract payIncomeContract = payIncomeContractService.checkPayIncomeContractAssociated(payMemberProjectSubitem.getId());
if(!Objects.isNull(payIncomeContract)){
if(!Objects.equals(payMemberProjectSubitem.getPaymentMethod(),PayProjectCommon.CHARGE_WAY2)){
if(!Objects.equals(payMemberProjectSubitem.getPaymentMethod(),payMemberProjectSubitem1.getPaymentMethod())){
throw new JeroBootException("项目已关联合同，来款方式不可修改！");
}
if(!Objects.equals(payIncomeContract.getContractNum(),payMemberProjectSubitem.getContractNo())){
if(Objects.equals(payMemberProjectSubitem1.getPaymentMethod(),PayProjectCommon.CHARGE_WAY2) && !Objects.equals(payMemberProjectSubitem1.getContractNo(),payMemberProjectSubitem.getContractNo())){
throw new JeroBootException("项目已关联合同，合同编号不可修改！");
}
}else{
jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyServiceImpl.java
+1 -1
View File
@@ -161,7 +161,7 @@ public class PayPackCompanyServiceImpl extends ServiceImpl<PayPackCompanyMapper,
payPackCompany.setCompanyContactId(payPackCompanyOld.getCompanyContactId());
}
// 打包联系人
if(!Objects.equals(payPackCompanyOld.getPackContactTemporaryId(),payPackCompanyOld.getPackContactId())){
if(!Objects.equals(payPackCompanyOld.getPackContactTemporaryId(),payPackCompany.getPackContactId())){
PayContactsManagementTemporary mailContactsName = payContactsManagementTemporaryService.insertContactsManagementTemporary(payPackCompany.getPackContactId());
if(Objects.isNull(mailContactsName)){
throw new JeroBootException("打包联系人名称为空！");
jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
+2 -2
View File
@@ -179,7 +179,7 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
List<String> listPayPackCompanyId = listPayPackCompany.stream().map(PayPackCompany::getId).collect(Collectors.toList());
LambdaQueryWrapper<PayPackCompanyProject> queryPayPackCompanyProject = new LambdaQueryWrapper<>();
queryPayPackCompanyProject.in(PayPackCompanyProject::getPackId,listPayPackCompanyId);
queryPayPackCompanyProject.eq(PayPackCompanyProject::getProjectType,PayProjectCommon.PROJECT_TYPE1);
queryPayPackCompanyProject.eq(PayPackCompanyProject::getProjectType,PayProjectCommon.PROJECT_TYPE2);
List<PayPackCompanyProject> listPayPackCompanyProject = payPackCompanyProjectService.list(queryPayPackCompanyProject);
if(!CollectionUtils.isEmpty(listPayPackCompanyProject)){
List<String> listId = listPayPackCompanyProject.stream().map(PayPackCompanyProject::getProjectId).collect(Collectors.toList());
@@ -194,7 +194,7 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
List<String> listId = listPayIncomeContract.stream().map(PayIncomeContract::getId).collect(Collectors.toList());
LambdaQueryWrapper<PayIncomeContractAssociated> queryPayIncomeContractAssociated = new LambdaQueryWrapper<>();
queryPayIncomeContractAssociated.in(PayIncomeContractAssociated::getContractId,listId);
queryPayIncomeContractAssociated.eq(PayIncomeContractAssociated::getProjectType,PayProjectCommon.PROJECT_TYPE1);
queryPayIncomeContractAssociated.eq(PayIncomeContractAssociated::getProjectType,PayProjectCommon.PROJECT_TYPE2);
List<PayIncomeContractAssociated> listPayIncomeContractAssociated = payIncomeContractAssociatedService.list(queryPayIncomeContractAssociated);
if(!CollectionUtils.isEmpty(listPayIncomeContractAssociated)){
List<String> listProjectId = listPayIncomeContractAssociated.stream().map(PayIncomeContractAssociated::getProjectId).collect(Collectors.toList());
jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java
+2 -2
View File
@@ -145,10 +145,10 @@ public class PayCommonProjectServiceImpl extends ServiceImpl<PayCommonProjectMap
// 校验项目是否已关联合同
PayIncomeContract payIncomeContract = payIncomeContractService.checkPayIncomeContractAssociated(payCommonProjectOld.getId());
if(!Objects.isNull(payIncomeContract)){
if(!Objects.equals(payCommonProject.getChargeWay(),PayProjectCommon.CHARGE_WAY2)){
if(!Objects.equals(payCommonProject.getChargeWay(),payCommonProjectOld.getChargeWay())){
throw new JeroBootException("项目已关联合同，来款方式不可修改！");
}
if(!Objects.equals(payIncomeContract.getContractNum(),payCommonProject.getContractNum())){
if(Objects.equals(payCommonProjectOld.getChargeWay(),PayProjectCommon.CHARGE_WAY2) && !Objects.equals(payCommonProjectOld.getContractNum(),payCommonProject.getContractNum())){
throw new JeroBootException("项目已关联合同，合同编号不可修改！");
}
}else{
jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
+2 -2
View File
@@ -228,10 +228,10 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
// 校验项目是否已关联合同
PayIncomeContract payIncomeContract = payIncomeContractService.checkPayIncomeContractAssociated(payWorkingGroupSubItem.getId());
if(!Objects.isNull(payIncomeContract)){
if(!Objects.equals(payWorkingGroupSubItem.getChargeWay(),PayProjectCommon.CHARGE_WAY2)){
if(!Objects.equals(payWorkingGroupSubItem.getChargeWay(),payWorkingGroupSubItemOld.getChargeWay())){
throw new JeroBootException("项目已关联合同，来款方式不可修改！");
}
if(!Objects.equals(payIncomeContract.getContractNum(),payWorkingGroupSubItem.getContractNum())){
if(Objects.equals(payWorkingGroupSubItemOld.getChargeWay(),PayProjectCommon.CHARGE_WAY2) && !Objects.equals(payWorkingGroupSubItemOld.getContractNum(),payWorkingGroupSubItem.getContractNum())){
throw new JeroBootException("项目已关联合同，合同编号不可修改！");
}
}else{