From f11ed11629eca886e9a716b13924f59ec21b46a0 Mon Sep 17 00:00:00 2001 From: lg Date: Sun, 16 Nov 2025 18:25:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=8C=85=E8=B4=A8=E4=BF=9D=E9=87=91?= =?UTF-8?q?=E9=80=80=E8=BF=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/XzdFbhtzbjthController.java | 35 ++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/refundDeposit/controller/XzdFbhtzbjthController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/refundDeposit/controller/XzdFbhtzbjthController.java index 4b394dc9..1893fb0f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/refundDeposit/controller/XzdFbhtzbjthController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/refundDeposit/controller/XzdFbhtzbjthController.java @@ -2,10 +2,17 @@ package org.dromara.xzd.deposit.refundDeposit.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.contractManagement.fenbaohetongxinxi.domain.bo.XzdSubcontractBo; +import org.dromara.xzd.contractManagement.fenbaohetongxinxi.domain.vo.XzdSubcontractVo; +import org.dromara.xzd.contractManagement.fenbaohetongxinxi.service.IXzdSubcontractService; +import org.dromara.xzd.settlement.fenbaohetongjungong.domain.bo.SettlementOfSubcontractingCompletionBo; +import org.dromara.xzd.settlement.fenbaohetongjungong.domain.vo.SettlementOfSubcontractingCompletionVo; +import org.dromara.xzd.settlement.fenbaohetongjungong.service.ISettlementOfSubcontractingCompletionService; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -36,15 +43,41 @@ public class XzdFbhtzbjthController extends BaseController { private final IXzdFbhtzbjthService xzdFbhtzbjthService; + private final IXzdSubcontractService xzdSubcontractService; + + private final ISettlementOfSubcontractingCompletionService settlementOfSubcontractingCompletionService; + + + + /** + * 查询分包合同竣工结算列表 + */ + @SaCheckPermission(value = {""}) + @GetMapping("/list") + public TableDataInfo list(SettlementOfSubcontractingCompletionBo bo, PageQuery pageQuery) { + return settlementOfSubcontractingCompletionService.queryPageList(bo, pageQuery); + } + + + /** * 查询分包合同质保金退还列表 */ - @SaCheckPermission("refundDeposit:fbhtzbjth:list") + @SaCheckPermission(value = {"refundDeposit:fbhtzbjth:list","refundDeposit:fbhtzbjth:add","refundDeposit:fbhtzbjth:edit"}, mode = SaMode.OR) @GetMapping("/list") public TableDataInfo list(XzdFbhtzbjthBo bo, PageQuery pageQuery) { return xzdFbhtzbjthService.queryPageList(bo, pageQuery); } + /** + * 查询分包合同信息列表 + */ + @SaCheckPermission(value = {"refundDeposit:fbhtzbjth:list","refundDeposit:fbhtzbjth:add","refundDeposit:fbhtzbjth:edit"}, mode = SaMode.OR) + @GetMapping("/getlist") + public TableDataInfo list(XzdSubcontractBo bo, PageQuery pageQuery) { + return xzdSubcontractService.queryPageList(bo, pageQuery); + } + /** * 导出分包合同质保金退还列表 */