From 967eda787678d728ba16a3038b40bb7f29927268 Mon Sep 17 00:00:00 2001 From: winter Date: Tue, 20 Aug 2024 16:16:52 +0800 Subject: [PATCH] fix --- .../market/WxFinanceController.java | 59 ++++++++++++------- .../com/iformall/domain/po/WxEnergyFees.java | 4 +- .../resources/mapper/WxEnergyFeesMapper.xml | 7 ++- 3 files changed, 47 insertions(+), 23 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 bcb7eb698..f422f8ebb 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java @@ -116,24 +116,57 @@ public class WxFinanceController extends BaseController { return new ResultData(list); } + @ApiOperation("合同费用科目列表") + @GetMapping("contractFeesList") + @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 WxEnergyFees record, Integer pageNum, Integer pageSize) { + record.updateTenantInfo(getTenantInfo()); + record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); + //查询非能源费用科目 + List billTypeList = new ArrayList(); + billTypeList.add(EnumBillAllType.RENT_DEPOSIT.getCode()); + billTypeList.add(EnumBillAllType.PROPERTY.getCode()); + record.setBillTypeList(billTypeList); + PageInfo page = wxEnergyService.feesListAsPage(record, pageNum, pageSize,false); + return new ResultData(page); + } - - - @ApiOperation("费用科目列表") - @GetMapping("feesList") + @ApiOperation("其他费用科目列表") + @GetMapping("otherFeesList") @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), }) - public ResultData feesList(@ModelAttribute WxEnergyFees record, Integer pageNum, Integer pageSize) { + public ResultData otherFeesList(@ModelAttribute WxEnergyFees record, Integer pageNum, Integer pageSize) { record.updateTenantInfo(getTenantInfo()); record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); //查询非能源费用科目 - record.setCommonOperate(EnumYesOrNo.YES.getCode()); + List billTypeList = new ArrayList(); + billTypeList.add(EnumBillAllType.OTHER.getCode()); + billTypeList.add(EnumBillAllType.OTHER_DEPOSIT.getCode()); + record.setBillTypeList(billTypeList); PageInfo page = wxEnergyService.feesListAsPage(record, pageNum, pageSize,false); 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 advanceTypeList(@ModelAttribute WxEnergyFees record, Integer pageNum, Integer pageSize) { + record.updateTenantInfo(getTenantInfo()); + record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); + record.setBillType(EnumBillAllType.ADVANCE.getCode()); + PageInfo page = wxEnergyService.feesListAsPage(record, pageNum, pageSize,true); + return new ResultData(page); + } + + @ApiOperation("费用区间列表") @PostMapping("saveFees") public ResultData saveFees(@RequestBody WxEnergyFees record) { @@ -181,20 +214,6 @@ public class WxFinanceController extends BaseController { return new ResultData(); } - @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 advanceTypeList(@ModelAttribute WxEnergyFees record, Integer pageNum, Integer pageSize) { - record.updateTenantInfo(getTenantInfo()); - record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); - record.setBillType(EnumBillAllType.ADVANCE.getCode()); - PageInfo page = wxEnergyService.feesListAsPage(record, pageNum, pageSize,true); - return new ResultData(page); - } - @ApiOperation("预收科目新增修改") @PostMapping("saveAdvanceFees") public ResultData saveAdvanceType(@RequestBody WxEnergyFees record) { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFees.java b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFees.java index 27953bad0..17d0c9dc2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFees.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFees.java @@ -175,9 +175,9 @@ public class WxEnergyFees extends TenantEntity { return null; } - @TableField(exist = false) - private Integer commonOperate;//通用可配置类型 @TableField(exist = false) private Integer notSetOff; + @TableField(exist = false) + private List billTypeList; } diff --git a/mallinkService/src/main/resources/mapper/WxEnergyFeesMapper.xml b/mallinkService/src/main/resources/mapper/WxEnergyFeesMapper.xml index f560a428e..52b0299c1 100644 --- a/mallinkService/src/main/resources/mapper/WxEnergyFeesMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxEnergyFeesMapper.xml @@ -39,7 +39,6 @@ and `public_calcute` = #{publicCalcute} and `type` = #{type} and `bill_type` = #{billType} - and `bill_type` != 3 and `bill_type` != 6 and `bill_type` != 6 and `is_system` = #{isSystem} and `fixed_price` = #{fixedPrice} @@ -47,6 +46,12 @@ and `time_unit` = #{timeUnit} and name like concat('%', #{name},'%') and `is_despoit` = #{isDespoit} + + and bill_type in + + #{billTypeItem} + + and id in