From eafd1dcacd5d9d0b6b2017b4709ee28423fe89b7 Mon Sep 17 00:00:00 2001 From: luozukai Date: Sat, 26 Jan 2019 17:21:03 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=A1=E6=89=B9=E6=B5=81][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][=E7=89=A9=E4=B8=9A=E5=90=88=E5=90=8C=E5=8F=91?= =?UTF-8?q?=E8=B5=B7=E5=AE=A1=E6=89=B9=E5=90=88=E5=B9=B6]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxRentContractServiceImpl.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) 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 aff1ba349..5ddfbb31d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -192,10 +192,12 @@ public class WxRentContractServiceImpl implements WxRentContractService { } try { - // 如果是补录,启动审批流 - if(record.getMerchantId() != null && record.getFlowParams() != null){ + // 启动审批流 + if(record.getFlowParams() != null){ record.getFlowParams().put("businessId",record.getId().toString()); - record.getFlowParams().put("supplement",true); + if(record.getMerchantId() != null) { + record.getFlowParams().put("supplement", true); //设置补录 + } wxFlowService.start(record.getFlowParams(),userId,userName,record.getTenantId()); // 合同状态改成待签约 @@ -648,7 +650,6 @@ public class WxRentContractServiceImpl implements WxRentContractService { logger.error("deleteProcessInstance error",e); } } - } //把状态为意见而商户未关联的数据改为待签约状态 @@ -807,9 +808,12 @@ public class WxRentContractServiceImpl implements WxRentContractService { public ResultData updateFile(WxRentContract record, Long userId,String userName) { ResultData resultData = getResultDataForUpdate(record, userId); try { + // 启动审批流 if(record.getFlowParams() != null){ record.getFlowParams().put("businessId",record.getId().toString()); - record.getFlowParams().put("supplement",false); + if(record.getMerchantId() != null) { + record.getFlowParams().put("supplement", true); //设置补录 + } wxFlowService.start(record.getFlowParams(),userId,userName,record.getTenantId()); // 合同状态改成待签约