diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocument/controller/XzdBiddingFileEstimateController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocument/controller/XzdBiddingFileEstimateController.java index 0b383a03..872ef8bf 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocument/controller/XzdBiddingFileEstimateController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocument/controller/XzdBiddingFileEstimateController.java @@ -2,10 +2,14 @@ package org.dromara.xzd.biddingManagement.biddingDocument.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,8 @@ public class XzdBiddingFileEstimateController extends BaseController { private final IXzdBiddingFileEstimateService xzdBiddingFileEstimateService; + private final IXzdBidPreProjectService xzdBidPreProjectService; + /** * 查询招标文件审估列表 */ @@ -102,4 +108,18 @@ public class XzdBiddingFileEstimateController extends BaseController { @PathVariable Long[] ids) { return toAjax(xzdBiddingFileEstimateService.deleteWithValidByIds(List.of(ids), true)); } + + /** + * 查询标前立项列表 + */ + @SaCheckPermission(value = {"biddingDocument:biddingFileEstimate:list "," biddingDocument:biddingFileEstimate:add "," biddingDocument:biddingFileEstimate: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/earnestMoney/controller/XzdBidDepositPaymentController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoney/controller/XzdBidDepositPaymentController.java index 64c80752..e67f081d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoney/controller/XzdBidDepositPaymentController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoney/controller/XzdBidDepositPaymentController.java @@ -2,10 +2,14 @@ package org.dromara.xzd.biddingManagement.earnestMoney.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.dromara.xzd.biddingManagement.earnestMoney.domain.bo.XzdBidDepositPaymentBo; import org.dromara.xzd.biddingManagement.earnestMoney.domain.vo.XzdBidDepositPaymentByBqlx; import org.dromara.xzd.biddingManagement.earnestMoney.domain.vo.XzdBidDepositPaymentVo; @@ -38,6 +42,8 @@ public class XzdBidDepositPaymentController extends BaseController { private final IXzdBidDepositPaymentService xzdBidDepositPaymentService; + private final IXzdBidPreProjectService xzdBidPreProjectService; + /** * 查询投标保证金缴纳列表 */ @@ -104,4 +110,13 @@ public class XzdBidDepositPaymentController extends BaseController { @PathVariable Long[] ids) { return toAjax(xzdBidDepositPaymentService.deleteWithValidByIds(List.of(ids), true)); } + + /** + * 查询标前立项列表 + */ + @SaCheckPermission(value = {"earnestMoney:bidDepositPayment:list "," earnestMoney:bidDepositPayment:add "," earnestMoney:bidDepositPayment: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/earnestMoneyWithdraw/controller/XzdBidDepositRecoveryController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoneyWithdraw/controller/XzdBidDepositRecoveryController.java index dbf10052..621ea10a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoneyWithdraw/controller/XzdBidDepositRecoveryController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoneyWithdraw/controller/XzdBidDepositRecoveryController.java @@ -2,10 +2,14 @@ package org.dromara.xzd.biddingManagement.earnestMoneyWithdraw.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.dromara.xzd.biddingManagement.earnestMoneyWithdraw.domain.bo.XzdBidDepositRecoveryBo; import org.dromara.xzd.biddingManagement.earnestMoneyWithdraw.domain.vo.XzdBidDepositRecoveryVo; import org.dromara.xzd.biddingManagement.earnestMoneyWithdraw.domain.vo.XzdBidDepositRecoveryXqVo; @@ -38,6 +42,8 @@ public class XzdBidDepositRecoveryController extends BaseController { private final IXzdBidDepositRecoveryService xzdBidDepositRecoveryService; + private final IXzdBidPreProjectService xzdBidPreProjectService; + /** * 查询投标保证金收回列表 */ @@ -104,4 +110,13 @@ public class XzdBidDepositRecoveryController extends BaseController { @PathVariable Long[] ids) { return toAjax(xzdBidDepositRecoveryService.deleteWithValidByIds(List.of(ids), true)); } + + /** + * 查询标前立项列表 + */ + @SaCheckPermission(value = {"biddingManagement:bidDepositRecovery:list "," biddingManagement:bidDepositRecovery:add "," biddingManagement:bidDepositRecovery: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/paymentapplication/controller/XzdBiddingAgencyFeePaymentController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/paymentapplication/controller/XzdBiddingAgencyFeePaymentController.java index 3a3ddddb..e13156d8 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/paymentapplication/controller/XzdBiddingAgencyFeePaymentController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/paymentapplication/controller/XzdBiddingAgencyFeePaymentController.java @@ -2,10 +2,14 @@ package org.dromara.xzd.biddingManagement.paymentapplication.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,8 @@ public class XzdBiddingAgencyFeePaymentController extends BaseController { private final IXzdBiddingAgencyFeePaymentService xzdBiddingAgencyFeePaymentService; + private final IXzdBidPreProjectService xzdBidPreProjectService; + /** * 查询招标代理服务费支付申请列表 */ @@ -103,4 +109,14 @@ public class XzdBiddingAgencyFeePaymentController extends BaseController { @PathVariable Long[] ids) { return toAjax(xzdBiddingAgencyFeePaymentService.deleteWithValidByIds(List.of(ids), true)); } + + + /** + * 查询标前立项列表 + */ + @SaCheckPermission(value = {"paymentapplication:biddingAgencyFeePayment:list "," paymentapplication:biddingAgencyFeePayment:add "," paymentapplication:biddingAgencyFeePayment: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/contractManagement/caigoucontractTermination/controller/XzdPurchaseContractSuspendController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigoucontractTermination/controller/XzdPurchaseContractSuspendController.java index b11e2d30..258526cc 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 @@ -2,10 +2,17 @@ package org.dromara.xzd.contractManagement.caigoucontractTermination.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.purchaseManagement.domain.bo.XzdPurchaseContractInformationBo; +import org.dromara.xzd.contractManagement.purchaseManagement.domain.vo.XzdPurchaseContractInformationVo; +import org.dromara.xzd.contractManagement.purchaseManagement.service.IXzdPurchaseContractInformationService; +import org.dromara.xzd.domain.bo.XzdBusinessSealBo; +import org.dromara.xzd.domain.vo.XzdBusinessSealVo; +import org.dromara.xzd.service.IXzdBusinessSealService; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -36,6 +43,20 @@ public class XzdPurchaseContractSuspendController extends BaseController { private final IXzdPurchaseContractSuspendService xzdPurchaseContractSuspendService; + private final IXzdPurchaseContractInformationService xzdPurchaseContractInformationService; + + + private final IXzdBusinessSealService xzdBusinessSealService; + + /** + * 查询印章帮助列表 + */ + @SaCheckPermission(value={"contractTermination:purchaseContractSuspend:list","contractTermination:purchaseContractSuspend:add","contractTermination:purchaseContractSuspend:edit"}, mode = SaMode.OR) + @GetMapping("/listBusinss") + public TableDataInfo list(XzdBusinessSealBo bo, PageQuery pageQuery) { + return xzdBusinessSealService.queryPageList(bo, pageQuery); + } + /** * 查询采购合同终止列表 */ @@ -102,4 +123,13 @@ public class XzdPurchaseContractSuspendController extends BaseController { @PathVariable Long[] ids) { return toAjax(xzdPurchaseContractSuspendService.deleteWithValidByIds(List.of(ids), true)); } + + /** + * 查询采购合同信息列表 + */ + @SaCheckPermission(value={"contractTermination:purchaseContractSuspend:list","contractTermination:purchaseContractSuspend:add","contractTermination:purchaseContractSuspend:edit"}, mode = SaMode.OR) + @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/contractManagement/caigouhetongbiangeng/controller/XzdPurchaseContractAlterationController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/controller/XzdPurchaseContractAlterationController.java index 0a34d967..fb56c808 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/controller/XzdPurchaseContractAlterationController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/controller/XzdPurchaseContractAlterationController.java @@ -2,10 +2,17 @@ package org.dromara.xzd.contractManagement.caigouhetongbiangeng.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.purchaseManagement.domain.bo.XzdPurchaseContractInformationBo; +import org.dromara.xzd.contractManagement.purchaseManagement.domain.vo.XzdPurchaseContractInformationVo; +import org.dromara.xzd.contractManagement.purchaseManagement.service.IXzdPurchaseContractInformationService; +import org.dromara.xzd.domain.bo.XzdBusinessSealBo; +import org.dromara.xzd.domain.vo.XzdBusinessSealVo; +import org.dromara.xzd.service.IXzdBusinessSealService; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -36,6 +43,20 @@ public class XzdPurchaseContractAlterationController extends BaseController { private final IXzdPurchaseContractAlterationService xzdPurchaseContractAlterationService; + private final IXzdPurchaseContractInformationService xzdPurchaseContractInformationService; + + + private final IXzdBusinessSealService xzdBusinessSealService; + + /** + * 查询印章帮助列表 + */ + @SaCheckPermission(value={"hetongbiangeng:purchaseContractAlteration:list","hetongbiangeng:purchaseContractAlteration:add","hetongbiangeng:purchaseContractAlteration:edit"}, mode = SaMode.OR) + @GetMapping("/listBusinss") + public TableDataInfo list(XzdBusinessSealBo bo, PageQuery pageQuery) { + return xzdBusinessSealService.queryPageList(bo, pageQuery); + } + /** * 查询采购合同变更列表 */ @@ -102,4 +123,13 @@ public class XzdPurchaseContractAlterationController extends BaseController { @PathVariable Long[] ids) { return toAjax(xzdPurchaseContractAlterationService.deleteWithValidByIds(List.of(ids), true)); } + + /** + * 查询采购合同信息列表 + */ + @SaCheckPermission(value={"hetongbiangeng:purchaseContractAlteration:list","hetongbiangeng:purchaseContractAlteration:add","hetongbiangeng:purchaseContractAlteration:edit"}, mode = SaMode.OR) + @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/contractManagement/fenbaohetongbiangg/controller/XzdSubcontractChangeController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongbiangg/controller/XzdSubcontractChangeController.java index a3e13e45..a19f39e8 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongbiangg/controller/XzdSubcontractChangeController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongbiangg/controller/XzdSubcontractChangeController.java @@ -2,10 +2,17 @@ package org.dromara.xzd.contractManagement.fenbaohetongbiangg.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.domain.bo.XzdBusinessSealBo; +import org.dromara.xzd.domain.vo.XzdBusinessSealVo; +import org.dromara.xzd.service.IXzdBusinessSealService; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -36,6 +43,22 @@ public class XzdSubcontractChangeController extends BaseController { private final IXzdSubcontractChangeService xzdSubcontractChangeService; + private final IXzdSubcontractService xzdSubcontractService; + + + private final IXzdBusinessSealService xzdBusinessSealService; + + + + /** + * 查询印章帮助列表 + */ + @SaCheckPermission(value={"fenbaohetongbiangg:subcontractChange:list","fenbaohetongbiangg:subcontractChange:add","fenbaohetongbiangg:subcontractChange:edit"}, mode = SaMode.OR) + @GetMapping("/listBusinss") + public TableDataInfo list(XzdBusinessSealBo bo, PageQuery pageQuery) { + return xzdBusinessSealService.queryPageList(bo, pageQuery); + } + /** * 查询分包合同变更列表 */ @@ -102,4 +125,19 @@ public class XzdSubcontractChangeController extends BaseController { @PathVariable Long[] ids) { return toAjax(xzdSubcontractChangeService.deleteWithValidByIds(List.of(ids), true)); } + + + + /** + * 查询分包合同信息列表 + */ + @SaCheckPermission(value={"fenbaohetongbiangg:subcontractChange:list","fenbaohetongbiangg:subcontractChange:add","fenbaohetongbiangg:subcontractChange:edit"}, mode = SaMode.OR) + @GetMapping("/getlist") + public TableDataInfo list(XzdSubcontractBo bo, PageQuery pageQuery) { + return xzdSubcontractService.queryPageList(bo, pageQuery); + } + + + + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/controller/XzdSubcontractController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/controller/XzdSubcontractController.java index 750c3eb8..1b850419 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/controller/XzdSubcontractController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/controller/XzdSubcontractController.java @@ -2,11 +2,15 @@ package org.dromara.xzd.contractManagement.fenbaohetongxinxi.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.vo.XzdJdztVo; +import org.dromara.xzd.domain.bo.XzdBusinessSealBo; +import org.dromara.xzd.domain.vo.XzdBusinessSealVo; +import org.dromara.xzd.service.IXzdBusinessSealService; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -37,6 +41,17 @@ public class XzdSubcontractController extends BaseController { private final IXzdSubcontractService xzdSubcontractService; + private final IXzdBusinessSealService xzdBusinessSealService; + + /** + * 查询印章帮助列表 + */ + @SaCheckPermission(value={"fenbaohetongxinxi:subcontract:list","fenbaohetongxinxi:subcontract:add","fenbaohetongxinxi:subcontract:edit"}, mode = SaMode.OR) + @GetMapping("/listBusinss") + public TableDataInfo list(XzdBusinessSealBo bo, PageQuery pageQuery) { + return xzdBusinessSealService.queryPageList(bo, pageQuery); + } + /** * 查询分包合同信息列表 */ 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..f9c8249d 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 @@ -2,10 +2,17 @@ package org.dromara.xzd.contractManagement.fenbaohetongzhongzhi.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.domain.bo.XzdBusinessSealBo; +import org.dromara.xzd.domain.vo.XzdBusinessSealVo; +import org.dromara.xzd.service.IXzdBusinessSealService; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -36,6 +43,22 @@ public class XzdSubcontractTerminationController extends BaseController { private final IXzdSubcontractTerminationService xzdSubcontractTerminationService; + private final IXzdSubcontractService xzdSubcontractService; + + + + + private final IXzdBusinessSealService xzdBusinessSealService; + + /** + * 查询印章帮助列表 + */ + @SaCheckPermission(value={"fenbaohetongzhongzhi:subcontractTermination:list","fenbaohetongzhongzhi:subcontractTermination:add","fenbaohetongzhongzhi:subcontractTermination:edit"}, mode = SaMode.OR) + @GetMapping("/listBusinss") + public TableDataInfo list(XzdBusinessSealBo bo, PageQuery pageQuery) { + return xzdBusinessSealService.queryPageList(bo, pageQuery); + } + /** * 查询分包合同终止列表 */ @@ -102,4 +125,13 @@ public class XzdSubcontractTerminationController extends BaseController { @PathVariable Long[] ids) { return toAjax(xzdSubcontractTerminationService.deleteWithValidByIds(List.of(ids), true)); } + + /** + * 查询分包合同信息列表 + */ + @SaCheckPermission(value={"fenbaohetongzhongzhi:subcontractTermination:list","fenbaohetongzhongzhi:subcontractTermination:add","fenbaohetongzhongzhi:subcontractTermination:edit"}, mode = SaMode.OR) + @GetMapping("/getlist") + public TableDataInfo list(XzdSubcontractBo bo, PageQuery pageQuery) { + return xzdSubcontractService.queryPageList(bo, pageQuery); + } } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/jixiehetongbiang/controller/XzdMachineryContractAlterationController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/jixiehetongbiang/controller/XzdMachineryContractAlterationController.java index bbcd26f3..845f76e5 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/jixiehetongbiang/controller/XzdMachineryContractAlterationController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/jixiehetongbiang/controller/XzdMachineryContractAlterationController.java @@ -2,10 +2,17 @@ package org.dromara.xzd.contractManagement.jixiehetongbiang.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.jixiehetongxinxi.domain.bo.XzdContractMachineryBo; +import org.dromara.xzd.contractManagement.jixiehetongxinxi.domain.vo.XzdContractMachineryVo; +import org.dromara.xzd.contractManagement.jixiehetongxinxi.service.IXzdContractMachineryService; +import org.dromara.xzd.domain.bo.XzdBusinessSealBo; +import org.dromara.xzd.domain.vo.XzdBusinessSealVo; +import org.dromara.xzd.service.IXzdBusinessSealService; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -36,6 +43,21 @@ public class XzdMachineryContractAlterationController extends BaseController { private final IXzdMachineryContractAlterationService xzdMachineryContractAlterationService; + private final IXzdContractMachineryService xzdContractMachineryService; + + + private final IXzdBusinessSealService xzdBusinessSealService; + + /** + * 查询印章帮助列表 + */ + @SaCheckPermission(value={"jixiehetongbiang:machineryContractAlteration:list","jixiehetongbiang:machineryContractAlteration:add","jixiehetongbiang:machineryContractAlteration:edit"}, mode = SaMode.OR) + @GetMapping("/listBusinss") + public TableDataInfo list(XzdBusinessSealBo bo, PageQuery pageQuery) { + return xzdBusinessSealService.queryPageList(bo, pageQuery); + } + + /** * 查询机械合同变更列表 */ @@ -102,4 +124,13 @@ public class XzdMachineryContractAlterationController extends BaseController { @PathVariable Long[] ids) { return toAjax(xzdMachineryContractAlterationService.deleteWithValidByIds(List.of(ids), true)); } + + /** + * 查询机械合同信息列表 + */ + @SaCheckPermission(value={"jixiehetongbiang:machineryContractAlteration:list","jixiehetongbiang:machineryContractAlteration:add","jixiehetongbiang:machineryContractAlteration:edit"}, mode = SaMode.OR) + @GetMapping("/getlist") + public TableDataInfo list(XzdContractMachineryBo bo, PageQuery pageQuery) { + return xzdContractMachineryService.queryPageList(bo, pageQuery); + } } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/jixiehetongxinxi/controller/XzdContractMachineryController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/jixiehetongxinxi/controller/XzdContractMachineryController.java index 621a6031..c8d8672b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/jixiehetongxinxi/controller/XzdContractMachineryController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/jixiehetongxinxi/controller/XzdContractMachineryController.java @@ -2,10 +2,14 @@ package org.dromara.xzd.contractManagement.jixiehetongxinxi.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.domain.bo.XzdBusinessSealBo; +import org.dromara.xzd.domain.vo.XzdBusinessSealVo; +import org.dromara.xzd.service.IXzdBusinessSealService; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -36,6 +40,17 @@ public class XzdContractMachineryController extends BaseController { private final IXzdContractMachineryService xzdContractMachineryService; + private final IXzdBusinessSealService xzdBusinessSealService; + + /** + * 查询印章帮助列表 + */ + @SaCheckPermission(value={"jixiehetongxinxi:contractMachinery:list","jixiehetongxinxi:contractMachinery:add","jixiehetongxinxi:contractMachinery:edit"}, mode = SaMode.OR) + @GetMapping("/listBusinss") + public TableDataInfo list(XzdBusinessSealBo bo, PageQuery pageQuery) { + return xzdBusinessSealService.queryPageList(bo, pageQuery); + } + /** * 查询机械合同信息列表 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/jixiehetongzz/controller/XzdMachineryContractSuspendController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/jixiehetongzz/controller/XzdMachineryContractSuspendController.java index 81ba5d6d..9b17fa55 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/jixiehetongzz/controller/XzdMachineryContractSuspendController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/jixiehetongzz/controller/XzdMachineryContractSuspendController.java @@ -2,10 +2,17 @@ package org.dromara.xzd.contractManagement.jixiehetongzz.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.jixiehetongxinxi.domain.bo.XzdContractMachineryBo; +import org.dromara.xzd.contractManagement.jixiehetongxinxi.domain.vo.XzdContractMachineryVo; +import org.dromara.xzd.contractManagement.jixiehetongxinxi.service.IXzdContractMachineryService; +import org.dromara.xzd.domain.bo.XzdBusinessSealBo; +import org.dromara.xzd.domain.vo.XzdBusinessSealVo; +import org.dromara.xzd.service.IXzdBusinessSealService; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -36,6 +43,19 @@ public class XzdMachineryContractSuspendController extends BaseController { private final IXzdMachineryContractSuspendService xzdMachineryContractSuspendService; + private final IXzdContractMachineryService xzdContractMachineryService; + + private final IXzdBusinessSealService xzdBusinessSealService; + + /** + * 查询印章帮助列表 + */ + @SaCheckPermission(value={"jixiehetongzz:machineryContractSuspend:list","jixiehetongzz:machineryContractSuspend:add","jixiehetongzz:machineryContractSuspend:edit"}, mode = SaMode.OR) + @GetMapping("/listBusinss") + public TableDataInfo list(XzdBusinessSealBo bo, PageQuery pageQuery) { + return xzdBusinessSealService.queryPageList(bo, pageQuery); + } + /** * 查询机械合同终止列表 */ @@ -102,4 +122,14 @@ public class XzdMachineryContractSuspendController extends BaseController { @PathVariable Long[] ids) { return toAjax(xzdMachineryContractSuspendService.deleteWithValidByIds(List.of(ids), true)); } + + + /** + * 查询机械合同信息列表 + */ + @SaCheckPermission(value={"jixiehetongzz:machineryContractSuspend:list","jixiehetongzz:machineryContractSuspend:add","jixiehetongzz:machineryContractSuspend:edit"}, mode = SaMode.OR) + @GetMapping("/getlist") + public TableDataInfo list(XzdContractMachineryBo bo, PageQuery pageQuery) { + return xzdContractMachineryService.queryPageList(bo, pageQuery); + } } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/controller/XzdPurchaseContractInformationController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/controller/XzdPurchaseContractInformationController.java index bdfa5797..91df40e9 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/controller/XzdPurchaseContractInformationController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/controller/XzdPurchaseContractInformationController.java @@ -2,6 +2,7 @@ package org.dromara.xzd.contractManagement.purchaseManagement.controller; import java.util.List; +import cn.dev33.satoken.annotation.SaMode; import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; @@ -11,6 +12,9 @@ import org.dromara.xzd.contractManagement.purchaseManagement.domain.bo.XzdPurcha import org.dromara.xzd.contractManagement.purchaseManagement.domain.vo.XzdJdztCghtVo; import org.dromara.xzd.contractManagement.purchaseManagement.domain.vo.XzdPurchaseContractInformationVo; import org.dromara.xzd.contractManagement.purchaseManagement.service.IXzdPurchaseContractInformationService; +import org.dromara.xzd.domain.bo.XzdBusinessSealBo; +import org.dromara.xzd.domain.vo.XzdBusinessSealVo; +import org.dromara.xzd.service.IXzdBusinessSealService; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -39,6 +43,17 @@ public class XzdPurchaseContractInformationController extends BaseController { private final IXzdPurchaseContractInformationService xzdPurchaseContractInformationService; + private final IXzdBusinessSealService xzdBusinessSealService; + + /** + * 查询印章帮助列表 + */ + @SaCheckPermission(value={"contractManagement:purchaseContractInformation:list","contractManagement:purchaseContractInformation:add","contractManagement:purchaseContractInformation:edit"}, mode = SaMode.OR) + @GetMapping("/listBusinss") + public TableDataInfo list(XzdBusinessSealBo bo, PageQuery pageQuery) { + return xzdBusinessSealService.queryPageList(bo, pageQuery); + } + /** * 查询采购合同信息列表 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdBusinessSealController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdBusinessSealController.java index 55bafbb1..35fdbd02 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdBusinessSealController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdBusinessSealController.java @@ -1,5 +1,6 @@ package org.dromara.xzd.controller; +import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; @@ -39,7 +40,7 @@ public class XzdBusinessSealController extends BaseController { /** * 查询印章帮助列表 */ -// @SaCheckPermission("xzd:businessSeal:list") + @SaCheckPermission("xzd:businessSeal:list") @GetMapping("/list") public TableDataInfo list(XzdBusinessSealBo bo, PageQuery pageQuery) { return xzdBusinessSealService.queryPageList(bo, pageQuery); @@ -48,7 +49,7 @@ public class XzdBusinessSealController extends BaseController { /** * 导出印章帮助列表 */ -// @SaCheckPermission("xzd:businessSeal:export") + @SaCheckPermission("xzd:businessSeal:export") @Log(title = "印章帮助", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(XzdBusinessSealBo bo, HttpServletResponse response) { @@ -61,7 +62,7 @@ public class XzdBusinessSealController extends BaseController { * * @param id 主键 */ -// @SaCheckPermission("xzd:businessSeal:query") + @SaCheckPermission("xzd:businessSeal:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { @@ -71,7 +72,7 @@ public class XzdBusinessSealController extends BaseController { /** * 新增印章帮助 */ -// @SaCheckPermission("xzd:businessSeal:add") + @SaCheckPermission("xzd:businessSeal:add") @Log(title = "印章帮助", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -82,7 +83,7 @@ public class XzdBusinessSealController extends BaseController { /** * 修改印章帮助 */ -// @SaCheckPermission("xzd:businessSeal:edit") + @SaCheckPermission("xzd:businessSeal:edit") @Log(title = "印章帮助", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -95,7 +96,7 @@ public class XzdBusinessSealController extends BaseController { * * @param ids 主键串 */ -// @SaCheckPermission("xzd:businessSeal:remove") + @SaCheckPermission("xzd:businessSeal:remove") @Log(title = "印章帮助", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/domain/XzdCbysZjhcbAlteration.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/domain/XzdCbysZjhcbAlteration.java index 5ca6c34c..2ab9f587 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/domain/XzdCbysZjhcbAlteration.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/domain/XzdCbysZjhcbAlteration.java @@ -29,11 +29,19 @@ public class XzdCbysZjhcbAlteration extends BaseEntity { @TableId(value = "id") private Long id; + + + /** * 部门id */ private Long deptId; + /** + * 关联id + */ + private Long relevanceId; + /** * 单据编码(带*,必填) */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/domain/bo/XzdCbysZjhcbAlterationBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/domain/bo/XzdCbysZjhcbAlterationBo.java index 69b0a9ba..e2538240 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/domain/bo/XzdCbysZjhcbAlterationBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/domain/bo/XzdCbysZjhcbAlterationBo.java @@ -29,6 +29,11 @@ public class XzdCbysZjhcbAlterationBo extends BaseEntity { */ private Long id; + /** + * 关联id + */ + private Long relevanceId; + /** * 部门id diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/domain/vo/XzdCbysZjhcbAlterationVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/domain/vo/XzdCbysZjhcbAlterationVo.java index c2b2078d..d28b1227 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/domain/vo/XzdCbysZjhcbAlterationVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/domain/vo/XzdCbysZjhcbAlterationVo.java @@ -38,6 +38,16 @@ public class XzdCbysZjhcbAlterationVo implements Serializable { @ExcelProperty(value = "主键ID") private Long id; + /** + * 关联id + */ + private Long relevanceId; + + /** + * 关联名称 + */ + private String relevanceName; + /** * 部门id @@ -74,6 +84,7 @@ public class XzdCbysZjhcbAlterationVo implements Serializable { /** * 工程项目名称 */ + @Translation(type = TransConstant.XZD_PROJECT_ID_TO_NAME, mapper = "projectId") private String projectName; /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/service/impl/XzdCbysZjhcbAlterationServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/service/impl/XzdCbysZjhcbAlterationServiceImpl.java index a37d9c76..c2884050 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/service/impl/XzdCbysZjhcbAlterationServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/service/impl/XzdCbysZjhcbAlterationServiceImpl.java @@ -42,6 +42,8 @@ public class XzdCbysZjhcbAlterationServiceImpl extends ServiceImpl list(XzdGuaranteeInfoBo bo, PageQuery pageQuery) { + return xzdGuaranteeInfoService.queryPageList(bo, pageQuery); + } } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/contractBackletter/controller/XzdGuaranteeInfoController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/contractBackletter/controller/XzdGuaranteeInfoController.java index a7cfe578..16dd857a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/contractBackletter/controller/XzdGuaranteeInfoController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/contractBackletter/controller/XzdGuaranteeInfoController.java @@ -2,6 +2,7 @@ package org.dromara.xzd.deposit.contractBackletter.controller; import java.util.List; +import cn.dev33.satoken.annotation.SaMode; import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; @@ -9,6 +10,9 @@ import cn.dev33.satoken.annotation.SaCheckPermission; import org.dromara.xzd.deposit.contractBackletter.domain.bo.XzdGuaranteeInfoBo; import org.dromara.xzd.deposit.contractBackletter.domain.vo.XzdGuaranteeInfoVo; import org.dromara.xzd.deposit.contractBackletter.service.IXzdGuaranteeInfoService; +import org.dromara.xzd.domain.bo.XzdContractDetailsBo; +import org.dromara.xzd.domain.vo.XzdContractDetailsVo; +import org.dromara.xzd.service.IXzdContractDetailsService; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -37,6 +41,8 @@ public class XzdGuaranteeInfoController extends BaseController { private final IXzdGuaranteeInfoService xzdGuaranteeInfoService; + private final IXzdContractDetailsService xzdContractDetailsService; + /** * 查询承包合同保函列表 */ @@ -103,4 +109,14 @@ public class XzdGuaranteeInfoController extends BaseController { @PathVariable Long[] ids) { return toAjax(xzdGuaranteeInfoService.deleteWithValidByIds(List.of(ids), true)); } + + + /** + * 查询承包合同信息列表 + */ + @SaCheckPermission(value = {"deposit:guaranteeInfo:list "," deposit:guaranteeInfo:add "," deposit:guaranteeInfo:edit"},mode = SaMode.OR) + @GetMapping("/getlist") + public TableDataInfo list(XzdContractDetailsBo bo, PageQuery pageQuery) { + return xzdContractDetailsService.queryPageList(bo, pageQuery); + } } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/earnestMoney/controller/XzdDepositApplicationController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/earnestMoney/controller/XzdDepositApplicationController.java index 92757287..22281cc8 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/earnestMoney/controller/XzdDepositApplicationController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/earnestMoney/controller/XzdDepositApplicationController.java @@ -2,10 +2,14 @@ package org.dromara.xzd.deposit.earnestMoney.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.dromara.xzd.deposit.earnestMoney.domain.bo.XzdDepositApplicationBo; import org.dromara.xzd.deposit.earnestMoney.domain.vo.XzdDepositApplicationVo; import org.dromara.xzd.deposit.earnestMoney.service.IXzdDepositApplicationService; @@ -37,6 +41,8 @@ public class XzdDepositApplicationController extends BaseController { private final IXzdDepositApplicationService xzdDepositApplicationService; + private final IXzdBidPreProjectService xzdBidPreProjectService; + /** * 查询保证金缴纳审批列表 */ @@ -103,4 +109,15 @@ public class XzdDepositApplicationController extends BaseController { @PathVariable Long[] ids) { return toAjax(xzdDepositApplicationService.deleteWithValidByIds(List.of(ids), true)); } + + /** + * 查询标前立项列表 + */ + @SaCheckPermission(value = {"earnestMoney:depositApplication:list "," earnestMoney:depositApplication:add "," earnestMoney:depositApplication: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/fapiaotaizhang/zengzhishui/controller/AppreciationInvoiceController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/fapiaotaizhang/zengzhishui/controller/AppreciationInvoiceController.java index 58f933e6..83c22f0b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/fapiaotaizhang/zengzhishui/controller/AppreciationInvoiceController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/fapiaotaizhang/zengzhishui/controller/AppreciationInvoiceController.java @@ -2,11 +2,15 @@ package org.dromara.xzd.fapiaotaizhang.zengzhishui.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.domain.bo.XzdContractDetailsBo; +import org.dromara.xzd.domain.vo.XzdContractDetailsVo; import org.dromara.xzd.fapiaotaizhang.zengzhishui.domain.vo.XzdXhqdVo; +import org.dromara.xzd.service.IXzdContractDetailsService; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -38,6 +42,8 @@ public class AppreciationInvoiceController extends BaseController { private final IAppreciationInvoiceService appreciationInvoiceService; + private final IXzdContractDetailsService xzdContractDetailsService; + /** * 查询增值税发票列表 */ @@ -115,4 +121,13 @@ public class AppreciationInvoiceController extends BaseController { public R> addExcel(@RequestParam("file") MultipartFile files) { return R.ok(appreciationInvoiceService.addExcel(files)); } + + /** + * 查询承包合同信息列表 + */ + @SaCheckPermission(value = {"zengzhishui:invoice:list "," zengzhishui:invoice:add "," zengzhishui:invoice:edit"},mode = SaMode.OR) + @GetMapping("/getlist") + public TableDataInfo list(XzdContractDetailsBo bo, PageQuery pageQuery) { + return xzdContractDetailsService.queryPageList(bo, pageQuery); + } } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/publicUrl/XzdPublicUrlConreoller.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/publicUrl/XzdPublicUrlConreoller.java new file mode 100644 index 00000000..0a2f6ce4 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/publicUrl/XzdPublicUrlConreoller.java @@ -0,0 +1,128 @@ +package org.dromara.xzd.publicUrl; + + +import cn.dev33.satoken.annotation.SaCheckPermission; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.system.domain.bo.SysUserBo; +import org.dromara.system.domain.vo.SysDeptVo; +import org.dromara.system.domain.vo.SysUserVo; +import org.dromara.system.service.ISysDeptService; +import org.dromara.system.service.ISysUserService; +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.dromara.xzd.domain.bo.XzdProjectBo; +import org.dromara.xzd.domain.bo.XzdSupplierInfoBo; +import org.dromara.xzd.domain.bo.XzdSupplierOpenBankBo; +import org.dromara.xzd.domain.dto.XzdClienteleListDto; +import org.dromara.xzd.domain.vo.XzdClienteleListSumVo; +import org.dromara.xzd.domain.vo.XzdProjectVo; +import org.dromara.xzd.domain.vo.XzdSupplierInfoVo; +import org.dromara.xzd.domain.vo.XzdSupplierOpenBankVo; +import org.dromara.xzd.service.IXzdCorrespondentList; +import org.dromara.xzd.service.IXzdProjectService; +import org.dromara.xzd.service.IXzdSupplierInfoService; +import org.dromara.xzd.service.IXzdSupplierOpenBankService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + + +/** + * 公用接口 + * + * @author Lion Li + * @date 2023-09-05 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/xzd/xzdPublicUrlConreoller") +public class XzdPublicUrlConreoller { + + private final IXzdProjectService xzdProjectService; + + private final IXzdSupplierInfoService xzdSupplierInfoService; + + private final IXzdCorrespondentList iXzdCorrespondentList; + + private final IXzdSupplierOpenBankService xzdSupplierOpenBankService; + + private final IXzdBidPreProjectService xzdBidPreProjectService; + + private final ISysUserService userService; + + private final ISysDeptService iSysDeptService; + + + /** + * 查询项目信息列表 + */ + @GetMapping("/listProject") + public TableDataInfo list(XzdProjectBo bo, PageQuery pageQuery) { + return xzdProjectService.queryPageList(bo, pageQuery); + } + + + + /** + * 查询供应商信息列表 + */ + @GetMapping("/listSupplierInfo") + public TableDataInfo list(XzdSupplierInfoBo bo, PageQuery pageQuery) { + return xzdSupplierInfoService.queryPageList(bo, pageQuery); + } + + /** + * 客户信息列表 + */ + @GetMapping("/listCustomertype") + public R queryCustomertype(XzdClienteleListDto dto, PageQuery pageQuery) { + return iXzdCorrespondentList.queryCustomertype(dto, pageQuery); + } + + + + /** + * 查询供应商信息-开户银行列表 + */ + @GetMapping("/listSupplierOpenBank") + public TableDataInfo list(XzdSupplierOpenBankBo bo, PageQuery pageQuery) { + return xzdSupplierOpenBankService.queryPageList(bo, pageQuery); + } + + + /** + * 查询标前立项列表 + */ + @GetMapping("/listBqlx") + public QueryListXzdVo list(QuerBiddingManagementDto bo, PageQuery pageQuery) { + return xzdBidPreProjectService.queryPageList(bo, pageQuery); + } + + + // /** +// * 获取用户列表 +// */ + @GetMapping("/userList") + public TableDataInfo list(SysUserBo user, PageQuery pageQuery) { + return userService.selectPageUserList(user, pageQuery); + } + + +// /** +// * 查询部门 +// */ + @GetMapping("/listDept") + public R> list() { + List list = iSysDeptService.querListDept(); + return R.ok(list); + } + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjingdu/controller/SettlementOfSubcontractingContractController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjingdu/controller/SettlementOfSubcontractingContractController.java index 0e8f1883..b0efc4a5 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjingdu/controller/SettlementOfSubcontractingContractController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjingdu/controller/SettlementOfSubcontractingContractController.java @@ -2,10 +2,14 @@ package org.dromara.xzd.settlement.fenbaohetongjingdu.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.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -36,6 +40,17 @@ public class SettlementOfSubcontractingContractController extends BaseController private final ISettlementOfSubcontractingContractService settlementOfSubcontractingContractService; + private final IXzdSubcontractService xzdSubcontractService; + + /** + * 查询分包合同信息列表 + */ + @SaCheckPermission(value = {"fenbaohetongjingdu:ofSubcontractingContract:list "," fenbaohetongjingdu:ofSubcontractingContract:add "," fenbaohetongjingdu:ofSubcontractingContract:edit"},mode = SaMode.OR) + @GetMapping("/getlist") + public TableDataInfo list(XzdSubcontractBo bo, PageQuery pageQuery) { + return xzdSubcontractService.queryPageList(bo, pageQuery); + } + /** * 查询分包合同进度结算列表 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjungong/controller/SettlementOfSubcontractingCompletionController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjungong/controller/SettlementOfSubcontractingCompletionController.java index ecc0b37c..518e1807 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjungong/controller/SettlementOfSubcontractingCompletionController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjungong/controller/SettlementOfSubcontractingCompletionController.java @@ -2,10 +2,14 @@ package org.dromara.xzd.settlement.fenbaohetongjungong.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.costProjectApproval.costBudget.service.IXzdCbysWgcbtbService; import org.dromara.xzd.domain.vo.XzdSettlementRulesVo; import org.springframework.web.bind.annotation.*; @@ -40,6 +44,18 @@ public class SettlementOfSubcontractingCompletionController extends BaseControll private final IXzdCbysWgcbtbService xzdCbysWgcbtbService; + + private final IXzdSubcontractService xzdSubcontractService; + + /** + * 查询分包合同信息列表 + */ + @SaCheckPermission(value = {"fenbaohetongjungong:ofSubcontractingCompletion:list "," fenbaohetongjungong:ofSubcontractingCompletion:add "," fenbaohetongjungong:ofSubcontractingCompletion:edit"},mode = SaMode.OR) + @GetMapping("/getlist") + public TableDataInfo list(XzdSubcontractBo bo, PageQuery pageQuery) { + return xzdSubcontractService.queryPageList(bo, pageQuery); + } + /** * 查询分包合同竣工结算列表 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongtiaozheng/controller/SettlementOfSubcontractingAdjustmentController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongtiaozheng/controller/SettlementOfSubcontractingAdjustmentController.java index f9d7bdfd..2137ae91 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongtiaozheng/controller/SettlementOfSubcontractingAdjustmentController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongtiaozheng/controller/SettlementOfSubcontractingAdjustmentController.java @@ -2,10 +2,14 @@ package org.dromara.xzd.settlement.fenbaohetongtiaozheng.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.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -36,6 +40,18 @@ public class SettlementOfSubcontractingAdjustmentController extends BaseControll private final ISettlementOfSubcontractingAdjustmentService settlementOfSubcontractingAdjustmentService; + + private final IXzdSubcontractService xzdSubcontractService; + + /** + * 查询分包合同信息列表 + */ + @SaCheckPermission(value = {"fenbaohetongtiaozheng:ofSubcontractingAdjustment:list "," fenbaohetongtiaozheng:ofSubcontractingAdjustment:add "," fenbaohetongtiaozheng:ofSubcontractingAdjustment:edit"},mode = SaMode.OR) + @GetMapping("/getlist") + public TableDataInfo list(XzdSubcontractBo bo, PageQuery pageQuery) { + return xzdSubcontractService.queryPageList(bo, pageQuery); + } + /** * 查询分包合同竣工结算调整列表 */