diff --git a/src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/impl/WebServiceOAServiceImpl.java b/src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/impl/WebServiceOAServiceImpl.java index 9a2a33d2..a5cbff85 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/impl/WebServiceOAServiceImpl.java +++ b/src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/impl/WebServiceOAServiceImpl.java @@ -191,51 +191,31 @@ public class WebServiceOAServiceImpl implements WebServiceOAService { List list = iBusProcessNewService.list(queryWrapper1); if(!list.isEmpty()){ List notifyTodoSendContexts = new ArrayList<>(); -// list.forEach(busProcessNew -> { -// NotifyTodoSendContext notifyTodoSendContext = new NotifyTodoSendContext(); -// notifyTodoSendContext.setAppName("SRMS"); -// notifyTodoSendContext.setModelId(busProcessNew.getId()); -// notifyTodoSendContext.setModelName(busProcessNew.getTaskInfo()); -// notifyTodoSendContext.setType("1"); -// notifyTodoSendContext.setOptType("2"); -// Map map = new HashMap<>(); -// ResponseMessage byId = lawsUserInfoService.getById(busProcessNew.getUserId()); -// map.put("LoginName",byId == null ? "" : byId.getData().getAccount()); -// JSONObject jsonLoginName = new JSONObject(map); -// notifyTodoSendContext.setTargets(jsonLoginName.toJSONString()); -// notifyTodoSendContext.setUserId(busProcessNew.getUserId()); -// notifyTodoSendContexts.add(notifyTodoSendContext); -// //循环调用 -// map.put("todoId",pId); -// map.put("list",notifyTodoSendContexts); -// net.sf.json.JSONObject jsonObject = net.sf.json.JSONObject.fromObject(map); -// log.info("调用MQ数据!!!:"+jsonObject.toString()); -// oaService.setTodoDeleteMq(jsonObject.toString()); - - for (BusProcessNew busProcessNew : list) { - NotifyTodoSendContext notifyTodoSendContext = new NotifyTodoSendContext(); - notifyTodoSendContext.setAppName("SRMS"); - notifyTodoSendContext.setModelId(busProcessNew.getId()); - notifyTodoSendContext.setModelName(busProcessNew.getTaskInfo()); - notifyTodoSendContext.setType("1"); - notifyTodoSendContext.setOptType("2"); - Map map = new HashMap<>(); - ResponseMessage byId = lawsUserInfoService.getById(busProcessNew.getUserId()); - map.put("LoginName",byId == null ? "" : byId.getData().getAccount()); - JSONObject jsonLoginName = new JSONObject(map); - notifyTodoSendContext.setTargets(jsonLoginName.toJSONString()); - notifyTodoSendContext.setUserId(busProcessNew.getUserId()); - //notifyTodoSendContexts.add(notifyTodoSendContext); - //循环调用 - map.put("todoId",pId); - map.put("list",notifyTodoSendContext); - net.sf.json.JSONObject jsonObject = net.sf.json.JSONObject.fromObject(map); - log.info("调用MQ数据!!!:"+jsonObject.toString()); - oaService.setTodoDeleteMq(jsonObject.toString()); - } - -// }); - + list.forEach(busProcessNew -> { + NotifyTodoSendContext notifyTodoSendContext = new NotifyTodoSendContext(); + notifyTodoSendContext.setAppName("SRMS"); + notifyTodoSendContext.setModelId(busProcessNew.getId()); + notifyTodoSendContext.setModelName(busProcessNew.getTaskInfo()); + notifyTodoSendContext.setType("1"); + notifyTodoSendContext.setOptType("2"); + Map map = new HashMap<>(); + ResponseMessage byId = lawsUserInfoService.getById(busProcessNew.getUserId()); + map.put("LoginName",byId == null ? "" : byId.getData().getAccount()); + JSONObject jsonLoginName = new JSONObject(map); + notifyTodoSendContext.setTargets(jsonLoginName.toJSONString()); + notifyTodoSendContext.setUserId(busProcessNew.getUserId()); + notifyTodoSendContexts.add(notifyTodoSendContext); + }); + for (NotifyTodoSendContext data: notifyTodoSendContexts){ + List notifyTodoSendContextArrayList = new ArrayList<>(); + notifyTodoSendContextArrayList.add(data); + Map map = new TreeMap<>(); + map.put("todoId",pId); + map.put("list",notifyTodoSendContextArrayList); + net.sf.json.JSONObject jsonObject = net.sf.json.JSONObject.fromObject(map); + log.info("调用MQ数据!!!:"+jsonObject.toString()); + oaService.setTodoDeleteMq(jsonObject.toString()); + } } }