From 105473c6f0828fab08a251067a18fa8d57597e53 Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 18 Feb 2019 15:20:43 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=A1=E6=89=B9=E6=B5=81][=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0][=E6=B7=BB=E5=8A=A0=E5=90=88=E5=90=8C=E6=8F=90?= =?UTF-8?q?=E5=89=8D=E7=BB=88=E6=AD=A2=E5=AE=A1=E6=89=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/domain/po/WxFlowRecord.java | 1 + .../com/iformall/service/WxFlowService.java | 2 +- .../service/impl/WxFlowServiceImpl.java | 17 ++++++++++------- .../resources/mapper/WxFlowRecordMapper.xml | 5 ++++- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowRecord.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowRecord.java index 55a142066..63f5d7b10 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowRecord.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowRecord.java @@ -41,6 +41,7 @@ public class WxFlowRecord implements Serializable { } public WxFlowRecord(String processInstanceId,Integer currStatus){ this.processInstanceId = processInstanceId; + this.currStatus = currStatus; } public WxFlowRecord(Long businessId,String tenantId){ this.businessId = businessId; diff --git a/mallinkService/src/main/java/com/iformall/service/WxFlowService.java b/mallinkService/src/main/java/com/iformall/service/WxFlowService.java index a6e5fa7d0..3b00a56fb 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxFlowService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxFlowService.java @@ -16,7 +16,7 @@ public interface WxFlowService { * @param businessId * @param flowType */ - void updateBusinessStatus(Long businessId,Integer flowType,Integer contractType,Integer applyStatus,Boolean supplement,String instId); + void updateBusinessStatus(Long businessId,Integer flowType,Integer contractType,Integer applyStatus,Boolean supplement); ResultData getTaskStatusList(Long businessId,String tenantId); 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 0c3f05520..605a51bf7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -89,10 +89,9 @@ public class WxFlowServiceImpl implements WxFlowService { * @param contractType 1租赁合同 2点位合同wx_rent_contract 3物业wx_property_contract 4点位物业合同 * @param applyStatus 状态 * @param supplement 是否补录 - * @param instId 实例id */ @Override - public void updateBusinessStatus(Long businessId,Integer flowType,Integer contractType,Integer applyStatus,Boolean supplement,String instId){ + public void updateBusinessStatus(Long businessId,Integer flowType,Integer contractType,Integer applyStatus,Boolean supplement){ logger.info("businessId:{},supplement:{}",businessId.toString(),supplement); if(1 == flowType){ if(contractType.intValue() == 1 || contractType.intValue() == 2){ @@ -144,8 +143,6 @@ public class WxFlowServiceImpl implements WxFlowService { } } } - //修改记录表当前状态 - wxFlowRecordMapper.updateCurrStatus(new WxFlowRecord(instId,applyStatus)); } @Override @@ -182,7 +179,7 @@ public class WxFlowServiceImpl implements WxFlowService { if(StringUtils.isNotBlank(str)){ contractType = Integer.parseInt(str); } - updateBusinessStatus(businessId,flowType,contractType,EnumRentContractAppStatus.APPLYING.getCode(),supplement,processInstance.getId()); + updateBusinessStatus(businessId,flowType,contractType,EnumRentContractAppStatus.APPLYING.getCode(),supplement); // 保存wx_flow_record表审批记录 WxFlowRecord wxFlowRecord = new WxFlowRecord(); @@ -194,6 +191,7 @@ public class WxFlowServiceImpl implements WxFlowService { wxFlowRecord.setUserName(userName); wxFlowRecord.setStatus(EnumFlowRecordStatus.NEW.getCode()); wxFlowRecord.setTaskName("发起"); + wxFlowRecord.setCurrStatus(EnumFlowRecordStatus.NEW.getCode()); wxFlowRecordService.saveOrUpdate(wxFlowRecord); // 给审批人发送代办通知短信 @@ -382,6 +380,8 @@ public class WxFlowServiceImpl implements WxFlowService { wxFlowRecord.setTaskName(taskName); wxFlowRecord.setTaskKey(taskKey); wxFlowRecordService.saveOrUpdate(wxFlowRecord); + //修改记录表当前状态 + wxFlowRecordMapper.updateCurrStatus(new WxFlowRecord(processInstanceId,EnumFlowRecordStatus.APPLY.getCode())); return new ResultData(); } @@ -442,7 +442,7 @@ public class WxFlowServiceImpl implements WxFlowService { if(StringUtils.isNotBlank(str)){ contractType = Integer.parseInt(str); } - updateBusinessStatus(businessId,flowType,contractType,EnumRentContractAppStatus.FINISH.getCode(),supplement,processInstanceId); + updateBusinessStatus(businessId,flowType,contractType,EnumRentContractAppStatus.FINISH.getCode(),supplement); // 给发起人发送审批通过消息 msgReplaceMap = new HashedMap(); @@ -511,7 +511,7 @@ public class WxFlowServiceImpl implements WxFlowService { if(StringUtils.isNotBlank(str)){ contractType = Integer.parseInt(str); } - updateBusinessStatus(businessId,flowType,contractType,EnumRentContractAppStatus.REJECT.getCode(),supplement,processInstanceId); + updateBusinessStatus(businessId,flowType,contractType,EnumRentContractAppStatus.REJECT.getCode(),supplement); //保存wx_flow_record表审批记录 WxFlowRecord wxFlowRecord = new WxFlowRecord(); @@ -526,6 +526,8 @@ public class WxFlowServiceImpl implements WxFlowService { wxFlowRecord.setTaskKey(taskKey); wxFlowRecord.setTaskName(taskName); wxFlowRecordService.saveOrUpdate(wxFlowRecord); + //修改记录表当前状态 + wxFlowRecordMapper.updateCurrStatus(new WxFlowRecord(processInstanceId,EnumFlowRecordStatus.REJECT.getCode())); // 给发起人发送驳回消息 Map msgReplaceMap = new HashedMap(); @@ -605,6 +607,7 @@ public class WxFlowServiceImpl implements WxFlowService { PageHelper.startPage(pageNum, pageSize); WxFlowRecord flowRecord = new WxFlowRecord(); flowRecord.setUserId(userId); + flowRecord.setStatus(EnumFlowRecordStatus.NEW.getCode()); List recordList = wxFlowRecordMapper.findList(flowRecord); return new ResultData(recordList); } diff --git a/mallinkService/src/main/resources/mapper/WxFlowRecordMapper.xml b/mallinkService/src/main/resources/mapper/WxFlowRecordMapper.xml index 4dcf2763b..28243b548 100644 --- a/mallinkService/src/main/resources/mapper/WxFlowRecordMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxFlowRecordMapper.xml @@ -32,9 +32,12 @@ and `business_id` = #{businessId} - + and `user_id` = #{userId} + + and `status` = #{status} + and id in