|
|
|
@@ -1,5 +1,6 @@ |
|
|
|
package com.iformall.service.impl; |
|
|
|
|
|
|
|
import com.alibaba.druid.support.json.JSONUtils; |
|
|
|
import com.github.pagehelper.PageHelper; |
|
|
|
import com.github.pagehelper.PageInfo; |
|
|
|
import com.iformall.common.ErrorCode; |
|
|
|
@@ -96,7 +97,7 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
|
Integer flowType = (Integer)mapInfo.get("flowType"); |
|
|
|
List<Map<String,Object>> variables = (List)mapInfo.get("variables"); |
|
|
|
Boolean supplement = (Boolean)mapInfo.get("supplement"); |
|
|
|
Integer contractType = 0; |
|
|
|
Integer contractType = 0;// 1租赁合同2点位合同3物业合同4点位物业合同 |
|
|
|
String str = (String)getVariableByKey(variables,"contractType"); |
|
|
|
if(StringUtils.isNotBlank(str)){ |
|
|
|
contractType = Integer.parseInt(str); |
|
|
|
@@ -214,6 +215,7 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
|
wxFlowRecord.setStatus(EnumFlowRecordStatus.NEW.getCode()); |
|
|
|
wxFlowRecord.setTaskName("发起"); |
|
|
|
wxFlowRecord.setCurrStatus(EnumRentContractAppStatus.APPLYING.getCode()); |
|
|
|
wxFlowRecord.setVariables(variablesToJson(variables)); |
|
|
|
wxFlowRecordService.saveOrUpdate(wxFlowRecord); |
|
|
|
|
|
|
|
// 给审批人发送代办通知短信 |
|
|
|
@@ -229,10 +231,17 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
|
wxMsgValidationcode.setType(EnumMsgModel.FLOW_ASSIGNEE_NODIFY.getCode()); |
|
|
|
wxMsgValidationcodeService.sendWorkFlowNodify(wxMsgValidationcode,content); |
|
|
|
} |
|
|
|
|
|
|
|
return new ResultData(); |
|
|
|
} |
|
|
|
|
|
|
|
public String variablesToJson(List<Map<String,Object>> variables){ |
|
|
|
HashMap<String,Object> map = new HashMap<>(); |
|
|
|
for (Map<String,Object> mapInfo:variables) { |
|
|
|
map.put((String)mapInfo.get("key"),mapInfo.get("value")); |
|
|
|
} |
|
|
|
return JSONUtils.toJSONString(map); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public ResultData list(String flowType, Integer pageNum, Integer pageSize,Long userId) { |
|
|
|
List<String> definitionKeyList = new ArrayList<>(); |
|
|
|
|