|
@@ -31,6 +31,7 @@ import org.activiti.engine.task.Task;
|
|
|
import org.activiti.engine.task.TaskQuery;
|
|
import org.activiti.engine.task.TaskQuery;
|
|
|
import org.activiti.image.ProcessDiagramGenerator;
|
|
import org.activiti.image.ProcessDiagramGenerator;
|
|
|
|
|
|
|
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
|
@@ -141,6 +142,36 @@ public class ActivitiService {
|
|
|
return businessKeys;
|
|
return businessKeys;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
|
+ *
|
|
|
|
|
+ * <p>描述: 根据工作流Key 和 用户id查询已办任务列表</p>
|
|
|
|
|
+ */
|
|
|
|
|
+ public String findTaskHistByUserId(String processKey, String userId) {
|
|
|
|
|
+ List<HistoricTaskInstance> hisTaskList = historyService.createHistoricTaskInstanceQuery()
|
|
|
|
|
+ .processDefinitionKey(processKey)
|
|
|
|
|
+ .taskAssignee(userId)
|
|
|
|
|
+ .orderByTaskId()
|
|
|
|
|
+ .desc()
|
|
|
|
|
+ .list();
|
|
|
|
|
+ List<String> businessKeyList = new ArrayList<>();
|
|
|
|
|
+ String businessKeys = "";
|
|
|
|
|
+
|
|
|
|
|
+ for (HistoricTaskInstance myTask : hisTaskList) {
|
|
|
|
|
+ List<HistoricVariableInstance> varList = historyService.createHistoricVariableInstanceQuery()
|
|
|
|
|
+ .processInstanceId(myTask.getProcessInstanceId())
|
|
|
|
|
+ .list();
|
|
|
|
|
+
|
|
|
|
|
+ for(HistoricVariableInstance hisvar : varList) {
|
|
|
|
|
+ if(hisvar.getVariableName().equals("businessKey") && !businessKeyList.contains(hisvar.getValue().toString())) {
|
|
|
|
|
+ businessKeyList.add(hisvar.getValue().toString());
|
|
|
|
|
+ break;
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ businessKeys = StringUtils.join(businessKeyList.toArray(), ",");
|
|
|
|
|
+ return businessKeys;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 查询当前用户的待办任务
|
|
* 查询当前用户的待办任务
|
|
|
* @param processDefinitionKey 流程定义key(流程定义的标识)
|
|
* @param processDefinitionKey 流程定义key(流程定义的标识)
|