From 4636aa3c05d49a33b4f3332afebebeb8a9acdc15 Mon Sep 17 00:00:00 2001 From: dfdg <2710245601@qq.com> Date: Sat, 30 Aug 2025 06:49:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=95=E6=A0=87=E6=88=90?= =?UTF-8?q?=E6=9C=AC=E6=B8=85=E5=8D=95=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bidding/service/IBusBiddingLimitVersionsService.java | 4 ++++ .../service/impl/BusBiddingLimitListServiceImpl.java | 6 ++++++ .../service/impl/BusBiddingLimitVersionsServiceImpl.java | 7 +++++++ 3 files changed, 17 insertions(+) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/service/IBusBiddingLimitVersionsService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/service/IBusBiddingLimitVersionsService.java index e7091a86..cf81c621 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/service/IBusBiddingLimitVersionsService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/service/IBusBiddingLimitVersionsService.java @@ -1,5 +1,7 @@ package org.dromara.bidding.service; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import org.dromara.bidding.domain.vo.BusBiddingLimitVersionsVo; import org.dromara.bidding.domain.bo.BusBiddingLimitVersionsBo; import org.dromara.bidding.domain.BusBiddingLimitVersions; @@ -67,4 +69,6 @@ public interface IBusBiddingLimitVersionsService extends IService ids, Boolean isValid); + + BusBiddingLimitVersions queryByProjectId( String versions, Long projectId); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/service/impl/BusBiddingLimitListServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/service/impl/BusBiddingLimitListServiceImpl.java index 818fba47..eefe1f8d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/service/impl/BusBiddingLimitListServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/service/impl/BusBiddingLimitListServiceImpl.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.bidding.domain.BusBiddingLimitList; +import org.dromara.bidding.domain.BusBiddingLimitVersions; import org.dromara.bidding.domain.bo.BusBiddingLimitListBo; import org.dromara.bidding.domain.bo.BusBiddingLimitVersionsBo; import org.dromara.bidding.domain.bo.BiddingAllVersionNumbersReq; @@ -17,6 +18,7 @@ import org.dromara.bidding.mapper.BusBiddingLimitListMapper; import org.dromara.bidding.service.IBusBiddingLimitListService; import org.dromara.bidding.service.IBusBiddingLimitVersionsService; import org.dromara.common.core.constant.HttpStatus; +import org.dromara.common.core.enums.BusinessStatusEnum; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; @@ -179,6 +181,10 @@ public class BusBiddingLimitListServiceImpl extends ServiceImpl getTree(BusBiddingLimitListBo bo) { + BusBiddingLimitVersions biddingLimitVersions = busBiddingLimitVersionsService.queryByProjectId(bo.getVersions(),bo.getProjectId()); + if (biddingLimitVersions == null || !BusinessStatusEnum.FINISH.getStatus().equals(biddingLimitVersions.getStatus())) { + return null; + } //获取所有数据 List listVoList = queryList(bo); //过滤数量和单价为空的数据并计算总价 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/service/impl/BusBiddingLimitVersionsServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/service/impl/BusBiddingLimitVersionsServiceImpl.java index 002c3e9a..5b64f554 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/service/impl/BusBiddingLimitVersionsServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/service/impl/BusBiddingLimitVersionsServiceImpl.java @@ -138,6 +138,13 @@ public class BusBiddingLimitVersionsServiceImpl extends ServiceImpl 0; } + @Override + public BusBiddingLimitVersions queryByProjectId(String versions, Long projectId) { + return baseMapper.selectOne(new LambdaQueryWrapper() + .eq(BusBiddingLimitVersions::getProjectId, projectId) + .eq(BusBiddingLimitVersions::getVersions, versions)); + } + /** * 总体流程监听(例如: 草稿，撤销，退回，作废，终止，已完成，单任务完成等)