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

21
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)
@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);
}
/**