diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupMapper.xml index 16d4d12c..c0576888 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupMapper.xml @@ -33,10 +33,10 @@ - - AND pdgs.check_result != 3 - + + + + AND drafting_group_project LIKE concat('%',concat(#{payDraftingGroup.draftingGroupProject},'%')) 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 c19e818a..1f8f5351 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 @@ -158,13 +158,20 @@ public class PayDraftingGroupServiceImpl extends ServiceImpl listPayDraftingGroupSubItem = payDraftingGroupSubItemService.list(query); if (!CollectionUtils.isEmpty(listPayDraftingGroupSubItem)) { - for (PayDraftingGroupSubItem payDraftingGroupSubItem : listPayDraftingGroupSubItem) { - if (!Objects.equals(payDraftingGroupSubItem.getCheckResult(), DraftingConstant.CHECK_REJECTION)) { - throw new JeroBootException(payDraftingGroupOld.getDraftingGroupProject() + "起草组下存在企业,不可进行删除!"); - } - } + throw new JeroBootException(payDraftingGroupOld.getDraftingGroupProject() + "起草组下存在企业,不可进行删除!"); } +// LambdaQueryWrapper query = new LambdaQueryWrapper<>(); +// query.eq(PayDraftingGroupSubItem::getDraftingGroupId, id); +// List listPayDraftingGroupSubItem = payDraftingGroupSubItemService.list(query); +// if (!CollectionUtils.isEmpty(listPayDraftingGroupSubItem)) { +// for (PayDraftingGroupSubItem payDraftingGroupSubItem : listPayDraftingGroupSubItem) { +// if (!Objects.equals(payDraftingGroupSubItem.getCheckResult(), DraftingConstant.CHECK_REJECTION)) { +// throw new JeroBootException(payDraftingGroupOld.getDraftingGroupProject() + "起草组下存在企业,不可进行删除!"); +// } +// } +// } + LambdaQueryWrapper meetingQuery = new LambdaQueryWrapper<>(); meetingQuery.eq(PayMeeting::getDraftingGroupId,id); meetingQuery.eq(PayMeeting::getMeetingType, MeetingCommon.DRAFTING_GROUP_MEETING_INT); @@ -206,13 +213,19 @@ public class PayDraftingGroupServiceImpl extends ServiceImpl listPayDraftingGroupSubItem = payDraftingGroupSubItemService.list(query); if (!CollectionUtils.isEmpty(listPayDraftingGroupSubItem)) { - for (PayDraftingGroupSubItem payDraftingGroupSubItem : listPayDraftingGroupSubItem) { - if (!Objects.equals(payDraftingGroupSubItem.getCheckResult(), DraftingConstant.CHECK_REJECTION)) { - sb1.append(payDraftingGroupOld.getDraftingGroupProject() + "起草组下存在企业,不可进行删除!
"); - break; - } - } + sb1.append(payDraftingGroupOld.getDraftingGroupProject() + "起草组下存在企业,不可进行删除!
"); } +// LambdaQueryWrapper query = new LambdaQueryWrapper<>(); +// query.eq(PayDraftingGroupSubItem::getDraftingGroupId, p); +// List listPayDraftingGroupSubItem = payDraftingGroupSubItemService.list(query); +// if (!CollectionUtils.isEmpty(listPayDraftingGroupSubItem)) { +// for (PayDraftingGroupSubItem payDraftingGroupSubItem : listPayDraftingGroupSubItem) { +// if (!Objects.equals(payDraftingGroupSubItem.getCheckResult(), DraftingConstant.CHECK_REJECTION)) { +// sb1.append(payDraftingGroupOld.getDraftingGroupProject() + "起草组下存在企业,不可进行删除!
"); +// break; +// } +// } +// } LambdaQueryWrapper meetingQuery = new LambdaQueryWrapper<>(); meetingQuery.eq(PayMeeting::getDraftingGroupId,p); meetingQuery.eq(PayMeeting::getMeetingType, MeetingCommon.DRAFTING_GROUP_MEETING_INT);