|
|
@@ -21,6 +21,7 @@ import com.common.workflow.service.dto.ActiMyTaskDTO;
|
|
|
import com.common.workflow.service.dto.ActiPageResultDTO;
|
|
|
import com.common.workflow.service.dto.ActiUserTaskDTO;
|
|
|
import com.common.workflow.web.rest.vm.ActiCompleteVM;
|
|
|
+import com.common.workflow.web.rest.vm.AllProcessTaskVM;
|
|
|
import com.common.workflow.web.rest.vm.MultiActiCompleteVM;
|
|
|
import com.common.workflow.web.rest.vm.MultiOrgAuditVM;
|
|
|
import org.activiti.bpmn.model.BpmnModel;
|
|
|
@@ -240,8 +241,10 @@ public class ActivitiService {
|
|
|
*
|
|
|
* <p>描述: 根据工作流Key 和 用户id查询待办任务列表</p>
|
|
|
*/
|
|
|
- public List<ActiUserTaskDTO> findAllProcessTasks() {
|
|
|
- List<Task> resultTasks = taskService.createTaskQuery().list();
|
|
|
+ public List<ActiUserTaskDTO> findAllProcessTasks(AllProcessTaskVM allVm) {
|
|
|
+ List<String> userList = Arrays.asList( allVm.getUserIds().split(",") );
|
|
|
+ List<String> definitionKeys = Arrays.asList( allVm.getDefinitionKeys().split(",") );
|
|
|
+ List<Task> resultTasks = taskService.createTaskQuery().processDefinitionKeyIn(definitionKeys).taskAssigneeIds(userList).list();
|
|
|
String businessKeys = "";
|
|
|
List<ActiUserTaskDTO> myTaskDTOS = new ArrayList<>();
|
|
|
for (Task myTask : resultTasks) {
|