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 872ef8bf..33ac4bda 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 @@ -112,7 +112,7 @@ public class XzdBiddingFileEstimateController extends BaseController { /** * 查询标前立项列表 */ - @SaCheckPermission(value = {"biddingDocument:biddingFileEstimate:list "," biddingDocument:biddingFileEstimate:add "," biddingDocument:biddingFileEstimate:edit"},mode = SaMode.OR) + @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 e67f081d..d4c33b0c 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 @@ -114,7 +114,7 @@ public class XzdBidDepositPaymentController extends BaseController { /** * 查询标前立项列表 */ - @SaCheckPermission(value = {"earnestMoney:bidDepositPayment:list "," earnestMoney:bidDepositPayment:add "," earnestMoney:bidDepositPayment:edit"},mode = SaMode.OR) + @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 621ea10a..4cb9e8b5 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 @@ -114,7 +114,7 @@ public class XzdBidDepositRecoveryController extends BaseController { /** * 查询标前立项列表 */ - @SaCheckPermission(value = {"biddingManagement:bidDepositRecovery:list "," biddingManagement:bidDepositRecovery:add "," biddingManagement:bidDepositRecovery:edit"},mode = SaMode.OR) + @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 e13156d8..f3193578 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 @@ -114,7 +114,7 @@ public class XzdBiddingAgencyFeePaymentController extends BaseController { /** * 查询标前立项列表 */ - @SaCheckPermission(value = {"paymentapplication:biddingAgencyFeePayment:list "," paymentapplication:biddingAgencyFeePayment:add "," paymentapplication:biddingAgencyFeePayment:edit"},mode = SaMode.OR) + @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/deposit/backletter/controller/XzdGuaranteeChangeInfoController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/backletter/controller/XzdGuaranteeChangeInfoController.java index d4d07389..150e2fed 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/backletter/controller/XzdGuaranteeChangeInfoController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/backletter/controller/XzdGuaranteeChangeInfoController.java @@ -113,7 +113,7 @@ public class XzdGuaranteeChangeInfoController extends BaseController { /** * 查询承包合同保函列表 */ - @SaCheckPermission(value = {"backletter:guaranteeChangeInfo:list "," backletter:guaranteeChangeInfo:add "," backletter:guaranteeChangeInfo:edit"},mode = SaMode.OR) + @SaCheckPermission(value = {"backletter:guaranteeChangeInfo:list","backletter:guaranteeChangeInfo:add","backletter:guaranteeChangeInfo:edit"},mode = SaMode.OR) @GetMapping("/getlist") public TableDataInfo 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 16dd857a..011c2e55 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 @@ -114,7 +114,7 @@ public class XzdGuaranteeInfoController extends BaseController { /** * 查询承包合同信息列表 */ - @SaCheckPermission(value = {"deposit:guaranteeInfo:list "," deposit:guaranteeInfo:add "," deposit:guaranteeInfo:edit"},mode = SaMode.OR) + @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 22281cc8..36cdca2a 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 @@ -113,7 +113,7 @@ public class XzdDepositApplicationController extends BaseController { /** * 查询标前立项列表 */ - @SaCheckPermission(value = {"earnestMoney:depositApplication:list "," earnestMoney:depositApplication:add "," earnestMoney:depositApplication:edit"}, mode = SaMode.OR) + @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 83c22f0b..a0d6ec31 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 @@ -125,7 +125,7 @@ public class AppreciationInvoiceController extends BaseController { /** * 查询承包合同信息列表 */ - @SaCheckPermission(value = {"zengzhishui:invoice:list "," zengzhishui:invoice:add "," zengzhishui:invoice:edit"},mode = SaMode.OR) + @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/settlement/fenbaohetongjungong/controller/SettlementOfSubcontractingCompletionController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjungong/controller/SettlementOfSubcontractingCompletionController.java index 518e1807..c4a20ad3 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 @@ -50,7 +50,7 @@ public class SettlementOfSubcontractingCompletionController extends BaseControll /** * 查询分包合同信息列表 */ - @SaCheckPermission(value = {"fenbaohetongjungong:ofSubcontractingCompletion:list "," fenbaohetongjungong:ofSubcontractingCompletion:add "," fenbaohetongjungong:ofSubcontractingCompletion:edit"},mode = SaMode.OR) + @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 2137ae91..f4f61818 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 @@ -10,6 +10,9 @@ 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; @@ -43,13 +46,25 @@ public class SettlementOfSubcontractingAdjustmentController extends BaseControll private final IXzdSubcontractService xzdSubcontractService; + private final ISettlementOfSubcontractingCompletionService settlementOfSubcontractingCompletionService; + +// /** +// * 查询分包合同信息列表 +// */ +// @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); +// } + + /** - * 查询分包合同信息列表 + * 查询分包合同竣工结算列表 */ - @SaCheckPermission(value = {"fenbaohetongtiaozheng:ofSubcontractingAdjustment:list "," fenbaohetongtiaozheng:ofSubcontractingAdjustment:add "," fenbaohetongtiaozheng:ofSubcontractingAdjustment:edit"},mode = SaMode.OR) + @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); + public TableDataInfo list(SettlementOfSubcontractingCompletionBo bo, PageQuery pageQuery) { + return settlementOfSubcontractingCompletionService.queryPageList(bo, pageQuery); } /**