已办 已发 监控 没有taskInfo问题
This commit is contained in:
@@ -38,8 +38,10 @@ import org.activiti.engine.history.*;
|
|||||||
import org.activiti.engine.repository.ProcessDefinition;
|
import org.activiti.engine.repository.ProcessDefinition;
|
||||||
import org.activiti.engine.runtime.ProcessInstance;
|
import org.activiti.engine.runtime.ProcessInstance;
|
||||||
import org.activiti.engine.runtime.ProcessInstanceQuery;
|
import org.activiti.engine.runtime.ProcessInstanceQuery;
|
||||||
|
import org.activiti.engine.task.Comment;
|
||||||
import org.activiti.engine.task.NativeTaskQuery;
|
import org.activiti.engine.task.NativeTaskQuery;
|
||||||
import org.activiti.engine.task.Task;
|
import org.activiti.engine.task.Task;
|
||||||
|
import org.activiti.engine.task.TaskQuery;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.springframework.beans.BeanUtils;
|
import org.springframework.beans.BeanUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
@@ -2143,9 +2145,14 @@ public class TodoTaskController extends BaseAction {
|
|||||||
// busProcessNew.setPrcName("");
|
// busProcessNew.setPrcName("");
|
||||||
// }
|
// }
|
||||||
// }
|
// }
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
|
||||||
|
.processInstanceId(busProcessName.getPrcId()).orderByHistoricTaskInstanceEndTime().asc();
|
||||||
|
List<HistoricTaskInstance> historicTaskInstanceQueryList = historicTaskInstanceQuery.list();
|
||||||
|
if(!historicTaskInstanceQueryList.isEmpty()){
|
||||||
|
busProcessName.setTaskInfo(historicTaskInstanceQueryList.get(0).getName());
|
||||||
|
}
|
||||||
if (assignee != null && !assignee.equals("")) {
|
if (assignee != null && !assignee.equals("")) {
|
||||||
busProcessName.setTaskAssignee(assignee.substring(0, assignee.length() - 1));
|
busProcessName.setTaskAssignee(assignee.substring(0, assignee.length() - 1));
|
||||||
}
|
}
|
||||||
@@ -2268,8 +2275,15 @@ public class TodoTaskController extends BaseAction {
|
|||||||
// busProcessNew.setPrcName("");
|
// busProcessNew.setPrcName("");
|
||||||
// }
|
// }
|
||||||
// }
|
// }
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
|
||||||
|
.processInstanceId(busProcessName.getPrcId()).orderByHistoricTaskInstanceEndTime().asc();
|
||||||
|
List<HistoricTaskInstance> historicTaskInstanceQueryList = historicTaskInstanceQuery.list();
|
||||||
|
if(!historicTaskInstanceQueryList.isEmpty()){
|
||||||
|
busProcessName.setTaskInfo(historicTaskInstanceQueryList.get(0).getName());
|
||||||
|
}
|
||||||
if (assignee != null && !assignee.equals("")) {
|
if (assignee != null && !assignee.equals("")) {
|
||||||
busProcessName.setTaskAssignee(assignee.substring(0, assignee.length() - 1));
|
busProcessName.setTaskAssignee(assignee.substring(0, assignee.length() - 1));
|
||||||
}
|
}
|
||||||
@@ -2304,6 +2318,7 @@ public class TodoTaskController extends BaseAction {
|
|||||||
String enddata = sdf.format(map.get(busProcessName.getPrcId()+"end"));
|
String enddata = sdf.format(map.get(busProcessName.getPrcId()+"end"));
|
||||||
busProcessName.setEndTaskTime(enddata);
|
busProcessName.setEndTaskTime(enddata);
|
||||||
busProcessName.setStartTaskTime(startdata);
|
busProcessName.setStartTaskTime(startdata);
|
||||||
|
|
||||||
}
|
}
|
||||||
page.setList(list1);
|
page.setList(list1);
|
||||||
page.setCount(Long.valueOf(list.size()));
|
page.setCount(Long.valueOf(list.size()));
|
||||||
@@ -2375,6 +2390,12 @@ public class TodoTaskController extends BaseAction {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
|
||||||
|
.processInstanceId(busProcessName.getPrcId()).orderByHistoricTaskInstanceEndTime().asc();
|
||||||
|
List<HistoricTaskInstance> historicTaskInstanceQueryList = historicTaskInstanceQuery.list();
|
||||||
|
if(!historicTaskInstanceQueryList.isEmpty()){
|
||||||
|
busProcessName.setTaskInfo(historicTaskInstanceQueryList.get(0).getName());
|
||||||
|
}
|
||||||
if (assignee != null && !assignee.equals("")) {
|
if (assignee != null && !assignee.equals("")) {
|
||||||
busProcessName.setTaskAssignee(assignee.substring(0, assignee.length() - 1));
|
busProcessName.setTaskAssignee(assignee.substring(0, assignee.length() - 1));
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user