Sfoglia il codice sorgente

优化审批流

release_toaliyun_real
luozukai 7 anni fa
parent
commit
a53b26dd6e
1 ha cambiato i file con 13 aggiunte e 12 eliminazioni
  1. +13
    -12
      mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java

+ 13
- 12
mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java Vedi File

@@ -1,7 +1,6 @@
package com.iformall.service.impl; package com.iformall.service.impl;


import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.iformall.common.ErrorCode;
import com.iformall.common.Result; import com.iformall.common.Result;
import com.iformall.common.ResultData; import com.iformall.common.ResultData;
import com.iformall.domain.po.*; import com.iformall.domain.po.*;
@@ -128,7 +127,6 @@ public class WxFlowServiceImpl implements WxFlowService {
map.put("businessId",businessId); map.put("businessId",businessId);
map.put("flowType",flowType); map.put("flowType",flowType);
map.put("taskAssignee",taskAssignee); map.put("taskAssignee",taskAssignee);
//map.put("contractNumber",wxRentContract.getContractNumber());
map.put("variables",variables); map.put("variables",variables);


ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(getFlowKeyByType(flowType), map); ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(getFlowKeyByType(flowType), map);
@@ -183,17 +181,20 @@ public class WxFlowServiceImpl implements WxFlowService {
for (Task task : tasks) { for (Task task : tasks) {
Map<String,Object> taskInfoMap = new HashedMap(); Map<String,Object> taskInfoMap = new HashedMap();
Map<String,Object> mapInfo = taskService.getVariables(task.getId()); Map<String,Object> mapInfo = taskService.getVariables(task.getId());
taskInfoMap.put("starter",((MallUserInfo)mapInfo.get("starter")).getName());
taskInfoMap.put("startTime",mapInfo.get("startTime"));
taskInfoMap.put("processInstanceId",task.getProcessInstanceId());
taskInfoMap.put("taskId",task.getId());
taskInfoMap.put("businessId",mapInfo.get("businessId"));
taskInfoMap.put("contractNumber",mapInfo.get("contractNumber"));
List<Map<String,String>> variables = (List)mapInfo.get("variables"); //定制variables,回传
for (Map<String,String> m:variables) {
taskInfoMap.putAll(m);
if(mapInfo!=null){
taskInfoMap.put("starter",((MallUserInfo)mapInfo.get("starter")).getName());
taskInfoMap.put("startTime",mapInfo.get("startTime"));
taskInfoMap.put("processInstanceId",task.getProcessInstanceId());
taskInfoMap.put("taskId",task.getId());
taskInfoMap.put("businessId",mapInfo.get("businessId"));
List<Map<String,String>> variables = (List)mapInfo.get("variables"); //定制variables,回传
if(CollectionUtils.isNotEmpty(variables)){
for (Map<String,String> m:variables) {
taskInfoMap.put(m.get("key"),m.get("value"));
}
}
result.add(taskInfoMap);
} }
result.add(taskInfoMap);
} }
PageInfo<Map<String,Object>> pageInfo = new PageInfo<>(result,pageSize); PageInfo<Map<String,Object>> pageInfo = new PageInfo<>(result,pageSize);
return new ResultData(pageInfo); return new ResultData(pageInfo);


Caricamento…
Annulla
Salva