From a8ff11f187b01901c8535344f27af591d169bee3 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Mon, 7 Sep 2020 15:22:55 +0800 Subject: [PATCH] fix contract --- .../iformall/controller/contract/WxRentContractController.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 06a58cf78..a8b66e0dc 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -409,7 +409,6 @@ public class WxRentContractController extends WxContractBaseController { wxRentContract.updateTenantInfo(getTenantInfo()); List statss = new ArrayList(); statss.add(EnumRentContractStatus.PAING.getCode()); - statss.add(EnumRentContractStatus.OUT_DATE.getCode()); wxRentContract.setStatuss(statss); wxRentContract.setSortColumn(BaseEntity.SortField.Createtime_DESC.getValue()); PageInfo 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,"未创建物业合同,请先完善。"); }