From 22a7500048a6b9daced176e866c48ec3ae7dc5de Mon Sep 17 00:00:00 2001 From: lg Date: Fri, 10 Oct 2025 20:59:39 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=AF=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/XzdProjectRiskAssessmentController.java | 4 ++-- .../biddingManagement/domain/dto/BiddingManagementDto.java | 4 ++++ .../domain/vo/{XzdProjectVo.java => XzdProjectByVo.java} | 2 +- .../service/IXzdProjectRiskAssessmentService.java | 4 ++-- .../service/impl/XzdProjectRiskAssessmentServiceImpl.java | 6 +++--- .../java/org/dromara/xzd/domain/vo/XzdCustomertypeVo.java | 6 +++++- 6 files changed, 17 insertions(+), 9 deletions(-) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/domain/vo/{XzdProjectVo.java => XzdProjectByVo.java} (96%) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/controller/XzdProjectRiskAssessmentController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/controller/XzdProjectRiskAssessmentController.java index fe9bb806..1be41a83 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/controller/XzdProjectRiskAssessmentController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/controller/XzdProjectRiskAssessmentController.java @@ -7,8 +7,8 @@ import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; import org.dromara.xzd.biddingManagement.domain.bo.XzdProjectRiskAssessmentBo; +import org.dromara.xzd.biddingManagement.domain.vo.XzdProjectByVo; import org.dromara.xzd.biddingManagement.domain.vo.XzdProjectRiskAssessmentVo; -import org.dromara.xzd.biddingManagement.domain.vo.XzdProjectVo; import org.dromara.xzd.biddingManagement.service.IXzdProjectRiskAssessmentService; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; @@ -42,7 +42,7 @@ public class XzdProjectRiskAssessmentController extends BaseController { */ @SaCheckPermission("xzd:projectRiskAssessment:list") @GetMapping("/list") - public TableDataInfo list(XzdProjectVo bo, PageQuery pageQuery) { + public TableDataInfo list(XzdProjectByVo bo, PageQuery pageQuery) { return xzdProjectRiskAssessmentService.queryPageList(bo, pageQuery); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/domain/dto/BiddingManagementDto.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/domain/dto/BiddingManagementDto.java index e2d8a431..2e2d7901 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/domain/dto/BiddingManagementDto.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/domain/dto/BiddingManagementDto.java @@ -7,7 +7,11 @@ import org.dromara.xzd.biddingManagement.domain.bo.XzdBqlxProjectInfoBo; @Data public class BiddingManagementDto { +// 标前立项 + private XzdBidPreProjectBo xzdBidPreProjectBo; +// 标前立项-项目信息 + private XzdBqlxProjectInfoBo xzdBqlxProjectInfoBo; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/domain/vo/XzdProjectVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/domain/vo/XzdProjectByVo.java similarity index 96% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/domain/vo/XzdProjectVo.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/domain/vo/XzdProjectByVo.java index 38fa8595..7e482243 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/domain/vo/XzdProjectVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/domain/vo/XzdProjectByVo.java @@ -9,7 +9,7 @@ import lombok.Data; import java.time.LocalDateTime; @Data -public class XzdProjectVo { +public class XzdProjectByVo { /** * 单据编号 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/service/IXzdProjectRiskAssessmentService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/service/IXzdProjectRiskAssessmentService.java index 8a9b88c3..a3a35760 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/service/IXzdProjectRiskAssessmentService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/service/IXzdProjectRiskAssessmentService.java @@ -7,8 +7,8 @@ import org.dromara.common.mybatis.core.page.PageQuery; import com.baomidou.mybatisplus.extension.service.IService; import org.dromara.xzd.biddingManagement.domain.XzdProjectRiskAssessment; import org.dromara.xzd.biddingManagement.domain.bo.XzdProjectRiskAssessmentBo; +import org.dromara.xzd.biddingManagement.domain.vo.XzdProjectByVo; import org.dromara.xzd.biddingManagement.domain.vo.XzdProjectRiskAssessmentVo; -import org.dromara.xzd.biddingManagement.domain.vo.XzdProjectVo; import java.util.Collection; import java.util.List; @@ -36,7 +36,7 @@ public interface IXzdProjectRiskAssessmentService extends IService queryPageList(XzdProjectVo bo, PageQuery pageQuery); + TableDataInfo queryPageList(XzdProjectByVo bo, PageQuery pageQuery); /** * 查询符合条件的项目风险评估签审意见列表 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/service/impl/XzdProjectRiskAssessmentServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/service/impl/XzdProjectRiskAssessmentServiceImpl.java index 200e53be..3613600e 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/service/impl/XzdProjectRiskAssessmentServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/service/impl/XzdProjectRiskAssessmentServiceImpl.java @@ -11,8 +11,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import org.dromara.xzd.biddingManagement.domain.XzdProjectRiskAssessment; import org.dromara.xzd.biddingManagement.domain.bo.XzdProjectRiskAssessmentBo; +import org.dromara.xzd.biddingManagement.domain.vo.XzdProjectByVo; import org.dromara.xzd.biddingManagement.domain.vo.XzdProjectRiskAssessmentVo; -import org.dromara.xzd.biddingManagement.domain.vo.XzdProjectVo; import org.dromara.xzd.biddingManagement.mapper.XzdProjectRiskAssessmentMapper; import org.dromara.xzd.biddingManagement.service.IXzdProjectRiskAssessmentService; import org.dromara.xzd.utilS.AreaUtil; @@ -57,7 +57,7 @@ public class XzdProjectRiskAssessmentServiceImpl extends ServiceImpl queryPageList(XzdProjectVo bo, PageQuery pageQuery) { + public TableDataInfo queryPageList(XzdProjectByVo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper1(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); @@ -104,7 +104,7 @@ public class XzdProjectRiskAssessmentServiceImpl extends ServiceImpl buildQueryWrapper1(XzdProjectVo bo) { + private LambdaQueryWrapper buildQueryWrapper1(XzdProjectByVo bo) { LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.orderByDesc(XzdProjectRiskAssessment::getId); lqw.eq(StringUtils.isNotBlank(bo.getDocumentNumber()), XzdProjectRiskAssessment::getDocumentNumber, bo.getDocumentNumber()); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdCustomertypeVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdCustomertypeVo.java index a75428cf..3ace3bcb 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdCustomertypeVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdCustomertypeVo.java @@ -11,7 +11,7 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; import java.util.Date; - +import java.util.List; /** @@ -65,5 +65,9 @@ public class XzdCustomertypeVo implements Serializable { @ExcelProperty(value = "客户类型") private String customerType; + /** + * 子节点 + */ + List children; }