From f30cb677624e32afe465b949572ef8e58d53905f Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Tue, 18 Apr 2023 13:52:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B5=B7=E8=8D=89=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProcessStep6Before.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep6Before.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep6Before.java index 0c852513..d7a42f83 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep6Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep6Before.java @@ -7,6 +7,7 @@ import com.ydw.bat.wkflow.business_mq.service.CreateMQService; import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import org.apache.commons.lang.StringUtils; import java.util.List; @@ -32,6 +33,12 @@ public class ProcessStep6Before implements TaskListener { // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 one1.setLink("qbzxdjhgkStep6?prcType=25"); one1.setTaskInfo(delegateTask.getName()); + if(one1.getTaskInfo().equals("技术标准起草")){ + if(StringUtils.isNotBlank(one1.getPrcName())){ + String[] split = one1.getPrcName().split("-"); + one1.setPrcName(split[0]+"-"+split[1]+"-企标制修订"); + } + } oaService.sendTodoMq(one1); } } From 86ab9f8c8b8d84aa26560702d7dd3ceec2f5d4f3 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Tue, 18 Apr 2023 15:09:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?OA=E5=BE=85=E5=8A=9E=E4=BB=BB=E5=8A=A1=20?= =?UTF-8?q?=E5=88=A0=E9=99=A4=20PID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/TodoTaskController.java | 8 +++- .../service/impl/WebServiceOAServiceImpl.java | 48 +++++++++++++++++++ 2 files changed, 54 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java index 28741d3a..141c044c 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java @@ -25,6 +25,7 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; import com.ydw.bat.wkflow.business_main.datas.service.IOaTaskExecService; import com.ydw.bat.wkflow.business_mq.service.CreateMQService; import com.ydw.bat.wkflow.business_oa.webService.service.WebServiceOAService; +import com.ydw.bat.wkflow.business_oa.webService.service.impl.WebServiceOAServiceImpl; import com.ydw.bat.wkflow.business_oa.webService.todoContent.NotifyTodoSendContext; import com.ydw.bat.wkflow.business_oa.webService.todoResult.NotifyTodoAppResult; import com.ydw.bat.wkflow.business_wkflow.form.dto.FormSubmitDto; @@ -99,6 +100,9 @@ public class TodoTaskController extends BaseAction { @Autowired private WebServiceOAService webServiceOAService; + @Autowired + private WebServiceOAServiceImpl webServiceOAServiceImol; + @Autowired private CreateMQService mqService; @@ -2759,11 +2763,11 @@ public class TodoTaskController extends BaseAction { return busProcessNames; } - @ApiOperation(value = "删除OA消息通知") + @ApiOperation(value = "删除OA消息通知 起草专用") @GetMapping("/deleteOATask") public String deleteOATask(@RequestParam("pId") String pId) { //查询出当前数据 - webServiceOAService.deleteOAByPid(pId); + webServiceOAServiceImol.deleteOAByPidInfo(pId); return "1"; } 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 638bde34..8d7f011b 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 @@ -427,4 +427,52 @@ public class WebServiceOAServiceImpl implements WebServiceOAService { return notifyTodoAppResult; } + + /** + * 批量删除OA待办 制修订 起草 专用 + * @param pId + */ + @Async + public void deleteOAByPidInfo(String pId){ + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + log.info("--------------------------ESP 批量发送删除待办任务----------------------------"); + + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("P_ID",pId); + List list = iBusProcessNewService.list(queryWrapper1); + if(!list.isEmpty()){ + List notifyTodoSendContexts = new ArrayList<>(); + list.forEach(busProcessNew -> { + NotifyTodoSendContext notifyTodoSendContext = new NotifyTodoSendContext(); + notifyTodoSendContext.setAppName("SPRS"); + notifyTodoSendContext.setModelId(busProcessNew.getId()); + notifyTodoSendContext.setModelName("技术标准起草"); + 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()); + OASendLog oaSendLog = new OASendLog(); + oaSendLog.setType("delete"); + oaSendLog.setCreateTime(new Date()); + oaSendLog.setMeans("deleteOAByPid"); + oaSendLog.setMsgLog(jsonObject.toString()); + oaSendLogService.addOASendLog(oaSendLog); + oaService.setTodoDeleteMq(jsonObject.toString()); + } + } + } }