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-09 11:15:24 +08:00
parent 5e46de80c7
commit ed08ce9795
3 changed files with 72 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java
+20 -5
View File
@@ -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<PayCaseCommittee,
@Resource
private IOSSFileService iossFileService;
@Autowired
private IPayCaseCommitteeService payCaseCommitteeService;
@Autowired
private IPayCaseCommitteeService payCaseCommitteeService;
@Autowired
private IPayCaseCommitteeSubitemService payCaseCommitteeSubitemService;
@@ -69,6 +74,9 @@ public class PayCaseCommitteeController extends JeroController<PayCaseCommittee,
@Resource
private ISysUserService sysUserService;
@Resource
private IPayMeetingService payMeetingService;
/**
* 分标委表-企业端分页列表查询
*
@@ -249,9 +257,16 @@ public class PayCaseCommitteeController extends JeroController<PayCaseCommittee,
List<PayCaseCommitteeSubitem> payCaseCommitteeSubitems = payCaseCommitteeSubitemService.selectList(queryWrapper);
if(payCaseCommitteeSubitems.size()>0){
return Result.error("分标委下级仍有数据，不可删除!");
}payCaseCommitteeService.removeById(id);
}
// 判断分标委下是否存在会议
LambdaQueryWrapper<PayMeeting> meetingQuery = new LambdaQueryWrapper<>();
meetingQuery.eq(PayMeeting::getCaseCommitteeId,id);
meetingQuery.eq(PayMeeting::getMeetingType, MeetingCommon.COMMITTEE_MEETING_INT);
List<PayMeeting> listPayMeeting = payMeetingService.list(meetingQuery);
if (!CollectionUtils.isEmpty(listPayMeeting)) {
throw new JeroBootException("分标委下存在会议，不可进行删除!");
}
payCaseCommitteeService.removeById(id);
return Result.OK("删除成功!");
}
}
jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupServiceImpl.java
+30 -1
View File
@@ -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<PayDraftingGroupMap
private RolePermissionService rolePermissionService;
@Resource
private IPayDraftingGroupSubItemService payDraftingGroupSubItemService;
@Resource
private IPayMeetingService payMeetingService;
/**
@@ -132,6 +137,14 @@ public class PayDraftingGroupServiceImpl extends ServiceImpl<PayDraftingGroupMap
throw new JeroBootException(payDraftingGroupOld.getDraftingGroupProject() + "起草组下存在企业，不可进行删除!");
}
LambdaQueryWrapper<PayMeeting> meetingQuery = new LambdaQueryWrapper<>();
meetingQuery.eq(PayMeeting::getDraftingGroupId,id);
meetingQuery.eq(PayMeeting::getMeetingType, MeetingCommon.DRAFTING_GROUP_MEETING_INT);
List<PayMeeting> listPayMeeting = payMeetingService.list(meetingQuery);
if (!CollectionUtils.isEmpty(listPayMeeting)) {
throw new JeroBootException(payDraftingGroupOld.getDraftingGroupProject() + "起草组下存在会议，不可进行删除!");
}
removeById(id);
LambdaUpdateWrapper<PayDraftingGroupSubItem> updatePayDraftingGroupSubItem = new LambdaUpdateWrapper<>();
updatePayDraftingGroupSubItem.eq(PayDraftingGroupSubItem::getDraftingGroupId, id);
@@ -160,7 +173,14 @@ public class PayDraftingGroupServiceImpl extends ServiceImpl<PayDraftingGroupMap
query.eq(PayDraftingGroupSubItem::getDraftingGroupId, p);
List<PayDraftingGroupSubItem> listPayDraftingGroupSubItem = payDraftingGroupSubItemService.list(query);
if (!CollectionUtils.isEmpty(listPayDraftingGroupSubItem)) {
sb1.append(payDraftingGroupOld.getDraftingGroupProject() + "起草组下存在企业，不可进行删除！<br/");
sb1.append(payDraftingGroupOld.getDraftingGroupProject() + "起草组下存在企业，不可进行删除！<br/>");
}
LambdaQueryWrapper<PayMeeting> meetingQuery = new LambdaQueryWrapper<>();
meetingQuery.eq(PayMeeting::getDraftingGroupId,p);
meetingQuery.eq(PayMeeting::getMeetingType, MeetingCommon.DRAFTING_GROUP_MEETING_INT);
List<PayMeeting> listPayMeeting = payMeetingService.list(meetingQuery);
if (!CollectionUtils.isEmpty(listPayMeeting)) {
throw new JeroBootException(payDraftingGroupOld.getDraftingGroupProject() + "起草组下存在会议，不可进行删除!<br/>");
}
});
if (!StringUtils.isEmpty(sb)) {
@@ -215,5 +235,14 @@ public class PayDraftingGroupServiceImpl extends ServiceImpl<PayDraftingGroupMap
}else{
str = str + 1;
}
// payDraftingGroupOld.setId(null);
// payDraftingGroupOld.setDraftingGroupProject(str);
// payDraftingGroupOld.setCreateBy(null);
// payDraftingGroupOld.setCreateTime(null);
// payDraftingGroupOld.setUpdateBy(null);
// payDraftingGroupOld.setUpdateTime(null);
// (payDraftingGroupOld);
// payWorkingGroupService.save(payDraftingGroupOld);
}
}
jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java
+22 -1
View File
@@ -20,6 +20,9 @@ import com.jero.company.service.IPayContactsManagementService;
import com.jero.config.StaticConfig;
import com.jero.contract.entity.PayIncomeContractAssociated;
import com.jero.contract.service.IPayIncomeContractAssociatedService;
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.project.common.PayProjectCommon;
@@ -84,6 +87,8 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
private ContractCreateProjectSendMessageService contractCreateProjectSendMessageService;
@Resource
private PayWorkingGroupSubItemContactsMapper payWorkingGroupSubItemContactsMapper;
@Resource
private IPayMeetingService payMeetingService;
@Override
public IPage<PayWorkingGroupVO> queryPageList(Page<PayWorkingGroupVO> page, PayWorkingGroup payWorkingGroup) {
@@ -117,6 +122,14 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
throw new JeroBootException(payWorkingGroupOld.getWorkingGroupProject() + "工作组下存在企业，不可进行删除!");
}
// 判断工作组下是否存在会议
LambdaQueryWrapper<PayMeeting> meetingQuery = new LambdaQueryWrapper<>();
meetingQuery.eq(PayMeeting::getWorkingGroupId,id);
meetingQuery.eq(PayMeeting::getMeetingType, MeetingCommon.WORKING_GROUP_MEETING_INT);
List<PayMeeting> listPayMeeting = payMeetingService.list(meetingQuery);
if (!CollectionUtils.isEmpty(listPayMeeting)) {
throw new JeroBootException(payWorkingGroupOld.getWorkingGroupProject() + "工作组下存在会议，不可进行删除!");
}
payWorkingGroupService.removeById(id);
LambdaUpdateWrapper<PayWorkingGroupSubItem> updatePayWorkingGroupSubItem = new LambdaUpdateWrapper<>();
updatePayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getWorkingGroupId,id);
@@ -141,7 +154,15 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
query.eq(PayWorkingGroupSubItem::getWorkingGroupId, p);
List<PayWorkingGroupSubItem> listPayWorkingGroupSubItem = payWorkingGroupSubItemService.list(query);
if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItem)) {
sb1.append(payWorkingGroupOld.getWorkingGroupProject() + "工作组下存在企业，不可进行删除！<br/");
sb1.append(payWorkingGroupOld.getWorkingGroupProject() + "工作组下存在企业，不可进行删除！<br/>");
}
// 判断工作组下是否存在会议
LambdaQueryWrapper<PayMeeting> meetingQuery = new LambdaQueryWrapper<>();
meetingQuery.eq(PayMeeting::getWorkingGroupId,p);
meetingQuery.eq(PayMeeting::getMeetingType, MeetingCommon.WORKING_GROUP_MEETING_INT);
List<PayMeeting> listPayMeeting = payMeetingService.list(meetingQuery);
if (!CollectionUtils.isEmpty(listPayMeeting)) {
sb1.append(payWorkingGroupOld.getWorkingGroupProject() + "工作组下存在会议，不可进行删除！<br/>");
}
});
if(!StringUtils.isEmpty(sb)){