diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/service/impl/XzdBidPreProjectServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/service/impl/XzdBidPreProjectServiceImpl.java index 34df44b8..50b9f74d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/service/impl/XzdBidPreProjectServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/service/impl/XzdBidPreProjectServiceImpl.java @@ -6,6 +6,7 @@ import lombok.extern.slf4j.Slf4j; import org.dromara.common.core.domain.event.ProcessDeleteEvent; import org.dromara.common.core.domain.event.ProcessEvent; import org.dromara.common.core.domain.event.ProcessTaskEvent; +import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -22,8 +23,22 @@ import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.vo.QuerListXzdBi import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.vo.QueryListXzdVo; import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.vo.XzdBqlxProjectInfoVo; import org.dromara.xzd.biddingManagement.biaoqianlixiang.service.IXzdBqlxProjectInfoService; +import org.dromara.xzd.biddingManagement.biddingDocument.domain.XzdBiddingFileEstimate; +import org.dromara.xzd.biddingManagement.biddingDocument.service.IXzdBiddingFileEstimateService; +import org.dromara.xzd.biddingManagement.biddingDocumentList.domain.XzdBiddingDocument; +import org.dromara.xzd.biddingManagement.biddingDocumentList.service.IXzdBiddingDocumentService; +import org.dromara.xzd.biddingManagement.earnestMoney.domain.XzdBidDepositPayment; +import org.dromara.xzd.biddingManagement.earnestMoney.service.IXzdBidDepositPaymentService; +import org.dromara.xzd.biddingManagement.earnestMoneyWithdraw.domain.XzdBidDepositRecovery; +import org.dromara.xzd.biddingManagement.earnestMoneyWithdraw.service.IXzdBidDepositRecoveryService; +import org.dromara.xzd.biddingManagement.paymentapplication.domain.XzdBiddingAgencyFeePayment; +import org.dromara.xzd.biddingManagement.paymentapplication.service.IXzdBiddingAgencyFeePaymentService; +import org.dromara.xzd.biddingManagement.postAnalysis.domain.XzdPostBidAnalysis; +import org.dromara.xzd.biddingManagement.postAnalysis.service.IXzdPostBidAnalysisService; import org.dromara.xzd.utilS.AreaUtil; import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.context.event.EventListener; import org.springframework.stereotype.Service; import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.bo.XzdBidPreProjectBo; @@ -59,6 +74,37 @@ public class XzdBidPreProjectServiceImpl extends ServiceImpl().eq(XzdBiddingFileEstimate::getProjectName, id)); + if (l > 0) throw new ServiceException("招标文件审估已引用,不允许删除"); + + //投标文件 + l = xzdBiddingDocumentService.getBaseMapper().selectCount(new LambdaQueryWrapper().eq(XzdBiddingDocument::getProjectName, id)); + if (l > 0) throw new ServiceException("投标文件已引用,不允许删除"); + + //投标保证金缴纳 + l = xzdBidDepositPaymentService.getBaseMapper().selectCount(new LambdaQueryWrapper().eq(XzdBidDepositPayment::getBqlxId, id)); + if (l > 0) throw new ServiceException("投标保证金缴纳已引用,不允许删除"); + + //投标保证金收回; + l = xzdBidDepositRecoveryService.getBaseMapper().selectCount(new LambdaQueryWrapper().eq(XzdBidDepositRecovery::getProjectName, id)); + if (l > 0) throw new ServiceException("投标保证金收回已引用,不允许删除"); + + //标后分析 + l = xzdPostBidAnalysisService.getBaseMapper().selectCount(new LambdaQueryWrapper().eq(XzdPostBidAnalysis::getProjectName, id)); + if (l > 0) throw new ServiceException("标后分析已引用,不允许删除"); + + //招标代理服务费支付申请 + l = xzdBiddingAgencyFeePaymentService.getBaseMapper().selectCount(new LambdaQueryWrapper().eq(XzdBiddingAgencyFeePayment::getProjectName, id)); + if (l > 0) throw new ServiceException("招标代理服务费支付申请已引用,不允许删除"); // 删除附件 if (!StringUtils.isEmpty(xzdBidPreProjectVo.getFileId())){ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoneyWithdraw/domain/vo/XzdBidDepositRecoveryVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoneyWithdraw/domain/vo/XzdBidDepositRecoveryVo.java index 68c245a9..872bf91e 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoneyWithdraw/domain/vo/XzdBidDepositRecoveryVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoneyWithdraw/domain/vo/XzdBidDepositRecoveryVo.java @@ -62,6 +62,12 @@ public class XzdBidDepositRecoveryVo implements Serializable { @ExcelProperty(value = "项目名称") private String projectName; + /** + * 项目名称回显使用 + */ + @ExcelProperty(value = "项目名称") + private String projectNames; + /** * 项目类型 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoneyWithdraw/service/impl/XzdBidDepositRecoveryServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoneyWithdraw/service/impl/XzdBidDepositRecoveryServiceImpl.java index e4467bcf..7c6c170e 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoneyWithdraw/service/impl/XzdBidDepositRecoveryServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoneyWithdraw/service/impl/XzdBidDepositRecoveryServiceImpl.java @@ -15,6 +15,12 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import org.dromara.common.utils.BatchNumberGenerator; import org.dromara.system.service.impl.SysOssServiceImpl; +import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.vo.QuerListXzdBidPreVo; +import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.vo.XzdBidPreProjectVo; +import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.vo.XzdBqlxProjectInfoVo; +import org.dromara.xzd.biddingManagement.biaoqianlixiang.mapper.XzdBidPreProjectMapper; +import org.dromara.xzd.biddingManagement.biaoqianlixiang.service.IXzdBidPreProjectService; +import org.dromara.xzd.biddingManagement.biaoqianlixiang.service.IXzdBqlxProjectInfoService; import org.dromara.xzd.biddingManagement.earnestMoney.domain.XzdBidDepositPayment; import org.dromara.xzd.biddingManagement.earnestMoney.domain.vo.XzdBidDepositPaymentByBqlx; import org.dromara.xzd.biddingManagement.earnestMoney.service.IXzdBidDepositPaymentService; @@ -56,6 +62,7 @@ public class XzdBidDepositRecoveryServiceImpl extends ServiceImpl