Browse Source

fix contract

release_toaliyun_real
xiaohanzi 5 years ago
parent
commit
a8ff11f187
1 changed files with 1 additions and 2 deletions
  1. +1
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java

+ 1
- 2
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java View File

@@ -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,"未创建物业合同,请先完善。");
}


Loading…
Cancel
Save