From be944595e342918da8a01ba145f263496fd05e23 Mon Sep 17 00:00:00 2001 From: dfdg <2710245601@qq.com> Date: Fri, 14 Nov 2025 19:53:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=B6=E4=BB=96=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E8=B0=83=E7=94=A8=E5=90=88=E5=90=8C=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../XzdCsContractChangeController.java | 16 ++++++++++++++++ .../XzdCsContractSuspendController.java | 16 ++++++++++++++++ .../controller/XzdCbysJdcbfjController.java | 16 ++++++++++++++++ .../XzdCbysZjhcbAlterationController.java | 17 +++++++++++++++++ .../controller/XzdSfkCaigouFkController.java | 16 ++++++++++++++++ .../XzdSfkZonhefuwuFkController.java | 18 ++++++++++++++++++ .../controller/XzdJsCgJinduController.java | 15 +++++++++++++++ .../controller/XzdJsCgJungonController.java | 17 +++++++++++++++++ .../XzdJsCgJungonEditController.java | 16 ++++++++++++++++ .../controller/XzdJsZhfwJinduController.java | 16 ++++++++++++++++ 10 files changed, 163 insertions(+) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/controller/XzdCsContractChangeController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/controller/XzdCsContractChangeController.java index 30b351a8..21eb995f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/controller/XzdCsContractChangeController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/controller/XzdCsContractChangeController.java @@ -6,6 +6,10 @@ import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; +import org.dromara.xzd.comprehensive.domain.bo.XzdCsContractInformationBo; +import org.dromara.xzd.comprehensive.domain.vo.XzdCsContractInformationVo; +import org.dromara.xzd.comprehensive.service.IXzdCsContractInformationService; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -36,6 +40,9 @@ public class XzdCsContractChangeController extends BaseController { private final IXzdCsContractChangeService xzdCsContractChangeService; + @Lazy + private final IXzdCsContractInformationService xzdCsContractInformationService; + /** * 查询综合服务合同变更列表 */ @@ -102,4 +109,13 @@ public class XzdCsContractChangeController extends BaseController { @PathVariable Long[] ids) { return toAjax(xzdCsContractChangeService.deleteWithValidByIds(List.of(ids), true)); } + + /** + * 查询综合服务合同信息列表 + */ + @SaCheckPermission("comprehensive:csContractChange:add || comprehensive:csContractChange:edit || comprehensive:csContractChange:list") + @GetMapping("/getList") + public TableDataInfo getList(XzdCsContractInformationBo bo, PageQuery pageQuery) { + return xzdCsContractInformationService.queryPageList(bo, pageQuery); + } } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/controller/XzdCsContractSuspendController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/controller/XzdCsContractSuspendController.java index 1b0b6cfe..d5d1e6bc 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/controller/XzdCsContractSuspendController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/controller/XzdCsContractSuspendController.java @@ -6,6 +6,10 @@ import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; +import org.dromara.xzd.comprehensive.domain.bo.XzdCsContractInformationBo; +import org.dromara.xzd.comprehensive.domain.vo.XzdCsContractInformationVo; +import org.dromara.xzd.comprehensive.service.IXzdCsContractInformationService; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -36,6 +40,9 @@ public class XzdCsContractSuspendController extends BaseController { private final IXzdCsContractSuspendService xzdCsContractSuspendService; + @Lazy + private final IXzdCsContractInformationService xzdCsContractInformationService; + /** * 查询综合服务合同终止列表 */ @@ -102,4 +109,13 @@ public class XzdCsContractSuspendController extends BaseController { @PathVariable Long[] ids) { return toAjax(xzdCsContractSuspendService.deleteWithValidByIds(List.of(ids), true)); } + + /** + * 查询综合服务合同信息列表 + */ + @SaCheckPermission("comprehensive:csContractSuspend:add || comprehensive:csContractSuspend:edit || comprehensive:csContractSuspend:list") + @GetMapping("/getList") + public TableDataInfo getList(XzdCsContractInformationBo bo, PageQuery pageQuery) { + return xzdCsContractInformationService.queryPageList(bo, pageQuery); + } } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysJdcbfjController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysJdcbfjController.java index 8f5414bb..1b13197b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysJdcbfjController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysJdcbfjController.java @@ -6,6 +6,10 @@ import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; +import org.dromara.xzd.costProjectApproval.costBudget.domain.bo.XzdCbysZjhcbBo; +import org.dromara.xzd.costProjectApproval.costBudget.domain.vo.XzdCbysZjhcbVo; +import org.dromara.xzd.costProjectApproval.costBudget.service.IXzdCbysZjhcbService; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -36,6 +40,18 @@ public class XzdCbysJdcbfjController extends BaseController { private final IXzdCbysJdcbfjService xzdCbysJdcbfjService; + @Lazy + private final IXzdCbysZjhcbService xzdCbysZjhcbService; + + /** + * 查询立项及成本-成本预算-总体计划成本列表 + */ + @SaCheckPermission("costBudget:cbysJdcbfj:add || costBudget:cbysJdcbfj:edit || costBudget:cbysJdcbfj:list") + @GetMapping("/getList") + public TableDataInfo list(XzdCbysZjhcbBo bo, PageQuery pageQuery) { + return xzdCbysZjhcbService.queryPageList(bo, pageQuery); + } + /** * 查询立项及成本-成本预算-阶段成本分解列表 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysZjhcbAlterationController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysZjhcbAlterationController.java index bf282860..f59c8299 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysZjhcbAlterationController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysZjhcbAlterationController.java @@ -6,6 +6,10 @@ import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; +import org.dromara.xzd.costProjectApproval.costBudget.domain.bo.XzdCbysZjhcbBo; +import org.dromara.xzd.costProjectApproval.costBudget.domain.vo.XzdCbysZjhcbVo; +import org.dromara.xzd.costProjectApproval.costBudget.service.IXzdCbysZjhcbService; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -36,6 +40,19 @@ public class XzdCbysZjhcbAlterationController extends BaseController { private final IXzdCbysZjhcbAlterationService xzdCbysZjhcbAlterationService; + + @Lazy + private final IXzdCbysZjhcbService xzdCbysZjhcbService; + + /** + * 查询立项及成本-成本预算-总体计划成本列表 + */ + @SaCheckPermission("costBudget:cbysZjhcbAlteration:add || costBudget:cbysZjhcbAlteration:edit || costBudget:cbysZjhcbAlteration:list") + @GetMapping("/getList") + public TableDataInfo list(XzdCbysZjhcbBo bo, PageQuery pageQuery) { + return xzdCbysZjhcbService.queryPageList(bo, pageQuery); + } + /** * 查询立项及成本-成本预算-总体计划成本变更列表 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkCaigouFkController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkCaigouFkController.java index 356002df..371a74ce 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkCaigouFkController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkCaigouFkController.java @@ -6,6 +6,10 @@ import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; +import org.dromara.xzd.contractManagement.purchaseManagement.domain.bo.XzdPurchaseContractInformationBo; +import org.dromara.xzd.contractManagement.purchaseManagement.domain.vo.XzdPurchaseContractInformationVo; +import org.dromara.xzd.contractManagement.purchaseManagement.service.IXzdPurchaseContractInformationService; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -36,6 +40,18 @@ public class XzdSfkCaigouFkController extends BaseController { private final IXzdSfkCaigouFkService xzdSfkCaigouFkService; + @Lazy + private final IXzdPurchaseContractInformationService xzdPurchaseContractInformationService; + + /** + * 查询采购合同信息列表 + */ + @SaCheckPermission("paymentsReceipts:sfkCaigouFk:list || paymentsReceipts:sfkCaigouFk:add || paymentsReceipts:sfkCaigouFk:edit") + @GetMapping("/getList") + public TableDataInfo list(XzdPurchaseContractInformationBo bo, PageQuery pageQuery) { + return xzdPurchaseContractInformationService.queryPageList(bo, pageQuery); + } + /** * 查询采购合同付款列表 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkZonhefuwuFkController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkZonhefuwuFkController.java index 0d0499c4..71579521 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkZonhefuwuFkController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkZonhefuwuFkController.java @@ -6,6 +6,10 @@ import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; +import org.dromara.xzd.comprehensive.domain.bo.XzdCsContractInformationBo; +import org.dromara.xzd.comprehensive.domain.vo.XzdCsContractInformationVo; +import org.dromara.xzd.comprehensive.service.IXzdCsContractInformationService; +import org.springframework.context.annotation.Lazy; 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 XzdSfkZonhefuwuFkController extends BaseController { private final IXzdSfkZonhefuwuFkService xzdSfkZonhefuwuFkService; + @Lazy + private final IXzdCsContractInformationService xzdCsContractInformationService; + + + + /** + * 查询综合服务合同信息列表 + */ + @SaCheckPermission("settlement:jsZhfwJindu:add || settlement:jsZhfwJindu:edit || settlement:jsZhfwJindu:list") + @GetMapping("/getList") + public TableDataInfo getList(XzdCsContractInformationBo bo, PageQuery pageQuery) { + return xzdCsContractInformationService.queryPageList(bo, pageQuery); + } + /** * 查询综合服务合同付款列表 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJinduController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJinduController.java index 2206c188..e3fec948 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJinduController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJinduController.java @@ -6,6 +6,10 @@ import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; +import org.dromara.xzd.contractManagement.purchaseManagement.domain.bo.XzdPurchaseContractInformationBo; +import org.dromara.xzd.contractManagement.purchaseManagement.domain.vo.XzdPurchaseContractInformationVo; +import org.dromara.xzd.contractManagement.purchaseManagement.service.IXzdPurchaseContractInformationService; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -35,6 +39,17 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; public class XzdJsCgJinduController extends BaseController { private final IXzdJsCgJinduService xzdJsCgJinduService; + @Lazy + private final IXzdPurchaseContractInformationService xzdPurchaseContractInformationService; + + /** + * 查询采购合同信息列表 + */ + @SaCheckPermission("settlement:jsCgJindu:list || settlement:jsCgJindu:add || settlement:jsCgJindu:edit") + @GetMapping("/getList") + public TableDataInfo list(XzdPurchaseContractInformationBo bo, PageQuery pageQuery) { + return xzdPurchaseContractInformationService.queryPageList(bo, pageQuery); + } /** * 查询采购合同进度结算列表 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJungonController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJungonController.java index adfc7cd4..2023fcc8 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJungonController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJungonController.java @@ -6,6 +6,10 @@ import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; +import org.dromara.xzd.contractManagement.purchaseManagement.domain.bo.XzdPurchaseContractInformationBo; +import org.dromara.xzd.contractManagement.purchaseManagement.domain.vo.XzdPurchaseContractInformationVo; +import org.dromara.xzd.contractManagement.purchaseManagement.service.IXzdPurchaseContractInformationService; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -36,6 +40,19 @@ public class XzdJsCgJungonController extends BaseController { private final IXzdJsCgJungonService xzdJsCgJungonService; + + @Lazy + private final IXzdPurchaseContractInformationService xzdPurchaseContractInformationService; + + /** + * 查询采购合同信息列表 + */ + @SaCheckPermission("settlement:jsCgJungon:list || settlement:jsCgJungon:add || settlement:jsCgJungon:edit") + @GetMapping("/getList") + public TableDataInfo list(XzdPurchaseContractInformationBo bo, PageQuery pageQuery) { + return xzdPurchaseContractInformationService.queryPageList(bo, pageQuery); + } + /** * 查询采购合同竣工结算列表 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJungonEditController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJungonEditController.java index b76ef530..9e5f9dae 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJungonEditController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJungonEditController.java @@ -6,6 +6,10 @@ import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; +import org.dromara.xzd.settlement.domain.bo.XzdJsCgJungonBo; +import org.dromara.xzd.settlement.domain.vo.XzdJsCgJungonVo; +import org.dromara.xzd.settlement.service.IXzdJsCgJungonService; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -36,6 +40,18 @@ public class XzdJsCgJungonEditController extends BaseController { private final IXzdJsCgJungonEditService xzdJsCgJungonEditService; + @Lazy + private final IXzdJsCgJungonService xzdJsCgJungonService; + + /** + * 查询采购合同竣工结算列表 + */ + @SaCheckPermission("settlement:jsCgJungonEdit:list || settlement:jsCgJungonEdit:add || settlement:jsCgJungonEdit:edit") + @GetMapping("/list") + public TableDataInfo list(XzdJsCgJungonBo bo, PageQuery pageQuery) { + return xzdJsCgJungonService.queryPageList(bo, pageQuery); + } + /** * 查询采购合同竣工结算调整列表 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsZhfwJinduController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsZhfwJinduController.java index 9d82b834..c7b38003 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsZhfwJinduController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsZhfwJinduController.java @@ -6,6 +6,10 @@ import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; +import org.dromara.xzd.comprehensive.domain.bo.XzdCsContractInformationBo; +import org.dromara.xzd.comprehensive.domain.vo.XzdCsContractInformationVo; +import org.dromara.xzd.comprehensive.service.IXzdCsContractInformationService; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -36,6 +40,9 @@ public class XzdJsZhfwJinduController extends BaseController { private final IXzdJsZhfwJinduService xzdJsZhfwJinduService; + @Lazy + private final IXzdCsContractInformationService xzdCsContractInformationService; + /** * 查询综合服务合同进度结算列表 */ @@ -102,4 +109,13 @@ public class XzdJsZhfwJinduController extends BaseController { @PathVariable Long[] ids) { return toAjax(xzdJsZhfwJinduService.deleteWithValidByIds(List.of(ids), true)); } + + /** + * 查询综合服务合同信息列表 + */ + @SaCheckPermission("settlement:jsZhfwJindu:add || settlement:jsZhfwJindu:edit || settlement:jsZhfwJindu:list") + @GetMapping("/getList") + public TableDataInfo getList(XzdCsContractInformationBo bo, PageQuery pageQuery) { + return xzdCsContractInformationService.queryPageList(bo, pageQuery); + } }