|
|
|
@@ -409,7 +409,6 @@ public class WxRentContractController extends WxContractBaseController { |
|
|
|
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()); |
|
|
|
PageInfo<WxRentContract> page = wxRentContractService.getRentContractList(wxRentContract, 1, 100000); |
|
|
|
@@ -622,7 +621,7 @@ public class WxRentContractController extends WxContractBaseController { |
|
|
|
return new ResultData(Result.ERROR,e.getMessage()); |
|
|
|
} |
|
|
|
//如果是租金+物业合同,如果没有物业合同或者物业合同不是草稿状态,不能提交审核 |
|
|
|
if (rentContract.getRentShopType().intValue() == EnumRentShopType.SHOP.getCode().intValue()) { |
|
|
|
if (rentContract.getOperationType().intValue() == EnumContractOperationType.WHOLE.getCode().intValue()) { |
|
|
|
if (null == wxRentContract.getPropertyId()) { |
|
|
|
return new ResultData(Result.ERROR,"未创建物业合同,请先完善。"); |
|
|
|
} |
|
|
|
|