|
@@ -792,7 +792,7 @@ public class FlowOperationController {
|
|
|
for (String s : unfinishedTaskList) {
|
|
|
if (s.contains(userTasks.get(value))) {
|
|
|
List<String> list = new ArrayList<>();
|
|
|
- list.add("未处理");
|
|
|
+ list.add("待处理");
|
|
|
countTasks.remove(value);
|
|
|
countTasks.put(value, list);
|
|
|
}
|
|
@@ -824,9 +824,9 @@ public class FlowOperationController {
|
|
|
Set<String> unfinishedTaskSet = new LinkedHashSet<>();
|
|
|
for (HistoricActivityInstance unfinishedActivity : unfinishedInstanceList) {
|
|
|
//正在待办的节点与已完成节点中有重复信息,要进行过滤。
|
|
|
- if (!finishedTaskSet.contains(unfinishedActivity.getActivityId())) {
|
|
|
+ //if (!finishedTaskSet.contains(unfinishedActivity.getActivityId())) {
|
|
|
unfinishedTaskSet.add(unfinishedActivity.getActivityId());
|
|
|
- }
|
|
|
+ //}
|
|
|
}
|
|
|
JSONObject jsonData = new JSONObject();
|
|
|
jsonData.put("finishedTaskSet", finishedTaskSet);
|