From bdeafa389ca44b26bb40cf896a48a90322079a3e Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Fri, 31 Mar 2023 15:41:17 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E7=AD=94=E4=B8=AD=E5=BF=83=20?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BusProcessNewController.java | 13 +++++ .../datas/mapper/BusProcessNewMapper.java | 1 + .../datas/service/IBusProcessNewService.java | 4 ++ .../impl/BusProcessNewServiceImpl.java | 49 +++++++++++++++++++ .../listener/quizOrAnswer/answerBefore.java | 4 +- .../mapper/datas/BusProcessNewMapper.xml | 4 ++ 6 files changed, 74 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessNewController.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessNewController.java index cad134c6..0cf1fe9c 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessNewController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessNewController.java @@ -14,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import java.util.List; @@ -68,6 +69,18 @@ public class BusProcessNewController extends BaseAction { return iBusProcessNewService.selectBusProcessNew(taskId); } + @ApiOperation(value = "问答中心（第一个人回答以后删除其他人的代办任务以及OA提醒）") + @GetMapping("/deleteReplyToenNotice") + public String deleteReplyToenNotice(@RequestParam("taskId") String taskId, @RequestParam("answerer") String answerer){ + return iBusProcessNewService.deleteReplyToenNotice(taskId,answerer); + } + + @ApiOperation(value = "问答中心（第一个人回答以后删除其他人的代办任务以及OA提醒）") + @GetMapping("/selectAskId") + public String selectAskId(@RequestParam("taskId") String taskId){ + return iBusProcessNewService.selectAskId(taskId); + } + } diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNewMapper.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNewMapper.java index 9743050e..6b4a62e7 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNewMapper.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNewMapper.java @@ -34,4 +34,5 @@ public interface BusProcessNewMapper extends BaseMapper { List everyDayTenOlockSAM(); + void deleteTask(@Param("taskId") String taskId); } diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNewService.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNewService.java index 2a6378cf..e33d36a5 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNewService.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNewService.java @@ -37,4 +37,8 @@ public interface IBusProcessNewService extends IService { List everyDayTenOlockSAM(); String selectBusProcessNew(String taskId); + + String deleteReplyToenNotice(String taskId, String answerer); + + String selectAskId(String taskId); } diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java index f58d869b..63af2f54 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java @@ -1,13 +1,17 @@ package com.ydw.bat.wkflow.business_main.datas.service.impl; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; import com.ydw.bat.wkflow.business_main.datas.mapper.BusProcessNewMapper; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ydw.bat.wkflow.business_oa.webService.service.impl.WebServiceOAServiceImpl; import org.activiti.engine.TaskService; import org.activiti.engine.task.Task; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.*; @@ -24,8 +28,12 @@ import java.util.stream.Collectors; @Service public class BusProcessNewServiceImpl extends ServiceImpl implements IBusProcessNewService { + @Autowired private TaskService taskService; + @Autowired + private WebServiceOAServiceImpl webServiceOAService; + /* * @Author yuzhong * @Description @@ -98,4 +106,45 @@ public class BusProcessNewServiceImpl extends ServiceImpl objectQueryWrapper = new QueryWrapper<>(); + objectQueryWrapper.eq("TASK_ID",taskId); + List busProcessNews = baseMapper.selectList(objectQueryWrapper); + //获取pid + if(!busProcessNews.isEmpty()){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("P_ID",busProcessNews.get(0).getPId()); + List busProcessNewList = baseMapper.selectList(queryWrapper); + + for (BusProcessNew data : busProcessNewList){ + //通过taskId删除对应的任务。 + if(StringUtils.isNotBlank(data.getUserId()) && !data.getUserId().equals(answerer)){ + baseMapper.deleteTask(data.getTaskId()); + } + } + } + //删除OA待办 + if(StringUtils.isNotBlank(busProcessNews.get(0).getPId())){ + webServiceOAService.deleteOAByPid(busProcessNews.get(0).getPId()); + } + return "1"; + } + + @Override + public String selectAskId(String taskId) { + if(StringUtils.isNotBlank(taskId)){ + QueryWrapper objectQueryWrapper = new QueryWrapper<>(); + objectQueryWrapper.eq("TASK_ID",taskId); + List busProcessNews = baseMapper.selectList(objectQueryWrapper); + if(!busProcessNews.isEmpty()){ + String mesg = busProcessNews.get(0).getMesg(); + JSONObject jsonObject = JSON.parseObject(mesg); + JSONObject askQuestions = jsonObject.getJSONObject("askQuestions"); + String id = askQuestions.getString("id"); + return id; + } + } + return null; + } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/quizOrAnswer/answerBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/quizOrAnswer/answerBefore.java index d1e861a0..3b923c18 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/quizOrAnswer/answerBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/quizOrAnswer/answerBefore.java @@ -1,5 +1,7 @@ package com.ydw.bat.wkflow.listener.quizOrAnswer; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; @@ -28,7 +30,7 @@ public class answerBefore implements TaskListener { CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("standQA?prcType=27"); + one1.setLink("standQA?prcType=27&taskId="+one1.getTaskId()); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } diff --git a/src/main/resources/mapper/datas/BusProcessNewMapper.xml b/src/main/resources/mapper/datas/BusProcessNewMapper.xml index e3a7a9b0..cff2392b 100644 --- a/src/main/resources/mapper/datas/BusProcessNewMapper.xml +++ b/src/main/resources/mapper/datas/BusProcessNewMapper.xml @@ -62,5 +62,9 @@ TASK_INFO = '标准化活动参会流程-流程结束' + + delete act_ru_task where ID_ = #{taskId} + +