From 097da95c4dff5d7ce0836d7625a3e1e47d9b752f Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Tue, 1 Sep 2020 12:36:55 +0800 Subject: [PATCH] fix contract --- .../iformall/service/impl/WxPropertyContractServiceImpl.java | 5 ++--- .../com/iformall/service/impl/WxRentContractServiceImpl.java | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index edbdd9721..0cb1959fd 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -1110,8 +1110,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService return new ResultData(Result.ERROR, "编号["+record.getId()+"]租金合同没有绑定商户."); } - if ((EnumRentContractStatus.DRAFT.getCode().intValue() == rentContract.getStatus().intValue() - && EnumRentContractAppStatus.DEFAULT.getCode().intValue() == rentContract.getApplyStatus().intValue()) + if ((EnumRentContractStatus.DRAFT.getCode().intValue() == rentContract.getStatus().intValue()) || (EnumRentContractStatus.PERFORMANCE.getCode().intValue() == rentContract.getStatus().intValue() && (EnumRentContractAppStatus.REJECT.getCode().intValue() == rentContract.getApplyStatus().intValue() || EnumRentContractAppStatus.SETBACK.getCode().intValue() == rentContract.getApplyStatus().intValue())) @@ -1127,7 +1126,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService wxFlowService.start(rentContract.getFlowParams(), user.getId(), user.getName(), rentContract); return new ResultData(Result.SUCCESS,"提交审批成功",rentContract); }else { - return new ResultData(Result.ERROR, "编号["+record.getId()+"]物业合同状态不能提交审批.允许提交的状态为 [草稿+未提交审批],[履约中+审批驳回]"); + return new ResultData(Result.ERROR, "编号["+record.getId()+"]物业合同状态不能提交审批.允许提交的状态为 [草稿],[履约中+审批驳回]"); } } 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 d40014b89..36ee5025e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -2477,8 +2477,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { return new ResultData(Result.ERROR, "编号["+rentContract.getId()+"]租金合同没有绑定商户."); } - if ((EnumRentContractStatus.DRAFT.getCode().intValue() == rentContract.getStatus().intValue() - && EnumRentContractAppStatus.DEFAULT.getCode().intValue() == rentContract.getApplyStatus().intValue()) + if ((EnumRentContractStatus.DRAFT.getCode().intValue() == rentContract.getStatus().intValue()) || (EnumRentContractStatus.PERFORMANCE.getCode().intValue() == rentContract.getStatus().intValue() && (EnumRentContractAppStatus.REJECT.getCode().intValue() == rentContract.getApplyStatus().intValue() || EnumRentContractAppStatus.SETBACK.getCode().intValue() == rentContract.getApplyStatus().intValue())) @@ -2495,7 +2494,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { wxFlowService.start(rentContract.getFlowParams(), user.getId(), user.getName(), rentContract); return new ResultData(Result.SUCCESS,"提交审批成功",rentContract); }else { - return new ResultData(Result.ERROR, "编号["+rentContract.getId()+"]租金合同状态不能提交审批.允许提交的状态为 [草稿+未提交审批],[履约中+审批驳回]"); + return new ResultData(Result.ERROR, "编号["+rentContract.getId()+"]租金合同状态不能提交审批.允许提交的状态为 [草稿],[履约中+审批驳回]"); } }