From ed08ce97957d6f20f0b5ada77258490af335ec4c Mon Sep 17 00:00:00 2001 From: sunzheng Date: Tue, 9 Jan 2024 11:15:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84,=E8=B5=B7=E8=8D=89?= =?UTF-8?q?=E7=BB=84,=E5=88=86=E6=A0=87=E5=A7=94=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=89=8D=E6=B7=BB=E5=8A=A0=E6=A0=A1=E9=AA=8C,=E5=A6=82?= =?UTF-8?q?=E6=9E=9C=E6=9C=89=E5=85=B3=E8=81=94=E7=9A=84=E4=BC=9A=E8=AE=AE?= =?UTF-8?q?=E4=B8=8D=E5=85=81=E8=AE=B8=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayCaseCommitteeController.java | 25 ++++++++++++--- .../impl/PayDraftingGroupServiceImpl.java | 31 ++++++++++++++++++- .../impl/PayWorkingGroupServiceImpl.java | 23 +++++++++++++- 3 files changed, 72 insertions(+), 7 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java index 39c8c12d..8b528f15 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java @@ -15,6 +15,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.exception.JeroBootException; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.oConvertUtils; @@ -23,11 +24,15 @@ import com.jero.data.entity.DTO.PayCaseCommitteeDTO; import com.jero.data.entity.DTO.PayCaseCommitteeUpdateDTO; import com.jero.data.service.IPayCaseCommitteeService; import com.jero.data.service.IPayCaseCommitteeSubitemService; +import com.jero.meeting.common.MeetingCommon; +import com.jero.meeting.entity.PayMeeting; +import com.jero.meeting.service.IPayMeetingService; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresAuthentication; @@ -60,8 +65,8 @@ public class PayCaseCommitteeController extends JeroController payCaseCommitteeSubitems = payCaseCommitteeSubitemService.selectList(queryWrapper); if(payCaseCommitteeSubitems.size()>0){ return Result.error("分标委下级仍有数据，不可删除!"); - }payCaseCommitteeService.removeById(id); + } + // 判断分标委下是否存在会议 + LambdaQueryWrapper meetingQuery = new LambdaQueryWrapper<>(); + meetingQuery.eq(PayMeeting::getCaseCommitteeId,id); + meetingQuery.eq(PayMeeting::getMeetingType, MeetingCommon.COMMITTEE_MEETING_INT); + List listPayMeeting = payMeetingService.list(meetingQuery); + if (!CollectionUtils.isEmpty(listPayMeeting)) { + throw new JeroBootException("分标委下存在会议，不可进行删除!"); + } + payCaseCommitteeService.removeById(id); return Result.OK("删除成功!"); } - - } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupServiceImpl.java index d5c1cf28..4107024b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupServiceImpl.java @@ -15,6 +15,9 @@ import com.jero.drafting.mapper.PayDraftingGroupMapper; import com.jero.drafting.service.IPayDraftingGroupService; import com.jero.drafting.service.IPayDraftingGroupSubItemService; import com.jero.drafting.vo.PayDraftingGroupVo; +import com.jero.meeting.common.MeetingCommon; +import com.jero.meeting.entity.PayMeeting; +import com.jero.meeting.service.IPayMeetingService; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.service.impl.SysUserServiceImpl; @@ -59,6 +62,8 @@ public class PayDraftingGroupServiceImpl extends ServiceImpl meetingQuery = new LambdaQueryWrapper<>(); + meetingQuery.eq(PayMeeting::getDraftingGroupId,id); + meetingQuery.eq(PayMeeting::getMeetingType, MeetingCommon.DRAFTING_GROUP_MEETING_INT); + List listPayMeeting = payMeetingService.list(meetingQuery); + if (!CollectionUtils.isEmpty(listPayMeeting)) { + throw new JeroBootException(payDraftingGroupOld.getDraftingGroupProject() + "起草组下存在会议，不可进行删除!"); + } + removeById(id); LambdaUpdateWrapper updatePayDraftingGroupSubItem = new LambdaUpdateWrapper<>(); updatePayDraftingGroupSubItem.eq(PayDraftingGroupSubItem::getDraftingGroupId, id); @@ -160,7 +173,14 @@ public class PayDraftingGroupServiceImpl extends ServiceImpl listPayDraftingGroupSubItem = payDraftingGroupSubItemService.list(query); if (!CollectionUtils.isEmpty(listPayDraftingGroupSubItem)) { - sb1.append(payDraftingGroupOld.getDraftingGroupProject() + "起草组下存在企业，不可进行删除！
"); + } + LambdaQueryWrapper meetingQuery = new LambdaQueryWrapper<>(); + meetingQuery.eq(PayMeeting::getDraftingGroupId,p); + meetingQuery.eq(PayMeeting::getMeetingType, MeetingCommon.DRAFTING_GROUP_MEETING_INT); + List listPayMeeting = payMeetingService.list(meetingQuery); + if (!CollectionUtils.isEmpty(listPayMeeting)) { + throw new JeroBootException(payDraftingGroupOld.getDraftingGroupProject() + "起草组下存在会议，不可进行删除!
"); } }); if (!StringUtils.isEmpty(sb)) { @@ -215,5 +235,14 @@ public class PayDraftingGroupServiceImpl extends ServiceImpl queryPageList(Page page, PayWorkingGroup payWorkingGroup) { @@ -117,6 +122,14 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl meetingQuery = new LambdaQueryWrapper<>(); + meetingQuery.eq(PayMeeting::getWorkingGroupId,id); + meetingQuery.eq(PayMeeting::getMeetingType, MeetingCommon.WORKING_GROUP_MEETING_INT); + List listPayMeeting = payMeetingService.list(meetingQuery); + if (!CollectionUtils.isEmpty(listPayMeeting)) { + throw new JeroBootException(payWorkingGroupOld.getWorkingGroupProject() + "工作组下存在会议，不可进行删除!"); + } payWorkingGroupService.removeById(id); LambdaUpdateWrapper updatePayWorkingGroupSubItem = new LambdaUpdateWrapper<>(); updatePayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getWorkingGroupId,id); @@ -141,7 +154,15 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl listPayWorkingGroupSubItem = payWorkingGroupSubItemService.list(query); if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItem)) { - sb1.append(payWorkingGroupOld.getWorkingGroupProject() + "工作组下存在企业，不可进行删除！
"); + } + // 判断工作组下是否存在会议 + LambdaQueryWrapper meetingQuery = new LambdaQueryWrapper<>(); + meetingQuery.eq(PayMeeting::getWorkingGroupId,p); + meetingQuery.eq(PayMeeting::getMeetingType, MeetingCommon.WORKING_GROUP_MEETING_INT); + List listPayMeeting = payMeetingService.list(meetingQuery); + if (!CollectionUtils.isEmpty(listPayMeeting)) { + sb1.append(payWorkingGroupOld.getWorkingGroupProject() + "工作组下存在会议，不可进行删除！
"); } }); if(!StringUtils.isEmpty(sb)){