|
|
|
@@ -397,12 +397,12 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
|
// 给审批人发送代办通知短信 |
|
|
|
List<MallUserInfo> mallUserInfoList = getUserByProcessInstanceId(processInstance.getId()); |
|
|
|
for (MallUserInfo mallUserInfo:mallUserInfoList) { |
|
|
|
sendAssigneeMsgAndEmail(tenantId,mallUserInfo.getPhone(),mallUserInfo.getEmail(),starterInfo.getName(),businessId); |
|
|
|
sendAssigneeMsgAndEmail(tenantId,mallUserInfo.getPhone(),mallUserInfo.getEmail(),starterInfo.getName(),businessId,flowType); |
|
|
|
} |
|
|
|
return new ResultData(); |
|
|
|
} |
|
|
|
|
|
|
|
public void sendAssigneeMsgAndEmail(String tenantId,String phone,String email,String userName,Long businessId){ |
|
|
|
public void sendAssigneeMsgAndEmail(String tenantId,String phone,String email,String userName,Long businessId,Integer flowType){ |
|
|
|
Map<String,String> dynamicContentMap = new HashMap<>(); |
|
|
|
dynamicContentMap.put("userName",userName); |
|
|
|
dynamicContentMap.put("page", Constant.adminPage); |
|
|
|
@@ -476,6 +476,12 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
|
mailMsg.setModelId(EnumMailMsgModel.MAIL_ASSIGNEE_NODIFY.getCode()); |
|
|
|
mailMsg.setTo(new String[]{email}); |
|
|
|
mailMsg.setTenantId(tenantId); |
|
|
|
if(1 == flowType.intValue() || 3 == flowType.intValue()){ |
|
|
|
msgReplaceMap.put("bustype","合同"); |
|
|
|
}else if(2 == flowType.intValue()){ |
|
|
|
msgReplaceMap.put("bustype","账单"); |
|
|
|
msgReplaceMap.put("contract", businessId.toString()); |
|
|
|
} |
|
|
|
mailMsg.setDynamicContentMap(msgReplaceMap); |
|
|
|
mqBaseProducer.sendMessage(mailMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); |
|
|
|
} |
|
|
|
@@ -710,7 +716,7 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
|
String assignee = ""; |
|
|
|
List<MallUserInfo> mallUserInfoList = getUserByProcessInstanceId(processInstanceId); |
|
|
|
for (MallUserInfo mallUserInfo:mallUserInfoList) { |
|
|
|
sendAssigneeMsgAndEmail(tenantId,mallUserInfo.getPhone(),mallUserInfo.getEmail(),userName,businessId); |
|
|
|
sendAssigneeMsgAndEmail(tenantId,mallUserInfo.getPhone(),mallUserInfo.getEmail(),userName,businessId,flowType); |
|
|
|
} |
|
|
|
|
|
|
|
// 给发起人发送短信 |
|
|
|
@@ -889,6 +895,12 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
|
mailMsg.setModelId(EnumMailMsgModel.MAIL_REJECT_NODIFY.getCode()); |
|
|
|
mailMsg.setTo(new String[]{email}); |
|
|
|
mailMsg.setTenantId(tenantId); |
|
|
|
if(1 == flowType.intValue() || 3 == flowType.intValue()){ |
|
|
|
msgReplaceMap.put("bustype","合同"); |
|
|
|
}else if(2 == flowType.intValue()){ |
|
|
|
msgReplaceMap.put("bustype","账单"); |
|
|
|
msgReplaceMap.put("contract", businessId.toString()); |
|
|
|
} |
|
|
|
mailMsg.setDynamicContentMap(msgReplaceMap); |
|
|
|
mqBaseProducer.sendMessage(mailMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); |
|
|
|
} |
|
|
|
|