From fb9b01cf34d12a799132acdac3deaba4f6d3146f Mon Sep 17 00:00:00 2001 From: dfdg <2710245601@qq.com> Date: Mon, 27 Oct 2025 14:27:11 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=A9=E8=B5=84?= =?UTF-8?q?=E8=B7=9F=E8=B8=AA=E7=AE=A1=E7=90=86=E5=8F=B0=E8=B4=A6=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/MatMaterialsServiceImpl.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/MatMaterialsServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/MatMaterialsServiceImpl.java index 88e7471d..4942f559 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/MatMaterialsServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/MatMaterialsServiceImpl.java @@ -668,11 +668,13 @@ public class MatMaterialsServiceImpl extends ServiceImpl outs = outList.stream() .filter(inventory -> inventory.getMaterialsId().equals(id)) From b61a7c153da406394656f782da87b5bc8b2173a2 Mon Sep 17 00:00:00 2001 From: lg Date: Mon, 27 Oct 2025 14:44:50 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=8A=95=E6=A0=87=E6=96=87=E4=BB=B6-?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=B1=BB=E5=9E=8B=E4=B8=AD=E6=96=87=E8=BF=94?= =?UTF-8?q?=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/vo/XzdBiddingDocumentVo.java | 6 ++++++ .../impl/XzdBiddingDocumentServiceImpl.java | 20 +++++++++++++++++++ 2 files changed, 26 insertions(+) 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()); + } + } + } + + } + /** * 查询符合条件的投标文件列表 * From a320b859652b1062a35c441cb12f1f89d1f6c1c9 Mon Sep 17 00:00:00 2001 From: zt Date: Mon, 27 Oct 2025 15:14:29 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=80=83=E5=8B=A4=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/service/impl/BusAttendanceServiceImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java index cdedb017..7cdd4a61 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java @@ -333,10 +333,11 @@ public class BusAttendanceServiceImpl extends ServiceImpl Date: Mon, 27 Oct 2025 15:25:04 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=9D=83=E9=99=90=E5=8F=96=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/XzdPurchaseContractSuspendController.java | 2 +- .../controller/XzdSubcontractTerminationController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigoucontractTermination/controller/XzdPurchaseContractSuspendController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigoucontractTermination/controller/XzdPurchaseContractSuspendController.java index b11e2d30..8077405a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigoucontractTermination/controller/XzdPurchaseContractSuspendController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigoucontractTermination/controller/XzdPurchaseContractSuspendController.java @@ -61,7 +61,7 @@ public class XzdPurchaseContractSuspendController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("contractTermination:purchaseContractSuspend:query") +// @SaCheckPermission("contractTermination:purchaseContractSuspend:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongzhongzhi/controller/XzdSubcontractTerminationController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongzhongzhi/controller/XzdSubcontractTerminationController.java index 1987c541..d030cb55 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongzhongzhi/controller/XzdSubcontractTerminationController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongzhongzhi/controller/XzdSubcontractTerminationController.java @@ -61,7 +61,7 @@ public class XzdSubcontractTerminationController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("fenbaohetongzhongzhi:subcontractTermination:query") +// @SaCheckPermission("fenbaohetongzhongzhi:subcontractTermination:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {