|
|
|
@ -465,23 +465,13 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask |
|
|
|
|
|
|
|
Page<FlowTaskDto> page = new Page<>(); |
|
|
|
TaskQuery taskQuery = taskService.createTaskQuery(); |
|
|
|
String startUserNameParams = ""; |
|
|
|
|
|
|
|
// 流程参数
|
|
|
|
Map<String, Object> paramMap = new HashMap<>(); |
|
|
|
// 挂载表单参数
|
|
|
|
for (BusinessTaskParam btq : params) { |
|
|
|
paramMap.put(btq.getField(), btq.getValue()); |
|
|
|
// if(btq.getSqlOperationSymbol().equals(SQLOperationSymbol.EQUAL)){
|
|
|
|
// taskQuery.processVariableValueEquals(btq.getField(),btq.getValue());
|
|
|
|
// }
|
|
|
|
// if(btq.getSqlOperationSymbol().equals(SQLOperationSymbol.LIKE)){
|
|
|
|
// taskQuery.processVariableValueLike(btq.getField(),"%"+btq.getValue()+"%");
|
|
|
|
// }
|
|
|
|
// if(btq.getSqlOperationSymbol().equals(SQLOperationSymbol.NONE)){
|
|
|
|
// if("processDefinitionId".equals(btq.getField())){
|
|
|
|
// taskQuery.processDefinitionId(btq.getValue());
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
if (btq.getSqlOperationSymbol().equals(SQLOperationSymbol.NONE)) { |
|
|
|
if ("orgSid".equals(btq.getField())) { |
|
|
|
String value = btq.getValue(); |
|
|
|
@ -494,13 +484,12 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
//发起人姓名查询
|
|
|
|
if("startUserName".equals(btq.getField())){ |
|
|
|
startUserNameParams = btq.getValue(); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
// 用户角色sid
|
|
|
|
// List<String> roleSidList = sysUserRoleFeign.getUserRoleSidByUserSid(userSid).getData();
|
|
|
|
/* if (CollectionUtils.isEmpty(roleSidList)) { |
|
|
|
return new ResultBean().fail().setMsg("请先设置用户角色"); |
|
|
|
}*/ |
|
|
|
TaskQuery or = taskQuery.active() |
|
|
|
.includeProcessVariables() |
|
|
|
.includeTaskLocalVariables(); |
|
|
|
@ -520,9 +509,10 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask |
|
|
|
if (paramMap.get("proDefName") != null && StringUtils.isNotBlank(paramMap.get("proDefName").toString())) { |
|
|
|
taskQuery.processDefinitionNameLike("%" + paramMap.get("proDefName") + "%"); |
|
|
|
} |
|
|
|
page.setTotal(taskQuery.count()); |
|
|
|
int p = (pageNum - 1) * pageSize; |
|
|
|
List<Task> taskList = taskQuery.listPage(p, pageSize); |
|
|
|
/* page.setTotal(taskQuery.count()); |
|
|
|
int p = (pageNum - 1) * pageSize;*/ |
|
|
|
// List<Task> taskList = taskQuery.listPage(p, pageSize);
|
|
|
|
List<Task> taskList = taskQuery.list(); |
|
|
|
List<FlowTaskDto> flowList = new ArrayList<>(); |
|
|
|
for (Task task : taskList) { |
|
|
|
FlowTaskDto flowTask = new FlowTaskDto(); |
|
|
|
@ -580,6 +570,14 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask |
|
|
|
flowTask.setDeptName(sysUserVoResultBean2.getData().getOrganizationName()); |
|
|
|
flowList.add(flowTask); |
|
|
|
} |
|
|
|
//筛选发起人
|
|
|
|
if (StringUtils.isNotBlank(startUserNameParams)) { |
|
|
|
String finalStartUserNameParams = startUserNameParams; |
|
|
|
flowList = flowList.stream().filter(v -> v.getStartUserName().contains(finalStartUserNameParams)).collect(Collectors.toList()); |
|
|
|
} |
|
|
|
page.setTotal(taskQuery.count()); |
|
|
|
flowList = flowList.stream().skip((pageNum - 1) * pageSize).limit(pageSize). |
|
|
|
collect(Collectors.toList()); |
|
|
|
page.setRecords(flowList); |
|
|
|
ResultBean<Page<FlowTaskDto>> rb = new ResultBean<Page<FlowTaskDto>>(); |
|
|
|
return rb.success().setData(page); |
|
|
|
@ -690,6 +688,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask |
|
|
|
Page<FlowTaskDto> page = new Page<>(); |
|
|
|
Map<String, Object> paraMap = new HashMap<>(); |
|
|
|
List<Map<String, Object>> ll = new ArrayList<>(); |
|
|
|
String startUserNameParams = ""; |
|
|
|
for (BusinessTaskParam btq : params) { |
|
|
|
paraMap.put(btq.getField(), btq.getValue()); |
|
|
|
Map<String, Object> mapss = new HashMap<>(); |
|
|
|
@ -704,11 +703,17 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask |
|
|
|
mapss.put("filed", btq.getField()); |
|
|
|
} |
|
|
|
ll.add(mapss); |
|
|
|
//查询条件发起人
|
|
|
|
if("startUserName".equals(btq.getField())){ |
|
|
|
paraMap.remove("startUserName"); |
|
|
|
startUserNameParams = btq.getValue(); |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
paraMap.put("userSid", userSid); |
|
|
|
paraMap.put("list", ll); |
|
|
|
paraMap.put("page", (pageNum - 1) * pageSize); |
|
|
|
paraMap.put("size", pageSize); |
|
|
|
/* paraMap.put("page", (pageNum - 1) * pageSize); |
|
|
|
paraMap.put("size", pageSize);*/ |
|
|
|
List<Map<String, Object>> maps = baseMapper.finishedList1(paraMap); |
|
|
|
int count = baseMapper.finishedListCount(paraMap); |
|
|
|
List<FlowTaskDto> hisTaskList = new ArrayList(); |
|
|
|
@ -793,7 +798,15 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask |
|
|
|
} |
|
|
|
hisTaskList.add(flowTask); |
|
|
|
} |
|
|
|
page.setTotal(count); |
|
|
|
//对hisTaskList进行筛选发起人
|
|
|
|
if (StringUtils.isNotBlank(startUserNameParams)) { |
|
|
|
String finalStartUserNameParams = startUserNameParams; |
|
|
|
hisTaskList = hisTaskList.stream().filter(v -> v.getStartUserName().contains(finalStartUserNameParams)).collect(Collectors.toList()); |
|
|
|
} |
|
|
|
page.setTotal(hisTaskList.size()); |
|
|
|
hisTaskList = hisTaskList.stream().skip((pageNum - 1) * pageSize).limit(pageSize). |
|
|
|
collect(Collectors.toList()); |
|
|
|
// page.setTotal(count);
|
|
|
|
page.setRecords(hisTaskList); |
|
|
|
ResultBean<Page<FlowTaskDto>> rb = new ResultBean<Page<FlowTaskDto>>(); |
|
|
|
return rb.success().setData(page); |
|
|
|
|
God
2 years ago