|
|
|
@@ -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<Integer> billTypeList = new ArrayList<Integer>(); |
|
|
|
billTypeList.add(EnumBillAllType.RENT_DEPOSIT.getCode()); |
|
|
|
billTypeList.add(EnumBillAllType.PROPERTY.getCode()); |
|
|
|
record.setBillTypeList(billTypeList); |
|
|
|
PageInfo<WxEnergyFees> 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<Integer> billTypeList = new ArrayList<Integer>(); |
|
|
|
billTypeList.add(EnumBillAllType.OTHER.getCode()); |
|
|
|
billTypeList.add(EnumBillAllType.OTHER_DEPOSIT.getCode()); |
|
|
|
record.setBillTypeList(billTypeList); |
|
|
|
PageInfo<WxEnergyFees> 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<WxEnergyFees> 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<WxEnergyFees> page = wxEnergyService.feesListAsPage(record, pageNum, pageSize,true); |
|
|
|
return new ResultData(page); |
|
|
|
} |
|
|
|
|
|
|
|
@ApiOperation("预收科目新增修改") |
|
|
|
@PostMapping("saveAdvanceFees") |
|
|
|
public ResultData saveAdvanceType(@RequestBody WxEnergyFees record) { |
|
|
|
|