Просмотр исходного кода

[用户][修改][修改管理员修改逻辑]

release_toaliyun_real
luozukai 7 лет назад
Родитель
Сommit
8eebbb98b2
1 измененных файлов: 8 добавлений и 6 удалений
  1. +8
    -6
      mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java

+ 8
- 6
mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java Просмотреть файл

@@ -314,7 +314,7 @@ public class WxFlowServiceImpl implements WxFlowService {
taskListHtml += "<div style=\"overflow: hidden;\">"; taskListHtml += "<div style=\"overflow: hidden;\">";
taskListHtml += "<div style=\"overflow: hidden;\">"; taskListHtml += "<div style=\"overflow: hidden;\">";
taskListHtml += "<div style=\"float: left; width: 40px;height: 30px;\"><img src=\"https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/emailhui.png\" style=\"display: block; width: 20px;height: 20px;margin-top: 10px;\"></div>"; taskListHtml += "<div style=\"float: left; width: 40px;height: 30px;\"><img src=\"https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/emailhui.png\" style=\"display: block; width: 20px;height: 20px;margin-top: 10px;\"></div>";
taskListHtml += "<div style=\"float: left; width: auto;margin-right:10px;height: 30px;line-height: 18px;font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-top: 11px;\">同意并呈送</div>";
taskListHtml += "<div style=\"float: left; width: auto;margin-right:10px;height: 30px;line-height: 18px;font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-top: 11px;\">审批通过</div>";
taskListHtml += "<div style=\"float: left; width: auto;margin-right:10px;height: 30px;margin-top:15px;line-height: 14px;font-size:14px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);\">"+record.getUserName()+"</div>"; taskListHtml += "<div style=\"float: left; width: auto;margin-right:10px;height: 30px;margin-top:15px;line-height: 14px;font-size:14px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);\">"+record.getUserName()+"</div>";
taskListHtml += "</div>"; taskListHtml += "</div>";
if(i == 0){ if(i == 0){
@@ -549,6 +549,7 @@ public class WxFlowServiceImpl implements WxFlowService {
List<Map<String,String>> taskAssigneeList = (List)mapInfo.get("taskAssignee"); List<Map<String,String>> taskAssigneeList = (List)mapInfo.get("taskAssignee");
Long businessId = Long.parseLong(mapInfo.get("businessId").toString()); Long businessId = Long.parseLong(mapInfo.get("businessId").toString());
String email = (String)userMap.get("email"); String email = (String)userMap.get("email");
List<Map<String,Object>> variables = (List)mapInfo.get("variables");


// 判断下个节点是否有设置审批人,没有,直接通过,有,发短信通知 // 判断下个节点是否有设置审批人,没有,直接通过,有,发短信通知
if(!isEnded(processInstanceId)){ if(!isEnded(processInstanceId)){
@@ -564,7 +565,7 @@ public class WxFlowServiceImpl implements WxFlowService {
msgReplaceMap = new HashedMap(); msgReplaceMap = new HashedMap();
msgReplaceMap.put("userName",userName); msgReplaceMap.put("userName",userName);
msgReplaceMap.put("page",Constant.adminPage); msgReplaceMap.put("page",Constant.adminPage);
msgReplaceMap.put("contract",businessId+"");
msgReplaceMap.put("contract", (String)getVariableByKey(variables,"contractNumber"));
msgReplaceMap.put("toUserName",assignee.trim()); msgReplaceMap.put("toUserName",assignee.trim());


WxMsgRecord wxMsgRecord = new WxMsgRecord(); WxMsgRecord wxMsgRecord = new WxMsgRecord();
@@ -578,7 +579,7 @@ public class WxFlowServiceImpl implements WxFlowService {
//发邮件 //发邮件
if(StringUtils.isNotBlank(email)){ if(StringUtils.isNotBlank(email)){
msgReplaceMap = new HashedMap(); msgReplaceMap = new HashedMap();
msgReplaceMap.put("contract", businessId + "");
msgReplaceMap.put("contract", (String)getVariableByKey(variables,"contractNumber"));
msgReplaceMap.put("page", Constant.adminPage); msgReplaceMap.put("page", Constant.adminPage);
MailMsg mailMsg = new MailMsg(); MailMsg mailMsg = new MailMsg();
mailMsg.setSubject("审批通知"); mailMsg.setSubject("审批通知");
@@ -600,7 +601,7 @@ public class WxFlowServiceImpl implements WxFlowService {


// 给发起人发送审批通过消息 // 给发起人发送审批通过消息
msgReplaceMap = new HashedMap(); msgReplaceMap = new HashedMap();
msgReplaceMap.put("contract",businessId+"");
msgReplaceMap.put("contract",(String)getVariableByKey(variables,"contractNumber"));
msgReplaceMap.put("page",Constant.adminPage); msgReplaceMap.put("page",Constant.adminPage);


WxMsgRecord wxMsgRecord = new WxMsgRecord(); WxMsgRecord wxMsgRecord = new WxMsgRecord();
@@ -662,6 +663,7 @@ public class WxFlowServiceImpl implements WxFlowService {
Integer flowType = (Integer)mapInfo.get("flowType"); Integer flowType = (Integer)mapInfo.get("flowType");
Map<String,Object> userMap = (Map<String,Object>)mapInfo.get("starter"); Map<String,Object> userMap = (Map<String,Object>)mapInfo.get("starter");
String email = (String) userMap.get("email"); String email = (String) userMap.get("email");
List<Map<String,Object>> variables = (List)mapInfo.get("variables");


String taskName; String taskName;
String taskKey; String taskKey;
@@ -697,7 +699,7 @@ public class WxFlowServiceImpl implements WxFlowService {
Map<String,String> msgReplaceMap = new HashedMap(); Map<String,String> msgReplaceMap = new HashedMap();
WxMsgValidationcode wxMsgValidationcode = new WxMsgValidationcode(); WxMsgValidationcode wxMsgValidationcode = new WxMsgValidationcode();
wxMsgValidationcode.setTenantId(tenantId); wxMsgValidationcode.setTenantId(tenantId);
msgReplaceMap.put("contract",businessId+"");
msgReplaceMap.put("contract",(String)getVariableByKey(variables,"contractNumber"));
msgReplaceMap.put("page",Constant.adminPage); msgReplaceMap.put("page",Constant.adminPage);
WxMsgRecord wxMsgRecord = new WxMsgRecord(); WxMsgRecord wxMsgRecord = new WxMsgRecord();
wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode());
@@ -710,7 +712,7 @@ public class WxFlowServiceImpl implements WxFlowService {
//发送邮件 //发送邮件
if(StringUtils.isNotBlank(email)) { if(StringUtils.isNotBlank(email)) {
msgReplaceMap = new HashedMap(); msgReplaceMap = new HashedMap();
msgReplaceMap.put("contract", businessId + "");
msgReplaceMap.put("contract",(String)getVariableByKey(variables,"contractNumber"));
msgReplaceMap.put("page", Constant.adminPage); msgReplaceMap.put("page", Constant.adminPage);
msgReplaceMap.put("name",userName); msgReplaceMap.put("name",userName);
msgReplaceMap.put("remark",remark==null?"":remark); msgReplaceMap.put("remark",remark==null?"":remark);


Загрузка…
Отмена
Сохранить