lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
青云
2025-11-15 17:42:46 +08:00
parent ef775a3cfb 818b67b5aa
commit cdcbfaa1a9
10 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocument/controller/XzdBiddingFileEstimateController.java
View File

@ -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);

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoney/controller/XzdBidDepositPaymentController.java
View File

@ -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);

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoneyWithdraw/controller/XzdBidDepositRecoveryController.java
View File

@ -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);

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/paymentapplication/controller/XzdBiddingAgencyFeePaymentController.java
View File

@ -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);

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/backletter/controller/XzdGuaranteeChangeInfoController.java
View File

@ -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<XzdGuaranteeInfoVo> list(XzdGuaranteeInfoBo bo, PageQuery pageQuery) {
return xzdGuaranteeInfoService.queryPageList(bo, pageQuery);

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/contractBackletter/controller/XzdGuaranteeInfoController.java
View File

@ -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<XzdContractDetailsVo> list(XzdContractDetailsBo bo, PageQuery pageQuery) {
return xzdContractDetailsService.queryPageList(bo, pageQuery);

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/earnestMoney/controller/XzdDepositApplicationController.java
View File

@ -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);

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/fapiaotaizhang/zengzhishui/controller/AppreciationInvoiceController.java
View File

@ -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<XzdContractDetailsVo> list(XzdContractDetailsBo bo, PageQuery pageQuery) {
return xzdContractDetailsService.queryPageList(bo, pageQuery);

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjungong/controller/SettlementOfSubcontractingCompletionController.java
View File

@ -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<XzdSubcontractVo> list(XzdSubcontractBo bo, PageQuery pageQuery) {
return xzdSubcontractService.queryPageList(bo, pageQuery);

23
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongtiaozheng/controller/SettlementOfSubcontractingAdjustmentController.java
View File

@ -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<XzdSubcontractVo> 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<XzdSubcontractVo> list(XzdSubcontractBo bo, PageQuery pageQuery) {
return xzdSubcontractService.queryPageList(bo, pageQuery);
public TableDataInfo<SettlementOfSubcontractingCompletionVo> list(SettlementOfSubcontractingCompletionBo bo, PageQuery pageQuery) {
return settlementOfSubcontractingCompletionService.queryPageList(bo, pageQuery);
}
/**