diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocumentList/domain/vo/XzdBiddingDocumentVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocumentList/domain/vo/XzdBiddingDocumentVo.java index e0bbe98a..a053345a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocumentList/domain/vo/XzdBiddingDocumentVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocumentList/domain/vo/XzdBiddingDocumentVo.java @@ -74,6 +74,12 @@ public class XzdBiddingDocumentVo implements Serializable { @ExcelProperty(value = "项目类型ID") private Long projectType; + /** + * 项目类型ID + */ + @ExcelProperty(value = "项目类型ID") + private String projectTypeName; + /** * 投标单位 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocumentList/service/impl/XzdBiddingDocumentServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocumentList/service/impl/XzdBiddingDocumentServiceImpl.java index e3c5b6ac..adcd5f85 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocumentList/service/impl/XzdBiddingDocumentServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocumentList/service/impl/XzdBiddingDocumentServiceImpl.java @@ -25,6 +25,8 @@ import org.dromara.xzd.biddingManagement.biddingDocumentList.service.IXzdBidding import org.dromara.xzd.biddingManagement.biddingDocumentList.service.IXzdTbwjBusinessBidService; import org.dromara.xzd.biddingManagement.biddingDocumentList.service.IXzdTbwjTechnicalBidService; import org.dromara.xzd.biddingManagement.biddingDocumentList.service.IXzdTbwjZsyqService; +import org.dromara.xzd.domain.vo.XzdProjectTypeVo; +import org.dromara.xzd.service.IXzdProjectTypeService; import org.dromara.xzd.utilS.AreaUtil; import org.locationtech.jts.edgegraph.HalfEdge; import org.springframework.beans.BeanUtils; @@ -59,6 +61,8 @@ public class XzdBiddingDocumentServiceImpl extends ServiceImpl queryPageList(XzdBiddingDocumentBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + result.getRecords().forEach(this::getName); + return TableDataInfo.build(result); } + private void getName(XzdBiddingDocumentVo xzdBiddingDocumentVo) { + + if (xzdBiddingDocumentVo != null){ + Long projectType = xzdBiddingDocumentVo.getProjectType(); + if (projectType != null){ + XzdProjectTypeVo xzdProjectTypeVo = xzdProjectTypeService.queryById(projectType); + if (xzdProjectTypeVo != null){ + xzdBiddingDocumentVo.setProjectTypeName(xzdProjectTypeVo.getTypeName()); + } + } + } + + } + /** * 查询符合条件的投标文件列表 *