From 2683772d398e33c1a151ff473376e7df0e40d036 Mon Sep 17 00:00:00 2001 From: yupeng <roc__yu@163.com> Date: 星期四, 03 四月 2025 11:59:46 +0800 Subject: [PATCH] feat: 更新统计SQL,单独账单新增合同列表查询接口 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBillController.java | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBillController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBillController.java index 81ad5e9..c0b0f63 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBillController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBillController.java @@ -10,11 +10,10 @@ import com.ruoyi.system.model.TBill; import com.ruoyi.system.model.TBillConfirm; import com.ruoyi.system.model.TBillDetail; +import com.ruoyi.system.model.TContract; import com.ruoyi.system.query.TBillQuery; -import com.ruoyi.system.service.ISysUserService; -import com.ruoyi.system.service.TBillConfirmService; -import com.ruoyi.system.service.TBillDetailService; -import com.ruoyi.system.service.TBillService; +import com.ruoyi.system.query.TContractQuery; +import com.ruoyi.system.service.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -47,6 +46,9 @@ @Autowired TBillConfirmService tBillConfirmService; + @Autowired + TContractService contractService; + @PreAuthorize("@ss.hasPermi('bill:list')") @PostMapping("list") @ApiOperation("分页查询账单列表") @@ -56,6 +58,14 @@ return R.ok(pageInfo); } + + @ApiOperation(value = "获取合同分页列表") + @PostMapping(value = "/contractList") + public R<PageInfo<TContract>> contractList(@RequestBody TContractQuery query) { + query.setBusinessDeptId(SecurityUtils.getBusinessDeptId()); + return R.ok(contractService.queryPage(query)); + } + @PreAuthorize("@ss.hasPermi('bill:list:addRent')") @PostMapping("add") @ApiOperation("新增账单") -- Gitblit v1.7.1