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 c739c116e..3c21b0625 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -314,7 +314,7 @@ public class WxFlowServiceImpl implements WxFlowService { taskListHtml += "
"; taskListHtml += "
"; taskListHtml += "
"; - taskListHtml += "
同意并呈送
"; + taskListHtml += "
审批通过
"; taskListHtml += "
"+record.getUserName()+"
"; taskListHtml += "
"; if(i == 0){ @@ -549,6 +549,7 @@ public class WxFlowServiceImpl implements WxFlowService { List> taskAssigneeList = (List)mapInfo.get("taskAssignee"); Long businessId = Long.parseLong(mapInfo.get("businessId").toString()); String email = (String)userMap.get("email"); + List> variables = (List)mapInfo.get("variables"); // 判断下个节点是否有设置审批人,没有,直接通过,有,发短信通知 if(!isEnded(processInstanceId)){ @@ -564,7 +565,7 @@ public class WxFlowServiceImpl implements WxFlowService { msgReplaceMap = new HashedMap(); msgReplaceMap.put("userName",userName); msgReplaceMap.put("page",Constant.adminPage); - msgReplaceMap.put("contract",businessId+""); + msgReplaceMap.put("contract", (String)getVariableByKey(variables,"contractNumber")); msgReplaceMap.put("toUserName",assignee.trim()); WxMsgRecord wxMsgRecord = new WxMsgRecord(); @@ -578,7 +579,7 @@ public class WxFlowServiceImpl implements WxFlowService { //发邮件 if(StringUtils.isNotBlank(email)){ msgReplaceMap = new HashedMap(); - msgReplaceMap.put("contract", businessId + ""); + msgReplaceMap.put("contract", (String)getVariableByKey(variables,"contractNumber")); msgReplaceMap.put("page", Constant.adminPage); MailMsg mailMsg = new MailMsg(); mailMsg.setSubject("审批通知"); @@ -600,7 +601,7 @@ public class WxFlowServiceImpl implements WxFlowService { // 给发起人发送审批通过消息 msgReplaceMap = new HashedMap(); - msgReplaceMap.put("contract",businessId+""); + msgReplaceMap.put("contract",(String)getVariableByKey(variables,"contractNumber")); msgReplaceMap.put("page",Constant.adminPage); WxMsgRecord wxMsgRecord = new WxMsgRecord(); @@ -662,6 +663,7 @@ public class WxFlowServiceImpl implements WxFlowService { Integer flowType = (Integer)mapInfo.get("flowType"); Map userMap = (Map)mapInfo.get("starter"); String email = (String) userMap.get("email"); + List> variables = (List)mapInfo.get("variables"); String taskName; String taskKey; @@ -697,7 +699,7 @@ public class WxFlowServiceImpl implements WxFlowService { Map msgReplaceMap = new HashedMap(); WxMsgValidationcode wxMsgValidationcode = new WxMsgValidationcode(); wxMsgValidationcode.setTenantId(tenantId); - msgReplaceMap.put("contract",businessId+""); + msgReplaceMap.put("contract",(String)getVariableByKey(variables,"contractNumber")); msgReplaceMap.put("page",Constant.adminPage); WxMsgRecord wxMsgRecord = new WxMsgRecord(); wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); @@ -710,7 +712,7 @@ public class WxFlowServiceImpl implements WxFlowService { //发送邮件 if(StringUtils.isNotBlank(email)) { msgReplaceMap = new HashedMap(); - msgReplaceMap.put("contract", businessId + ""); + msgReplaceMap.put("contract",(String)getVariableByKey(variables,"contractNumber")); msgReplaceMap.put("page", Constant.adminPage); msgReplaceMap.put("name",userName); msgReplaceMap.put("remark",remark==null?"":remark);