From 509fc8cc28e2f45783bd9b528e97927b4d8a0151 Mon Sep 17 00:00:00 2001 From: xiaozhou <536509503@qq.com> Date: Tue, 9 Dec 2025 18:59:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=89=8D=E7=AE=A1=E7=90=86-=E9=A3=8E?= =?UTF-8?q?=E9=99=A9=E4=BF=A1=E6=81=AF=EF=BC=8C=E4=BA=BA=E5=91=98=E4=BB=BB?= =?UTF-8?q?=E5=91=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ryrm/controller/XzdBqglRyrmController.java | 18 ++++++++++++++++++ .../ryrm/domain/XzdBqglRyrm.java | 5 +++++ .../ryrm/domain/bo/XzdBqglRyrmBo.java | 5 ++++- .../ryrm/domain/vo/XzdBqglRyrmVo.java | 10 ++++++++++ .../service/impl/XzdBqglRyrmServiceImpl.java | 14 ++++++++++++++ 5 files changed, 51 insertions(+), 1 deletion(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/controller/XzdBqglRyrmController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/controller/XzdBqglRyrmController.java index c3c44912..8520f1b4 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/controller/XzdBqglRyrmController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/controller/XzdBqglRyrmController.java @@ -2,10 +2,14 @@ package org.dromara.xzd.biddingManagement.ryrm.controller; import java.util.List; +import cn.dev33.satoken.annotation.SaMode; import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; +import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.dto.QuerBiddingManagementDto; +import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.vo.QueryListXzdVo; +import org.dromara.xzd.biddingManagement.biaoqianlixiang.service.IXzdBidPreProjectService; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -36,6 +40,20 @@ public class XzdBqglRyrmController extends BaseController { private final IXzdBqglRyrmService xzdBqglRyrmService; + private final IXzdBidPreProjectService xzdBidPreProjectService; + + + + /** + * 查询标前立项列表 + */ + @SaCheckPermission(value = {"ryrm:bqglRyrm:list","ryrm:bqglRyrm:add","ryrm:bqglRyrm:edit"},mode = SaMode.OR) + @GetMapping("/getlist") + public QueryListXzdVo list(QuerBiddingManagementDto bo, PageQuery pageQuery) { + return xzdBidPreProjectService.queryPageList(bo, pageQuery); + } + + /** * 查询标前管理-人员任命列表 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/XzdBqglRyrm.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/XzdBqglRyrm.java index a63712c1..2c144eec 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/XzdBqglRyrm.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/XzdBqglRyrm.java @@ -43,6 +43,11 @@ public class XzdBqglRyrm extends BaseEntity { */ private String projectNumber; + /** + * 人员编码 + */ + private String ryNumber; + /** * 项目类型 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/bo/XzdBqglRyrmBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/bo/XzdBqglRyrmBo.java index 257a0b75..db067d4d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/bo/XzdBqglRyrmBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/bo/XzdBqglRyrmBo.java @@ -47,7 +47,10 @@ public class XzdBqglRyrmBo extends BaseEntity { */ @NotBlank(message = "项目编码不能为空", groups = { AddGroup.class, EditGroup.class }) private String projectNumber; - + /** + * 人员编码 + */ + private String ryNumber; /** * 项目类型 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/vo/XzdBqglRyrmVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/vo/XzdBqglRyrmVo.java index cbad93ee..9e379549 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/vo/XzdBqglRyrmVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/domain/vo/XzdBqglRyrmVo.java @@ -42,6 +42,11 @@ public class XzdBqglRyrmVo implements Serializable { @ExcelProperty(value = "主表id(标前立项)") private Long masterId; + /** + * 人员编码 + */ + private String ryNumber; + /** * 项目名称 */ @@ -59,6 +64,11 @@ public class XzdBqglRyrmVo implements Serializable { */ @ExcelProperty(value = "项目类型") private Long projectTypeId; + /** + * 项目类型 + */ + @ExcelProperty(value = "项目类型") + private String projectTypeName; /** * 单据日期 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/service/impl/XzdBqglRyrmServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/service/impl/XzdBqglRyrmServiceImpl.java index 17d86c1f..8f8952bc 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/service/impl/XzdBqglRyrmServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/ryrm/service/impl/XzdBqglRyrmServiceImpl.java @@ -9,9 +9,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; +import org.dromara.common.utils.BatchNumberGenerator; import org.dromara.xzd.biddingManagement.ryrm.domain.XzdBqglRyrmRmxx; import org.dromara.xzd.biddingManagement.ryrm.domain.vo.XzdBqglRyrmRmxxVo; import org.dromara.xzd.biddingManagement.ryrm.service.IXzdBqglRyrmRmxxService; +import org.dromara.xzd.domain.vo.XzdProjectTypeVo; +import org.dromara.xzd.service.IXzdProjectTypeService; import org.springframework.stereotype.Service; import org.dromara.xzd.biddingManagement.ryrm.domain.bo.XzdBqglRyrmBo; import org.dromara.xzd.biddingManagement.ryrm.domain.vo.XzdBqglRyrmVo; @@ -37,6 +40,7 @@ public class XzdBqglRyrmServiceImpl extends ServiceImpl xzdBqglRyrmRmxxes = xzdBqglRyrmRmxxService.getBaseMapper().selectList(new LambdaQueryWrapper().eq(XzdBqglRyrmRmxx::getMasterId, xzdBqglRyrmVo.getId())); xzdBqglRyrmVo.setRmxxBoList(MapstructUtils.convert(xzdBqglRyrmRmxxes, XzdBqglRyrmRmxxVo.class)); + if (xzdBqglRyrmVo.getProjectTypeId() != null){ + XzdProjectTypeVo xzdProjectTypeVo = xzdProjectTypeService.queryById(xzdBqglRyrmVo.getProjectTypeId()); + if (xzdProjectTypeVo != null){ + xzdBqglRyrmVo.setProjectTypeName(xzdProjectTypeVo.getTypeName()); + } + } } } @@ -70,6 +80,7 @@ public class XzdBqglRyrmServiceImpl extends ServiceImpl queryPageList(XzdBqglRyrmBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + result.getRecords().forEach(this::saveValue); return TableDataInfo.build(result); } @@ -92,6 +103,7 @@ public class XzdBqglRyrmServiceImpl extends ServiceImpl 0; if (bo.getRmxxBoList() != null && bo.getRmxxBoList().size() > 0){ bo.getRmxxBoList().forEach(rmxxBo -> rmxxBo.setMasterId(add.getId()));