|
|
|
@@ -481,7 +481,6 @@ public class WxRentContractController extends WxContractBaseController { |
|
|
|
@ApiImplicitParams({}) |
|
|
|
@SystemControllerLog(description = "租金合同-合同生效") |
|
|
|
public ResultData effective(@RequestBody WxRentContract wxRentContract) { |
|
|
|
logger.debug("[" + getIpAddr() + "] WxRentContractController::getRentContractList"); |
|
|
|
WxRentContract contract = wxRentContractService.getSimpleDeatil(wxRentContract.getId()); |
|
|
|
if (null == contract) { |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"租赁合同不存在"); |
|
|
|
@@ -651,10 +650,11 @@ public class WxRentContractController extends WxContractBaseController { |
|
|
|
statuss.add(EnumRentContractStatus.OUT_DATE.getCode()); |
|
|
|
wxRentContract.setStatuss(statuss); |
|
|
|
} |
|
|
|
if (null == wxRentContract.getIsPrivateMerchant()) { |
|
|
|
wxRentContract.setIsPrivateMerchant(EnumYesOrNo.NO.getCode()); |
|
|
|
} |
|
|
|
} |
|
|
|
if (null == wxRentContract.getIsPrivateMerchant()) { |
|
|
|
wxRentContract.setIsPrivateMerchant(EnumYesOrNo.NO.getCode()); |
|
|
|
} |
|
|
|
|
|
|
|
wxRentContract.setSortColumns(SortField.Createtime_DESC); |
|
|
|
return new ResultData(wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize)); |
|
|
|
} |
|
|
|
|