|
|
|
@@ -13,6 +13,7 @@ import com.iformall.enums.EnumMsgModelType; |
|
|
|
import com.iformall.enums.EnumRentContractAppStatus; |
|
|
|
import com.iformall.exception.MallinkException; |
|
|
|
import com.iformall.service.*; |
|
|
|
import com.iformall.utils.Constant; |
|
|
|
import org.apache.commons.collections.CollectionUtils; |
|
|
|
import org.apache.commons.collections.map.HashedMap; |
|
|
|
import org.flowable.bpmn.model.BpmnModel; |
|
|
|
@@ -55,8 +56,6 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
|
private MallUserInfoService mallUserInfoService; |
|
|
|
@Autowired |
|
|
|
private WxMsgValidationcodeService wxMsgValidationcodeService; |
|
|
|
@Value("${admin-page}") |
|
|
|
private String adminPage; |
|
|
|
|
|
|
|
/** |
|
|
|
* 获取流程key,1合同 2账单 |
|
|
|
@@ -116,7 +115,7 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
|
for (MallUserInfo mallUserInfo:mallUserInfoList) { |
|
|
|
Map<String,String> content = new HashedMap(); |
|
|
|
content.put("userName",mallUserInfo.getName()); |
|
|
|
content.put("page",adminPage); |
|
|
|
content.put("page", Constant.adminPage); |
|
|
|
content.put("modelName","代办通知"); |
|
|
|
|
|
|
|
WxMsgValidationcode wxMsgValidationcode = new WxMsgValidationcode(); |
|
|
|
@@ -214,7 +213,7 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
|
List<MallUserInfo> mallUserInfoList = getUserByProcessInstanceId(processInstanceId); |
|
|
|
for (MallUserInfo mallUserInfo:mallUserInfoList) { |
|
|
|
msgReplaceMap.put("userName",mallUserInfo.getName()); |
|
|
|
msgReplaceMap.put("page",adminPage); |
|
|
|
msgReplaceMap.put("page",Constant.adminPage); |
|
|
|
msgReplaceMap.put("modelName","代办通知"); |
|
|
|
|
|
|
|
assignee += mallUserInfo.getName()+" "; |
|
|
|
@@ -225,7 +224,7 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
|
// 给发起人发送短信 |
|
|
|
msgReplaceMap = new HashedMap(); |
|
|
|
msgReplaceMap.put("userName",userName); |
|
|
|
msgReplaceMap.put("page",adminPage); |
|
|
|
msgReplaceMap.put("page",Constant.adminPage); |
|
|
|
msgReplaceMap.put("modelName","审批通知"); |
|
|
|
msgReplaceMap.put("contract",businessId+""); |
|
|
|
msgReplaceMap.put("toUserName",assignee.trim()); |
|
|
|
@@ -238,7 +237,7 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
|
msgReplaceMap = new HashedMap(); |
|
|
|
msgReplaceMap.put("modelName","通过审批通知"); |
|
|
|
msgReplaceMap.put("contract",businessId+""); |
|
|
|
msgReplaceMap.put("page",adminPage); |
|
|
|
msgReplaceMap.put("page",Constant.adminPage); |
|
|
|
|
|
|
|
wxMsgValidationcode = new WxMsgValidationcode(); |
|
|
|
wxMsgValidationcode.setPhone(starter.getPhone()); |
|
|
|
@@ -286,7 +285,7 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
|
wxMsgValidationcode.setType(EnumMsgModelType.FLOW.getCode()); |
|
|
|
msgReplaceMap.put("modelName","驳回通知"); |
|
|
|
msgReplaceMap.put("contract",businessId+""); |
|
|
|
msgReplaceMap.put("page",adminPage); |
|
|
|
msgReplaceMap.put("page",Constant.adminPage); |
|
|
|
|
|
|
|
wxMsgValidationcode = new WxMsgValidationcode(); |
|
|
|
wxMsgValidationcode.setPhone(starter.getPhone()); |
|
|
|
@@ -402,11 +401,4 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
public String getAdminPage() { |
|
|
|
return adminPage; |
|
|
|
} |
|
|
|
|
|
|
|
public void setAdminPage(String adminPage) { |
|
|
|
this.adminPage = adminPage; |
|
|
|
} |
|
|
|
} |