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

修改bug#40730

Browse Source
This commit is contained in:
梁琦涛
2021-10-18 10:19:59 +08:00
parent 99086d4e1e
commit 138d00957a
3 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyServiceImpl.java
+5 -7
View File
@@ -69,7 +69,7 @@ public class PayPackCompanyServiceImpl extends ServiceImpl<PayPackCompanyMapper,
if(Objects.isNull(payPackCompanyOld)){ if(Objects.isNull(payPackCompanyOld)){
throw new JeroBootException("打包企业不存在！"); throw new JeroBootException("打包企业不存在！");
} }
if(!Objects.equals(payPackCompanyOld.getCompanyId(),payPackCompany.getCompanyId())){ if(!Objects.equals(payPackCompanyOld.getCompanyId(),payPackCompany.getCompanyId()) && !Objects.equals(payPackCompany.getCompanyId(),payPackCompanyOld.getCompanyTemporaryId())){
throw new JeroBootException("企业名称不可修改！"); throw new JeroBootException("企业名称不可修改！");
} }
try { try {
@@ -148,8 +148,8 @@ public class PayPackCompanyServiceImpl extends ServiceImpl<PayPackCompanyMapper,
}else{ }else{
payPackCompany.setCompanyId(payPackCompanyOld.getCompanyId()); payPackCompany.setCompanyId(payPackCompanyOld.getCompanyId());
} }
// 企业联系人
if(!Objects.equals(payPackCompanyOld.getCompanyContactTemporaryId(),payPackCompany.getCompanyContactId())){ if(!Objects.equals(payPackCompanyOld.getCompanyContactTemporaryId(),payPackCompany.getCompanyContactId())){
// 企业联系人
PayContactsManagementTemporary contactsName = payContactsManagementTemporaryService.insertContactsManagementTemporary(payPackCompany.getCompanyContactId()); PayContactsManagementTemporary contactsName = payContactsManagementTemporaryService.insertContactsManagementTemporary(payPackCompany.getCompanyContactId());
if(Objects.isNull(contactsName)){ if(Objects.isNull(contactsName)){
throw new JeroBootException("企业联系人名称为空！"); throw new JeroBootException("企业联系人名称为空！");
@@ -160,17 +160,15 @@ public class PayPackCompanyServiceImpl extends ServiceImpl<PayPackCompanyMapper,
}else{ }else{
payPackCompany.setCompanyContactId(payPackCompanyOld.getCompanyContactId()); payPackCompany.setCompanyContactId(payPackCompanyOld.getCompanyContactId());
} }
// 打包联系人
if(Objects.equals(payPackCompanyOld.getPackContactTemporaryId(),payPackCompanyOld.getPackContactId())){ if(!Objects.equals(payPackCompanyOld.getPackContactTemporaryId(),payPackCompanyOld.getPackContactId())){
// 邮寄联系人
PayContactsManagementTemporary mailContactsName = payContactsManagementTemporaryService.insertContactsManagementTemporary(payPackCompany.getPackContactId()); PayContactsManagementTemporary mailContactsName = payContactsManagementTemporaryService.insertContactsManagementTemporary(payPackCompany.getPackContactId());
if(Objects.isNull(mailContactsName)){ if(Objects.isNull(mailContactsName)){
throw new JeroBootException("邮寄联系人名称为空！"); throw new JeroBootException("打包联系人名称为空！");
} }
payPackCompany.setPackContactTemporaryId(mailContactsName.getId()); payPackCompany.setPackContactTemporaryId(mailContactsName.getId());
payPackCompany.setPackContactTemporaryName(mailContactsName.getName()); payPackCompany.setPackContactTemporaryName(mailContactsName.getName());
payContactsManagementTemporaryService.removeById(payPackCompanyOld.getPackContactTemporaryId()); payContactsManagementTemporaryService.removeById(payPackCompanyOld.getPackContactTemporaryId());
}else{ }else{
payPackCompany.setPackContactId(payPackCompanyOld.getPackContactId()); payPackCompany.setPackContactId(payPackCompanyOld.getPackContactId());
} }
jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java
+3 -3
View File
@@ -196,8 +196,8 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
if(!CollectionUtils.isEmpty(listPayPackCompany)){ if(!CollectionUtils.isEmpty(listPayPackCompany)){
List<String> listPayPackCompanyId = listPayPackCompany.stream().map(PayPackCompany::getId).collect(Collectors.toList()); List<String> listPayPackCompanyId = listPayPackCompany.stream().map(PayPackCompany::getId).collect(Collectors.toList());
LambdaQueryWrapper<PayPackCompanyProject> queryPayPackCompanyProject = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PayPackCompanyProject> queryPayPackCompanyProject = new LambdaQueryWrapper<>();
queryPayPackCompanyProject.in(PayPackCompanyProject::getProjectId,listPayPackCompanyId); queryPayPackCompanyProject.in(PayPackCompanyProject::getPackId,listPayPackCompanyId);
queryPayPackCompanyProject.eq(PayPackCompanyProject::getCome,PayProjectCommon.PROJECT_TYPE1); queryPayPackCompanyProject.eq(PayPackCompanyProject::getProjectType,PayProjectCommon.PROJECT_TYPE1);
List<PayPackCompanyProject> listPayPackCompanyProject = payPackCompanyProjectService.list(queryPayPackCompanyProject); List<PayPackCompanyProject> listPayPackCompanyProject = payPackCompanyProjectService.list(queryPayPackCompanyProject);
if(!CollectionUtils.isEmpty(listPayPackCompanyProject)){ if(!CollectionUtils.isEmpty(listPayPackCompanyProject)){
List<String> listId = listPayPackCompanyProject.stream().map(PayPackCompanyProject::getProjectId).collect(Collectors.toList()); List<String> listId = listPayPackCompanyProject.stream().map(PayPackCompanyProject::getProjectId).collect(Collectors.toList());
@@ -211,7 +211,7 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
if(!CollectionUtils.isEmpty(listPayIncomeContract)){ if(!CollectionUtils.isEmpty(listPayIncomeContract)){
List<String> listId = listPayIncomeContract.stream().map(PayIncomeContract::getId).collect(Collectors.toList()); List<String> listId = listPayIncomeContract.stream().map(PayIncomeContract::getId).collect(Collectors.toList());
LambdaQueryWrapper<PayIncomeContractAssociated> queryPayIncomeContractAssociated = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PayIncomeContractAssociated> queryPayIncomeContractAssociated = new LambdaQueryWrapper<>();
queryPayIncomeContractAssociated.in(PayIncomeContractAssociated::getProjectId,listId); queryPayIncomeContractAssociated.in(PayIncomeContractAssociated::getContractId,listId);
queryPayIncomeContractAssociated.eq(PayIncomeContractAssociated::getProjectType,PayProjectCommon.PROJECT_TYPE1); queryPayIncomeContractAssociated.eq(PayIncomeContractAssociated::getProjectType,PayProjectCommon.PROJECT_TYPE1);
List<PayIncomeContractAssociated> listPayIncomeContractAssociated = payIncomeContractAssociatedService.list(queryPayIncomeContractAssociated); List<PayIncomeContractAssociated> listPayIncomeContractAssociated = payIncomeContractAssociatedService.list(queryPayIncomeContractAssociated);
if(!CollectionUtils.isEmpty(listPayIncomeContractAssociated)){ if(!CollectionUtils.isEmpty(listPayIncomeContractAssociated)){
jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
+3 -3
View File
@@ -178,8 +178,8 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
if(!CollectionUtils.isEmpty(listPayPackCompany)){ if(!CollectionUtils.isEmpty(listPayPackCompany)){
List<String> listPayPackCompanyId = listPayPackCompany.stream().map(PayPackCompany::getId).collect(Collectors.toList()); List<String> listPayPackCompanyId = listPayPackCompany.stream().map(PayPackCompany::getId).collect(Collectors.toList());
LambdaQueryWrapper<PayPackCompanyProject> queryPayPackCompanyProject = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PayPackCompanyProject> queryPayPackCompanyProject = new LambdaQueryWrapper<>();
queryPayPackCompanyProject.in(PayPackCompanyProject::getProjectId,listPayPackCompanyId); queryPayPackCompanyProject.in(PayPackCompanyProject::getPackId,listPayPackCompanyId);
queryPayPackCompanyProject.eq(PayPackCompanyProject::getCome,PayProjectCommon.PROJECT_TYPE1); queryPayPackCompanyProject.eq(PayPackCompanyProject::getProjectType,PayProjectCommon.PROJECT_TYPE1);
List<PayPackCompanyProject> listPayPackCompanyProject = payPackCompanyProjectService.list(queryPayPackCompanyProject); List<PayPackCompanyProject> listPayPackCompanyProject = payPackCompanyProjectService.list(queryPayPackCompanyProject);
if(!CollectionUtils.isEmpty(listPayPackCompanyProject)){ if(!CollectionUtils.isEmpty(listPayPackCompanyProject)){
List<String> listId = listPayPackCompanyProject.stream().map(PayPackCompanyProject::getProjectId).collect(Collectors.toList()); List<String> listId = listPayPackCompanyProject.stream().map(PayPackCompanyProject::getProjectId).collect(Collectors.toList());
@@ -193,7 +193,7 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
if(!CollectionUtils.isEmpty(listPayIncomeContract)){ if(!CollectionUtils.isEmpty(listPayIncomeContract)){
List<String> listId = listPayIncomeContract.stream().map(PayIncomeContract::getId).collect(Collectors.toList()); List<String> listId = listPayIncomeContract.stream().map(PayIncomeContract::getId).collect(Collectors.toList());
LambdaQueryWrapper<PayIncomeContractAssociated> queryPayIncomeContractAssociated = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PayIncomeContractAssociated> queryPayIncomeContractAssociated = new LambdaQueryWrapper<>();
queryPayIncomeContractAssociated.in(PayIncomeContractAssociated::getProjectId,listId); queryPayIncomeContractAssociated.in(PayIncomeContractAssociated::getContractId,listId);
queryPayIncomeContractAssociated.eq(PayIncomeContractAssociated::getProjectType,PayProjectCommon.PROJECT_TYPE1); queryPayIncomeContractAssociated.eq(PayIncomeContractAssociated::getProjectType,PayProjectCommon.PROJECT_TYPE1);
List<PayIncomeContractAssociated> listPayIncomeContractAssociated = payIncomeContractAssociatedService.list(queryPayIncomeContractAssociated); List<PayIncomeContractAssociated> listPayIncomeContractAssociated = payIncomeContractAssociatedService.list(queryPayIncomeContractAssociated);
if(!CollectionUtils.isEmpty(listPayIncomeContractAssociated)){ if(!CollectionUtils.isEmpty(listPayIncomeContractAssociated)){