From 70c5ef3c7cde8ee030731646899166809e4170c1 Mon Sep 17 00:00:00 2001 From: winter <664946893@qq.com> Date: Sun, 15 Jun 2025 21:51:04 +0800 Subject: [PATCH] fix --- .../java/com/iformall/service/impl/WxFlowServiceImpl.java | 3 ++- .../com/iformall/service/impl/WxRentContractServiceImpl.java | 5 ----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index a1c074d77..a5fd9b505 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -172,7 +172,8 @@ public class WxFlowServiceImpl implements WxFlowService { Integer operateType = getIngeter(getVariableByKey(variables,"approvalType")); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - if(/*EnumFlowKey.CONTRACT.getCode().equals(flowType) || */EnumFlowKey.NEW_RENT_CONTRACT.getCode().equals(flowType)){ + if(/*EnumFlowKey.CONTRACT.getCode().equals(flowType) || */EnumFlowKey.NEW_RENT_CONTRACT.getCode().equals(flowType) || + EnumFlowKey.NEW_EDIT_VALID_CONTRACT.getCode().equals(flowType)){ // 1租赁合同 2点位合同 3物业 4点位物业合同 5 合并合同-店铺 6 合并合同-多经点位 WxRentContract rent = new WxRentContract(); //租金+合同的bussinessId 特殊 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 464b28bdc..466b3b607 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -658,11 +658,6 @@ public class WxRentContractServiceImpl implements WxRentContractService { if (null != clist && clist.size() > 0 ) { return new ResultData(Result.ERROR, "房间资源存在其他审批中的租金合同。请先作完成。"); } -// Integer count = wxRentContractMapper.getCanApplyCount(rentContract.getId()); -// if (null != count && count.intValue()>0) { -// return new ResultData(Result.ERROR, "当前存在其他草稿状态或者履约驳回的合同。请先作废其他草稿或者审批拒绝或者撤回的合同。"); -// } - if (CollectionUtils.isEmpty(rentContract.getFlowParams())) { return new ResultData(Result.ERROR, "编号["+rentContract.getId()+"]租金合同没有审批流程."); }