|
|
|
@@ -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<WxFinanceFees> 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(); |
|
|
|
} |
|
|
|
|