diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java index 2c288eadc..473cdf465 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -295,7 +295,7 @@ public class WxPropertyContractController extends WxContractBaseController { } if (rentHasValidProperty(contract)) { - return new ResultData(Result.ERROR, "租金合同["+contract.getContractNumber()+"]存在有效的物业合同。"); + return new ResultData(Result.ERROR, "租金合同["+contract.getContractNumber()+"]存在有效或者审批中的物业合同。"); } wxPropertyContractService.updatePropertyContractStatus(proertyContract.getId()); return new ResultData(Result.SUCCESS,"合同生效成功!"); @@ -304,7 +304,9 @@ public class WxPropertyContractController extends WxContractBaseController { private boolean rentHasValidProperty(WxPropertyContract contract) { WxPropertyContract wpc = new WxPropertyContract(); wpc.setRentContractId(contract.getRentContractId()); - wpc.setStatuss(EnumRentContractStatus.getValidStatus()); + List statuss = EnumRentContractStatus.getValidStatus(); + statuss.add(EnumRentContractStatus.PERFORMANCE.getCode()); + wpc.setStatuss(statuss); List list = wxPropertyContractService.findList(wpc); if (null != list && list.size() > 0 ) { return true; @@ -327,7 +329,7 @@ public class WxPropertyContractController extends WxContractBaseController { } if (rentHasValidProperty(contract)) { - return new ResultData(Result.ERROR, "租金合同["+contract.getContractNumber()+"]存在有效的物业合同。"); + return new ResultData(Result.ERROR, "租金合同["+contract.getContractNumber()+"]存在有效或者审批中的物业合同。"); } if(contract.getOperationType().intValue() == EnumContractOperationType.PART.getCode().intValue()) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index bbaf586a8..617d6d971 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -411,7 +411,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { record.setEndDate(record.getStartDate()); } - if (record.getType().equals(EnumRentContractType.RENT_BY_JOINT.getCode())) { + if (null != record.getType() && record.getType().equals(EnumRentContractType.RENT_BY_JOINT.getCode())) { if(record.getRevenue() == null || record.getRevenue().longValue() <= 0){ record.setPrice(0l); }else{