|
|
|
@@ -2466,19 +2466,21 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
//如果存在审批中的合同,不允许提交审批 |
|
|
|
WxRentContract wrq = new WxRentContract(); |
|
|
|
wrq.updateTenantInfo(user); |
|
|
|
wrq.setMerchantId(rentContract.getMerchantId()); |
|
|
|
wrq.setStatus(EnumRentContractStatus.PERFORMANCE.getCode()); |
|
|
|
List<WxRentContract> clist = wxRentContractMapper.findList(wrq); |
|
|
|
if (null != clist && clist.size() > 0 ) { |
|
|
|
return new ResultData(Result.ERROR, "当前存在其他审批中的租金合同。请先作完成。"); |
|
|
|
return new ResultData(Result.ERROR, "当前商户存在其他审批中的租金合同。请先作完成。"); |
|
|
|
} |
|
|
|
//如果该合同是租金+物业合同,则还要判断物业合同 |
|
|
|
if(rentContract.getOperationType().intValue() == EnumContractOperationType.WHOLE.getCode().intValue()) { |
|
|
|
WxPropertyContract wpc = new WxPropertyContract(); |
|
|
|
wpc.updateTenantInfo(user); |
|
|
|
wpc.setMerchantId(rentContract.getMerchantId()); |
|
|
|
wpc.setStatus(EnumRentContractStatus.PERFORMANCE.getCode()); |
|
|
|
List<WxPropertyContract> plist = wxPropertyContractMapper.findList(wpc); |
|
|
|
if (null != plist && plist.size() > 0 ) { |
|
|
|
return new ResultData(Result.ERROR, "当前存在其他审批中的物业合同。请先作完成。"); |
|
|
|
return new ResultData(Result.ERROR, "当前商户存在其他审批中的物业合同。请先作完成。"); |
|
|
|
} |
|
|
|
} |
|
|
|
// Integer count = wxRentContractMapper.getCanApplyCount(rentContract.getId()); |
|
|
|
|