|
|
|
@@ -1,9 +1,10 @@ |
|
|
|
package com.iformall.controller.contract; |
|
|
|
|
|
|
|
import com.github.pagehelper.PageInfo; |
|
|
|
import com.iformall.annotation.SystemControllerLog; |
|
|
|
import com.iformall.common.ResultData; |
|
|
|
import com.iformall.controller.base.BaseController; |
|
|
|
import com.iformall.domain.po.WxRentContract; |
|
|
|
import com.iformall.domain.vo.WxRentPropertyContractVo; |
|
|
|
import com.iformall.service.WxRentContractService; |
|
|
|
import io.swagger.annotations.ApiImplicitParam; |
|
|
|
import io.swagger.annotations.ApiImplicitParams; |
|
|
|
@@ -15,8 +16,6 @@ import org.springframework.web.bind.annotation.ModelAttribute; |
|
|
|
import org.springframework.web.bind.annotation.RequestMapping; |
|
|
|
import org.springframework.web.bind.annotation.RestController; |
|
|
|
|
|
|
|
import java.util.Map; |
|
|
|
|
|
|
|
/** |
|
|
|
* @author gongbiao |
|
|
|
*/ |
|
|
|
@@ -33,14 +32,14 @@ public class WxRentPropertyContractController extends BaseController { |
|
|
|
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), |
|
|
|
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) |
|
|
|
@SystemControllerLog(description = "租赁物业合同-列表") |
|
|
|
public ResultData list(@ModelAttribute WxRentContract wxRentContract, Integer pageNum, Integer pageSize) { |
|
|
|
public ResultData list(@ModelAttribute WxRentPropertyContractVo wxRentPropertyContractVo, Integer pageNum, Integer pageSize) { |
|
|
|
logger.debug("[" + getIpAddr() + "] wxRentPropertyContract::list"); |
|
|
|
if (null == wxRentContract) { |
|
|
|
wxRentContract = new WxRentContract(); |
|
|
|
if (null == wxRentPropertyContractVo) { |
|
|
|
wxRentPropertyContractVo = new WxRentPropertyContractVo(); |
|
|
|
} |
|
|
|
wxRentContract.setTenantId(getTenantId()); |
|
|
|
Map<String, Object> result = wxRentContractService.listAsPage(wxRentContract, pageNum, pageSize); |
|
|
|
return new ResultData(result); |
|
|
|
wxRentPropertyContractVo.setTenantId(getTenantId()); |
|
|
|
final PageInfo<WxRentPropertyContractVo> page = wxRentContractService.listContractVo(wxRentPropertyContractVo, pageNum, pageSize); |
|
|
|
return new ResultData(page); |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|