|
@@ -99,14 +99,15 @@ public class GdpuMqController {
|
|
|
JSONObject data = new JSONObject();
|
|
|
ToDoTaskDto toDoTaskDto = FlowMqCacheUtil.getToDoTask(flowId);
|
|
|
JSONArray processInfo = new JSONArray(); //主流程信息
|
|
|
+ ProcessInfoDTO processInfoDTO = null;
|
|
|
if (orunId != null) {
|
|
|
- ProcessInfoDTO processInfoDTO = new ProcessInfoDTO();
|
|
|
+ processInfoDTO = new ProcessInfoDTO();
|
|
|
processInfoDTO.setSysAppId(sysAppId);
|
|
|
processInfoDTO.setOrunId(sysAppId + flowId);
|
|
|
setProcessInfoDTO(processInfoDTO, toDoTaskDto, basicSchool.getCode());
|
|
|
- processInfo.add(processInfoDTO);
|
|
|
+// processInfo.add(processInfoDTO);
|
|
|
}
|
|
|
- data.put("processInfo", processInfo);
|
|
|
+// data.put("processInfo", processInfo);
|
|
|
|
|
|
JSONArray todoInfo = new JSONArray(); //待办信息
|
|
|
if (Objects.nonNull(toDoTaskDto) && Objects.nonNull(toDoTaskDto.getHandleMessageDto())) {
|
|
@@ -115,11 +116,20 @@ public class GdpuMqController {
|
|
|
for (StandardFlowWorkMsg s : todoTaskList) {
|
|
|
TodoInfoDTO todoInfoDTO = new TodoInfoDTO();
|
|
|
setTodoInfoDTO(todoInfoDTO, s, basicSchool.getCode());
|
|
|
+ processInfoDTO.setUserId(todoInfoDTO.getUserId());
|
|
|
+ processInfoDTO.setUserName(todoInfoDTO.getUserName());
|
|
|
+ processInfoDTO.setUrl(todoInfoDTO.getUrl());
|
|
|
+ processInfoDTO.setMobileUrl(todoInfoDTO.getMobileUrl());
|
|
|
todoInfo.add(todoInfoDTO);
|
|
|
}
|
|
|
data.put("todoInfo", todoInfo);
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ if (orunId != null) {
|
|
|
+ processInfo.add(processInfoDTO);
|
|
|
+ }
|
|
|
+ data.put("processInfo", processInfo);
|
|
|
// JSONArray toreadInfo = new JSONArray(); //待阅信息
|
|
|
// if (orunId != null) {
|
|
|
// ToReadInfoDTO toReadInfoDTO = new ToReadInfoDTO();
|