From 02df07b0dc9a31132e241e3533a8b0541742b15b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com> Date: Fri, 22 Oct 2021 18:26:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug#40408?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayCompanyManagementController.java | 166 +++++++++++++++++- .../PayContactsManagementController.java | 132 +++++++++++++- 2 files changed, 283 insertions(+), 15 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java index a6bd2429..5c1d005d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java @@ -31,8 +31,19 @@ import com.jero.company.service.IPayCompanyManagementService; import com.jero.company.service.IPayContactsManagementService; import com.jero.company.service.ProjectCountService; import com.jero.company.vo.CompanyOrContactsCount; +import com.jero.meeting.entity.PayMeetingSituation; +import com.jero.meeting.service.IPayMeetingSituationService; +import com.jero.member.entity.PayMemberProjectSubitem; +import com.jero.member.entity.TbMemberProjectSubitem; +import com.jero.member.service.IPayMemberProjectService; +import com.jero.member.service.IPayMemberProjectSubitemService; +import com.jero.member.service.ITbMemberProjectSubitemService; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; +import com.jero.project.entity.PayCommonProject; +import com.jero.project.entity.PayWorkingGroupSubItem; +import com.jero.project.service.IPayCommonProjectService; +import com.jero.project.service.IPayWorkingGroupSubItemService; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import lombok.extern.slf4j.Slf4j; @@ -78,7 +89,15 @@ public class PayCompanyManagementController extends JeroController queryPayCompanyManagement = new LambdaQueryWrapper<>(); + queryPayCompanyManagement.in(PayCompanyManagement::getId,Arrays.asList(id.split(","))); + List listPayCompanyManagement = payCompanyManagementService.list(queryPayCompanyManagement); + if(CollectionUtils.isEmpty(listPayCompanyManagement)){ + return Result.error("企业不存在!"); + } + StringBuilder msg = new StringBuilder(); + listPayCompanyManagement.forEach(p->{ + LambdaQueryWrapper queryPayCommonProject = new LambdaQueryWrapper<>(); + queryPayCommonProject.eq(PayCommonProject::getChargeCompanyId,p.getId()); + List listPayCommonProject = payCommonProjectService.list(queryPayCommonProject); + if(!CollectionUtils.isEmpty(listPayCommonProject)){ + msg.append(p.getCompanyName() + "已关联项目,不可删除!
"); + return; + } + LambdaQueryWrapper queryPayWorkingGroupSubItem = new LambdaQueryWrapper<>(); + queryPayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getChargeCompanyId,p.getId()); + List listPayWorkingGroupSubItem = payWorkingGroupSubItemService.list(queryPayWorkingGroupSubItem); + if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItem)){ + msg.append(p.getCompanyName() + "已关联项目,不可删除!
"); + return; + } + LambdaQueryWrapper queryPayMeetingSituation = new LambdaQueryWrapper<>(); + queryPayMeetingSituation.eq(PayMeetingSituation::getCompanyId,p.getId()); + List listPayMeetingSituation = payMeetingSituationService.list(queryPayMeetingSituation); + if(!CollectionUtils.isEmpty(listPayMeetingSituation)){ + msg.append(p.getCompanyName() + "已关联项目,不可删除!
"); + return; + } + LambdaQueryWrapper queryPayMemberProjectSubitem = new LambdaQueryWrapper<>(); + queryPayMemberProjectSubitem.eq(PayMemberProjectSubitem::getCompanyId,p.getId()); + List listPayMemberProjectSubitem = memberProjectSubitemService.list(queryPayMemberProjectSubitem); + if(!CollectionUtils.isEmpty(listPayMemberProjectSubitem)){ + msg.append(p.getCompanyName() + "已关联项目,不可删除!
"); + return; + } + LambdaQueryWrapper queryTbMemberProjectSubitem = new LambdaQueryWrapper<>(); + queryTbMemberProjectSubitem.eq(TbMemberProjectSubitem::getCompanyId,p.getId()); + List listTbMemberProjectSubitem = tbMemberProjectSubitemService.list(queryTbMemberProjectSubitem); + if(!CollectionUtils.isEmpty(listTbMemberProjectSubitem)){ + msg.append(p.getCompanyName() + "已关联项目,不可删除!
"); + return; + } + }); + if(!StringUtils.isEmpty(msg)){ + return Result.error(msg.toString()); + } payCompanyManagementService.removePayCompanyManagementById(id); return Result.OK("删除成功!"); } @@ -453,9 +516,56 @@ public class PayCompanyManagementController extends JeroController queryPayCompanyManagement = new LambdaQueryWrapper<>(); + queryPayCompanyManagement.in(PayCompanyManagement::getId,Arrays.asList(s)); + List listPayCompanyManagement = payCompanyManagementService.list(queryPayCompanyManagement); + if(CollectionUtils.isEmpty(listPayCompanyManagement)){ + return Result.error("企业不存在!"); + } + StringBuilder msg = new StringBuilder(); + listPayCompanyManagement.forEach(p->{ + LambdaQueryWrapper queryPayCommonProject = new LambdaQueryWrapper<>(); + queryPayCommonProject.eq(PayCommonProject::getChargeCompanyId,p.getId()); + List listPayCommonProject = payCommonProjectService.list(queryPayCommonProject); + if(!CollectionUtils.isEmpty(listPayCommonProject)){ + msg.append(p.getCompanyName() + "已关联项目,不可删除!
"); + return; + } + LambdaQueryWrapper queryPayWorkingGroupSubItem = new LambdaQueryWrapper<>(); + queryPayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getChargeCompanyId,p.getId()); + List listPayWorkingGroupSubItem = payWorkingGroupSubItemService.list(queryPayWorkingGroupSubItem); + if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItem)){ + msg.append(p.getCompanyName() + "已关联项目,不可删除!
"); + return; + } + LambdaQueryWrapper queryPayMeetingSituation = new LambdaQueryWrapper<>(); + queryPayMeetingSituation.eq(PayMeetingSituation::getCompanyId,p.getId()); + List listPayMeetingSituation = payMeetingSituationService.list(queryPayMeetingSituation); + if(!CollectionUtils.isEmpty(listPayMeetingSituation)){ + msg.append(p.getCompanyName() + "已关联项目,不可删除!
"); + return; + } + LambdaQueryWrapper queryPayMemberProjectSubitem = new LambdaQueryWrapper<>(); + queryPayMemberProjectSubitem.eq(PayMemberProjectSubitem::getCompanyId,p.getId()); + List listPayMemberProjectSubitem = memberProjectSubitemService.list(queryPayMemberProjectSubitem); + if(!CollectionUtils.isEmpty(listPayMemberProjectSubitem)){ + msg.append(p.getCompanyName() + "已关联项目,不可删除!
"); + return; + } + LambdaQueryWrapper queryTbMemberProjectSubitem = new LambdaQueryWrapper<>(); + queryTbMemberProjectSubitem.eq(TbMemberProjectSubitem::getCompanyId,p.getId()); + List listTbMemberProjectSubitem = tbMemberProjectSubitemService.list(queryTbMemberProjectSubitem); + if(!CollectionUtils.isEmpty(listTbMemberProjectSubitem)){ + msg.append(p.getCompanyName() + "已关联项目,不可删除!
"); + return; + } + }); + if(!StringUtils.isEmpty(msg)){ + return Result.error(msg.toString()); + } +// CompanyOrContactsCount companyOrContactsCount = new CompanyOrContactsCount(); +// companyOrContactsCount.setCompanyId(Arrays.asList(s)); +// projectCountService.getProjectCount(companyOrContactsCount); this.payCompanyManagementService.removePayCompanyManagementByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); } @@ -568,10 +678,48 @@ public class PayCompanyManagementController extends JeroController{ - + LambdaQueryWrapper queryPayCommonProject = new LambdaQueryWrapper<>(); + queryPayCommonProject.eq(PayCommonProject::getChargeCompanyId,p.getId()); + List listPayCommonProject = payCommonProjectService.list(queryPayCommonProject); + if(!CollectionUtils.isEmpty(listPayCommonProject)){ + msg.append(p.getCompanyName() + "已关联项目,不可删除!
"); + return; + } + LambdaQueryWrapper queryPayWorkingGroupSubItem = new LambdaQueryWrapper<>(); + queryPayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getChargeCompanyId,p.getId()); + List listPayWorkingGroupSubItem = payWorkingGroupSubItemService.list(queryPayWorkingGroupSubItem); + if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItem)){ + msg.append(p.getCompanyName() + "已关联项目,不可删除!
"); + return; + } + LambdaQueryWrapper queryPayMeetingSituation = new LambdaQueryWrapper<>(); + queryPayMeetingSituation.eq(PayMeetingSituation::getCompanyId,p.getId()); + List listPayMeetingSituation = payMeetingSituationService.list(queryPayMeetingSituation); + if(!CollectionUtils.isEmpty(listPayMeetingSituation)){ + msg.append(p.getCompanyName() + "已关联项目,不可删除!
"); + return; + } + LambdaQueryWrapper queryPayMemberProjectSubitem = new LambdaQueryWrapper<>(); + queryPayMemberProjectSubitem.eq(PayMemberProjectSubitem::getCompanyId,p.getId()); + List listPayMemberProjectSubitem = memberProjectSubitemService.list(queryPayMemberProjectSubitem); + if(!CollectionUtils.isEmpty(listPayMemberProjectSubitem)){ + msg.append(p.getCompanyName() + "已关联项目,不可删除!
"); + return; + } + LambdaQueryWrapper queryTbMemberProjectSubitem = new LambdaQueryWrapper<>(); + queryTbMemberProjectSubitem.eq(TbMemberProjectSubitem::getCompanyId,p.getId()); + List listTbMemberProjectSubitem = tbMemberProjectSubitemService.list(queryTbMemberProjectSubitem); + if(!CollectionUtils.isEmpty(listTbMemberProjectSubitem)){ + msg.append(p.getCompanyName() + "已关联项目,不可删除!
"); + return; + } }); - return Result.OK(""); + if(!StringUtils.isEmpty(msg)){ + return Result.error(msg.toString()); + } + return Result.OK("可操作!"); } /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java index 6fc7a36d..0a7f16f4 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java @@ -29,6 +29,16 @@ import com.jero.company.service.IPayCompanyManagementService; import com.jero.company.service.IPayContactsManagementService; import com.jero.company.service.ProjectCountService; import com.jero.company.vo.CompanyOrContactsCount; +import com.jero.meeting.entity.PayMeetingSituation; +import com.jero.meeting.service.IPayMeetingSituationService; +import com.jero.member.entity.PayMemberProjectSubitem; +import com.jero.member.entity.TbMemberProjectSubitem; +import com.jero.member.service.IPayMemberProjectSubitemService; +import com.jero.member.service.ITbMemberProjectSubitemService; +import com.jero.project.entity.PayCommonProject; +import com.jero.project.entity.PayWorkingGroupSubItem; +import com.jero.project.service.IPayCommonProjectService; +import com.jero.project.service.IPayWorkingGroupSubItemService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -68,6 +78,16 @@ public class PayContactsManagementController extends JeroController queryPayContactsManagement = new LambdaQueryWrapper<>(); + queryPayContactsManagement.in(PayContactsManagement::getId,Arrays.asList(id.split(","))); + List listPayContactsManagement = payContactsManagementService.list(queryPayContactsManagement); + if(CollectionUtils.isEmpty(listPayContactsManagement)){ + return Result.error("联系人不存在!"); + } + StringBuilder msg = new StringBuilder(); + listPayContactsManagement.forEach(p->{ + LambdaQueryWrapper queryPayCommonProject = new LambdaQueryWrapper<>(); + queryPayCommonProject.eq(PayCommonProject::getContactsId,p.getId()).or().eq(PayCommonProject::getMailContactsId,p.getId()); + List listPayCommonProject = payCommonProjectService.list(queryPayCommonProject); + if(!CollectionUtils.isEmpty(listPayCommonProject)){ + msg.append(p.getName() + "已关联项目,不可删除!
"); + return; + } + LambdaQueryWrapper queryPayWorkingGroupSubItem = new LambdaQueryWrapper<>(); + queryPayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getContactsIdOne,p.getId()).or() + .eq(PayWorkingGroupSubItem::getContactsIdTwo,p.getId()).or() + .eq(PayWorkingGroupSubItem::getContactsIdThree,p.getId()).or() + .eq(PayWorkingGroupSubItem::getMailContactsId,p.getId()); + List listPayWorkingGroupSubItem = payWorkingGroupSubItemService.list(queryPayWorkingGroupSubItem); + if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItem)){ + msg.append(p.getName() + "已关联项目,不可删除!
"); + return; + } + LambdaQueryWrapper queryPayMeetingSituation = new LambdaQueryWrapper<>(); + queryPayMeetingSituation.eq(PayMeetingSituation::getCompanyContactId,p.getId()).or().eq(PayMeetingSituation::getPostContactId,p.getId()); + List listPayMeetingSituation = payMeetingSituationService.list(queryPayMeetingSituation); + if(!CollectionUtils.isEmpty(listPayMeetingSituation)){ + msg.append(p.getName() + "已关联项目,不可删除!
"); + return; + } + LambdaQueryWrapper queryPayMemberProjectSubitem = new LambdaQueryWrapper<>(); + queryPayMemberProjectSubitem.eq(PayMemberProjectSubitem::getCompanyContactId,p.getId()).eq(PayMemberProjectSubitem::getPostContactId,p.getId()); + List listPayMemberProjectSubitem = memberProjectSubitemService.list(queryPayMemberProjectSubitem); + if(!CollectionUtils.isEmpty(listPayMemberProjectSubitem)){ + msg.append(p.getName() + "已关联项目,不可删除!
"); + return; + } + LambdaQueryWrapper queryTbMemberProjectSubitem = new LambdaQueryWrapper<>(); + queryTbMemberProjectSubitem.eq(TbMemberProjectSubitem::getLiaisonManId,p.getId()); + List listTbMemberProjectSubitem = tbMemberProjectSubitemService.list(queryTbMemberProjectSubitem); + if(!CollectionUtils.isEmpty(listTbMemberProjectSubitem)){ + msg.append(p.getName() + "已关联项目,不可删除!
"); + return; + } + }); + if(!StringUtils.isEmpty(msg)){ + return Result.error(msg.toString()); + } +// CompanyOrContactsCount companyOrContactsCount = new CompanyOrContactsCount(); +// companyOrContactsCount.setContactsId(Arrays.asList(id.split(","))); +// projectCountService.getProjectCount(companyOrContactsCount); payContactsManagementService.removeById(id); return Result.OK("删除成功!"); } @@ -433,9 +503,59 @@ public class PayContactsManagementController extends JeroController queryPayContactsManagement = new LambdaQueryWrapper<>(); + queryPayContactsManagement.in(PayContactsManagement::getId,Arrays.asList(s)); + List listPayContactsManagement = payContactsManagementService.list(queryPayContactsManagement); + if(CollectionUtils.isEmpty(listPayContactsManagement)){ + return Result.error("联系人不存在!"); + } + StringBuilder msg = new StringBuilder(); + listPayContactsManagement.forEach(p->{ + LambdaQueryWrapper queryPayCommonProject = new LambdaQueryWrapper<>(); + queryPayCommonProject.eq(PayCommonProject::getContactsId,p.getId()).or().eq(PayCommonProject::getMailContactsId,p.getId()); + List listPayCommonProject = payCommonProjectService.list(queryPayCommonProject); + if(!CollectionUtils.isEmpty(listPayCommonProject)){ + msg.append(p.getName() + "已关联项目,不可删除!
"); + return; + } + LambdaQueryWrapper queryPayWorkingGroupSubItem = new LambdaQueryWrapper<>(); + queryPayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getContactsIdOne,p.getId()).or() + .eq(PayWorkingGroupSubItem::getContactsIdTwo,p.getId()).or() + .eq(PayWorkingGroupSubItem::getContactsIdThree,p.getId()).or() + .eq(PayWorkingGroupSubItem::getMailContactsId,p.getId()); + List listPayWorkingGroupSubItem = payWorkingGroupSubItemService.list(queryPayWorkingGroupSubItem); + if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItem)){ + msg.append(p.getName() + "已关联项目,不可删除!
"); + return; + } + LambdaQueryWrapper queryPayMeetingSituation = new LambdaQueryWrapper<>(); + queryPayMeetingSituation.eq(PayMeetingSituation::getCompanyContactId,p.getId()).or().eq(PayMeetingSituation::getPostContactId,p.getId()); + List listPayMeetingSituation = payMeetingSituationService.list(queryPayMeetingSituation); + if(!CollectionUtils.isEmpty(listPayMeetingSituation)){ + msg.append(p.getName() + "已关联项目,不可删除!
"); + return; + } + LambdaQueryWrapper queryPayMemberProjectSubitem = new LambdaQueryWrapper<>(); + queryPayMemberProjectSubitem.eq(PayMemberProjectSubitem::getCompanyContactId,p.getId()).eq(PayMemberProjectSubitem::getPostContactId,p.getId()); + List listPayMemberProjectSubitem = memberProjectSubitemService.list(queryPayMemberProjectSubitem); + if(!CollectionUtils.isEmpty(listPayMemberProjectSubitem)){ + msg.append(p.getName() + "已关联项目,不可删除!
"); + return; + } + LambdaQueryWrapper queryTbMemberProjectSubitem = new LambdaQueryWrapper<>(); + queryTbMemberProjectSubitem.eq(TbMemberProjectSubitem::getLiaisonManId,p.getId()); + List listTbMemberProjectSubitem = tbMemberProjectSubitemService.list(queryTbMemberProjectSubitem); + if(!CollectionUtils.isEmpty(listTbMemberProjectSubitem)){ + msg.append(p.getName() + "已关联项目,不可删除!
"); + return; + } + }); + if(!StringUtils.isEmpty(msg)){ + return Result.error(msg.toString()); + } +// CompanyOrContactsCount companyOrContactsCount = new CompanyOrContactsCount(); +// companyOrContactsCount.setContactsId(Arrays.asList(s)); +// projectCountService.getProjectCount(companyOrContactsCount); this.payContactsManagementService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); }