From e6a5ece943fe5403587a79c35dd4277671b89cf8 Mon Sep 17 00:00:00 2001 From: luozukai Date: Sat, 26 Jan 2019 17:05:12 +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 --- .../controller/WxRentContractController.java | 3 +-- .../service/WxRentContractService.java | 2 +- .../impl/WxRentContractServiceImpl.java | 20 +++++++++++++++++-- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java index e4b2f3e0f..09293a725 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java @@ -65,10 +65,9 @@ public class WxRentContractController extends BaseController { public ResultData updateFile(@RequestBody WxRentContract wxRentContract) { logger.debug("[" + getIpAddr() + "] WxRentContractController::updateFile"); wxRentContract.setTenantId(getTenantId()); - return wxRentContractService.updateFile(wxRentContract, getUser().getId()); + return wxRentContractService.updateFile(wxRentContract, getUser().getId(),getUser().getName()); } - @GetMapping("/del") @ApiImplicitParam(name = "id", value = "id", dataType = "String", paramType = "query", required = true) public ResultData delete(String id) { diff --git a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java index 1de4b358b..c62dd7e7f 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java @@ -62,7 +62,7 @@ public interface WxRentContractService { void exportContract(HttpServletRequest request, HttpServletResponse response, String tenantId, Long id); - ResultData updateFile(WxRentContract wxRentContract, Long userId); + ResultData updateFile(WxRentContract wxRentContract, Long userId,String userName); ResultData updateRentContractStatus(Long id); 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 469ee9348..926671038 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -803,8 +803,24 @@ public class WxRentContractServiceImpl implements WxRentContractService { } @Override - public ResultData updateFile(WxRentContract record, Long userId) { - return getResultDataForUpdate(record, userId); + @Transactional(rollbackFor = {Exception.class}) + public ResultData updateFile(WxRentContract record, Long userId,String userName) { + ResultData resultData = getResultDataForUpdate(record, userId); + try { + record.getFlowParams().put("businessId",record.getId().toString()); + record.getFlowParams().put("supplement",true); + wxFlowService.start(record.getFlowParams(),userId,userName,record.getTenantId()); + + // 合同状态改成待签约 + WxRentContract updateRentContract = new WxRentContract(); + updateRentContract.setId(record.getId()); + updateRentContract.setStatus(EnumRentContractStatus.WAIT_SIGN.getCode()); + wxRentContractMapper.updateStatus(updateRentContract); + } catch (Exception e) { + logger.error("启动审批流失败,e:" + e.getMessage()); + throw new MallinkException(ErrorCode.FLOW_FAIL.getCode(), "FLOW FAILD " + e.getMessage()); + } + return resultData; } @Override