From be7f90ecef3be319ef12415c5109b5db74c316c6 Mon Sep 17 00:00:00 2001 From: winter <664946893@qq.com> Date: Mon, 28 Apr 2025 12:27:21 +0800 Subject: [PATCH] fix --- .../market/WxFinanceController.java | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java index e3821040c..e917941bb 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java @@ -125,13 +125,13 @@ public class WxFinanceController extends BaseController { return new ResultData(list); } - @ApiOperation("合同费用科目列表") - @GetMapping("contractFeesList") + @ApiOperation("款项列表") + @GetMapping("feesList") @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), }) - public ResultData contractFeesList(@ModelAttribute WxFinanceFees record, Integer pageNum, Integer pageSize) { + public ResultData feesList(@ModelAttribute WxFinanceFees record, Integer pageNum, Integer pageSize) { record.updateTenantInfo(getTenantInfo()); record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); //record.setCashierType(EnumFinanceCashierType.RECEIVE.getCode()); @@ -139,6 +139,20 @@ public class WxFinanceController extends BaseController { return new ResultData(page); } + @ApiOperation("款项列表") + @GetMapping("advanceFeesList") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), + }) + public ResultData advanceFeesList(@ModelAttribute WxFinanceFees record, Integer pageNum, Integer pageSize) { + record.updateTenantInfo(getTenantInfo()); + record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); + //record.setCashierType(EnumFinanceCashierType.RECEIVE.getCode()); + PageInfo page = wxEnergyService.feesListAsPage(record, pageNum, pageSize,true); + return new ResultData(page); + } + // @ApiOperation("其他费用科目列表") // @GetMapping("otherFeesList") // @ApiImplicitParams({ @@ -188,10 +202,6 @@ public class WxFinanceController extends BaseController { @PostMapping("saveFees") public ResultData saveFees(@RequestBody WxFinanceFees record) { record.updateTenantInfo(getTenantInfo()); -// if (record.getBillType() == EnumBillAllType.RENT_DEPOSIT.getCode()) { -// record.setIsDespoit(EnumYesOrNo.YES.getCode()); -// record.setFixedPrice(EnumYesOrNo.YES.getCode()); -// } wxEnergyService.saveOrUpdateFees(record); return new ResultData(); }