diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index e867df5c9..5659bebc8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -311,6 +311,24 @@ public class WxRentContractController extends WxContractBaseController { return new ResultData(shops); } + @GetMapping("getRentContractList") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + @SystemControllerLog(description = "租赁合同-列表") + public ResultData getRentContractList(@ModelAttribute WxRentContract wxRentContract, Integer validStatus, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxRentContractController::getRentContractList"); + if (null == wxRentContract) wxRentContract = new WxRentContract(); + wxRentContract.updateTenantInfo(getTenantInfo()); + if (1 == validStatus) { + List statuss = new ArrayList(); + statuss.add(EnumRentContractStatus.PAING.getCode()); + statuss.add(EnumRentContractStatus.OUT_DATE.getCode()); + wxRentContract.setStatuss(statuss); + } + return new ResultData(wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize)); + } + @GetMapping("getMerchantList") @SystemControllerLog(description = "获取商户列表") @ApiImplicitParams({ @@ -427,22 +445,6 @@ public class WxRentContractController extends WxContractBaseController { return wxRentContractService.updateMerchant(wxRentContract); } - @GetMapping("getRentContractList") - @ApiImplicitParams({ - @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), - @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) - @SystemControllerLog(description = "租赁合同-列表") - public ResultData getRentContractList(@ModelAttribute WxRentContract wxRentContract, Integer validStatus, Integer pageNum, Integer pageSize) { - logger.debug("[" + getIpAddr() + "] WxRentContractController::getRentContractList"); - wxRentContract.updateTenantInfo(getTenantInfo()); - if (1 == validStatus) { - List statuss = new ArrayList(); - statuss.add(EnumRentContractStatus.PAING.getCode()); - statuss.add(EnumRentContractStatus.OUT_DATE.getCode()); - wxRentContract.setStatuss(statuss); - } - return new ResultData(wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize)); - } @GetMapping("exportContract") @ApiImplicitParams({