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

去掉验证是否审核被拒绝的条件

Browse Source
This commit is contained in:
sunzheng
2024-01-12 17:44:21 +08:00
parent dfc4600765
commit 53b6c8fa89
2 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupMapper.xml
+4 -4
View File
@@ -33,10 +33,10 @@
</if> </if>
<where> <where>
<!-- 动态条件 --> <!-- 动态条件 -->
<if test="(payDraftingGroup.companyContactName != null and payDraftingGroup.companyContactName != '') <!-- <if test="(payDraftingGroup.companyContactName != null and payDraftingGroup.companyContactName != '')-->
or (payDraftingGroup.companyName != null and payDraftingGroup.companyName != '')"> <!-- or (payDraftingGroup.companyName != null and payDraftingGroup.companyName != '')">-->
AND pdgs.check_result != 3 <!-- AND pdgs.check_result != 3-->
</if> <!-- </if>-->
<if test="payDraftingGroup.draftingGroupProject != null and payDraftingGroup.draftingGroupProject != ''"> <if test="payDraftingGroup.draftingGroupProject != null and payDraftingGroup.draftingGroupProject != ''">
AND drafting_group_project LIKE concat('%',concat(#{payDraftingGroup.draftingGroupProject},'%')) AND drafting_group_project LIKE concat('%',concat(#{payDraftingGroup.draftingGroupProject},'%'))
</if> </if>
jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupServiceImpl.java
+24 -11
View File
@@ -158,13 +158,20 @@ public class PayDraftingGroupServiceImpl extends ServiceImpl<PayDraftingGroupMap
query.eq(PayDraftingGroupSubItem::getDraftingGroupId, id); query.eq(PayDraftingGroupSubItem::getDraftingGroupId, id);
List<PayDraftingGroupSubItem> listPayDraftingGroupSubItem = payDraftingGroupSubItemService.list(query); List<PayDraftingGroupSubItem> listPayDraftingGroupSubItem = payDraftingGroupSubItemService.list(query);
if (!CollectionUtils.isEmpty(listPayDraftingGroupSubItem)) { if (!CollectionUtils.isEmpty(listPayDraftingGroupSubItem)) {
for (PayDraftingGroupSubItem payDraftingGroupSubItem : listPayDraftingGroupSubItem) { throw new JeroBootException(payDraftingGroupOld.getDraftingGroupProject() + "起草组下存在企业，不可进行删除!");
if (!Objects.equals(payDraftingGroupSubItem.getCheckResult(), DraftingConstant.CHECK_REJECTION)) {
throw new JeroBootException(payDraftingGroupOld.getDraftingGroupProject() + "起草组下存在企业，不可进行删除!");
}
}
} }
// LambdaQueryWrapper<PayDraftingGroupSubItem> query = new LambdaQueryWrapper<>();
// query.eq(PayDraftingGroupSubItem::getDraftingGroupId, id);
// List<PayDraftingGroupSubItem> 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<PayMeeting> meetingQuery = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PayMeeting> meetingQuery = new LambdaQueryWrapper<>();
meetingQuery.eq(PayMeeting::getDraftingGroupId,id); meetingQuery.eq(PayMeeting::getDraftingGroupId,id);
meetingQuery.eq(PayMeeting::getMeetingType, MeetingCommon.DRAFTING_GROUP_MEETING_INT); meetingQuery.eq(PayMeeting::getMeetingType, MeetingCommon.DRAFTING_GROUP_MEETING_INT);
@@ -206,13 +213,19 @@ public class PayDraftingGroupServiceImpl extends ServiceImpl<PayDraftingGroupMap
query.eq(PayDraftingGroupSubItem::getDraftingGroupId, p); query.eq(PayDraftingGroupSubItem::getDraftingGroupId, p);
List<PayDraftingGroupSubItem> listPayDraftingGroupSubItem = payDraftingGroupSubItemService.list(query); List<PayDraftingGroupSubItem> listPayDraftingGroupSubItem = payDraftingGroupSubItemService.list(query);
if (!CollectionUtils.isEmpty(listPayDraftingGroupSubItem)) { if (!CollectionUtils.isEmpty(listPayDraftingGroupSubItem)) {
for (PayDraftingGroupSubItem payDraftingGroupSubItem : listPayDraftingGroupSubItem) { sb1.append(payDraftingGroupOld.getDraftingGroupProject() + "起草组下存在企业，不可进行删除！<br/>");
if (!Objects.equals(payDraftingGroupSubItem.getCheckResult(), DraftingConstant.CHECK_REJECTION)) {
sb1.append(payDraftingGroupOld.getDraftingGroupProject() + "起草组下存在企业，不可进行删除！<br/>");
break;
}
}
} }
// LambdaQueryWrapper<PayDraftingGroupSubItem> query = new LambdaQueryWrapper<>();
// query.eq(PayDraftingGroupSubItem::getDraftingGroupId, p);
// List<PayDraftingGroupSubItem> listPayDraftingGroupSubItem = payDraftingGroupSubItemService.list(query);
// if (!CollectionUtils.isEmpty(listPayDraftingGroupSubItem)) {
// for (PayDraftingGroupSubItem payDraftingGroupSubItem : listPayDraftingGroupSubItem) {
// if (!Objects.equals(payDraftingGroupSubItem.getCheckResult(), DraftingConstant.CHECK_REJECTION)) {
// sb1.append(payDraftingGroupOld.getDraftingGroupProject() + "起草组下存在企业，不可进行删除！<br/>");
// break;
// }
// }
// }
LambdaQueryWrapper<PayMeeting> meetingQuery = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PayMeeting> meetingQuery = new LambdaQueryWrapper<>();
meetingQuery.eq(PayMeeting::getDraftingGroupId,p); meetingQuery.eq(PayMeeting::getDraftingGroupId,p);
meetingQuery.eq(PayMeeting::getMeetingType, MeetingCommon.DRAFTING_GROUP_MEETING_INT); meetingQuery.eq(PayMeeting::getMeetingType, MeetingCommon.DRAFTING_GROUP_MEETING_INT);