|
|
|
@@ -335,14 +335,16 @@ public class WxRentContractController extends WxContractBaseController { |
|
|
|
*/ |
|
|
|
@GetMapping("getXuQianRentContract") |
|
|
|
@ApiImplicitParams({}) |
|
|
|
public ResultData getRentContractList(@ModelAttribute WxRentContract wxRentContract) { |
|
|
|
logger.debug("[" + getIpAddr() + "] WxRentContractController::getRentContractList"); |
|
|
|
public ResultData getXuQianRentContract(@ModelAttribute WxRentContract wxRentContract) { |
|
|
|
wxRentContract.updateTenantInfo(getTenantInfo()); |
|
|
|
List<Integer> statss = new ArrayList<Integer>(); |
|
|
|
statss.add(EnumRentContractStatus.PAING.getCode()); |
|
|
|
statss.add(EnumRentContractStatus.OUT_DATE.getCode()); |
|
|
|
wxRentContract.setStatuss(statss); |
|
|
|
wxRentContract.setSortColumn(BaseEntity.SortField.Createtime_DESC.getValue()); |
|
|
|
if (null == wxRentContract.getIsPrivateMerchant()) { |
|
|
|
wxRentContract.setIsPrivateMerchant(EnumYesOrNo.NO.getCode()); |
|
|
|
} |
|
|
|
PageInfo<WxRentContract> page = wxRentContractService.getRentContractList(wxRentContract, 1, 100000); |
|
|
|
if (null != page && null != page.getList()) { |
|
|
|
List<Map<String, Object>> retList = new ArrayList<Map<String, Object>>(); |
|
|
|
@@ -650,7 +652,9 @@ public class WxRentContractController extends WxContractBaseController { |
|
|
|
wxRentContract.setStatuss(statuss); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
if (null == wxRentContract.getIsPrivateMerchant()) { |
|
|
|
wxRentContract.setIsPrivateMerchant(EnumYesOrNo.NO.getCode()); |
|
|
|
} |
|
|
|
wxRentContract.setSortColumns(SortField.Createtime_DESC); |
|
|
|
return new ResultData(wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize)); |
|
|
|
} |
|
|
|
|