From 0738eefbd1889e377271b9e88da80282d8edc39a Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Mon, 3 Apr 2023 11:18:40 +0800 Subject: [PATCH] =?UTF-8?q?=EF=BC=88=E5=88=A0=E9=99=A4=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E5=AE=8C=E6=88=90=E4=BB=BB=E5=8A=A1=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BusProcessNewController.java | 11 +++------- .../datas/mapper/BusProcessNewMapper.java | 2 -- .../datas/service/IBusProcessNewService.java | 2 +- .../impl/BusProcessNewServiceImpl.java | 22 ++++++------------- .../mapper/datas/BusProcessNewMapper.xml | 9 -------- 5 files changed, 11 insertions(+), 35 deletions(-) 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 0cf1fe9c..a494e2ca 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 @@ -11,11 +11,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.activiti.engine.task.Task; 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 org.springframework.web.bind.annotation.*; import java.util.List; @@ -70,8 +66,8 @@ public class BusProcessNewController extends BaseAction { } @ApiOperation(value = "问答中心（第一个人回答以后删除其他人的代办任务以及OA提醒）") - @GetMapping("/deleteReplyToenNotice") - public String deleteReplyToenNotice(@RequestParam("taskId") String taskId, @RequestParam("answerer") String answerer){ + @PostMapping("/deleteReplyToenNotice") + public List deleteReplyToenNotice(@RequestParam("taskId") String taskId, @RequestParam("answerer") String answerer){ return iBusProcessNewService.deleteReplyToenNotice(taskId,answerer); } @@ -81,6 +77,5 @@ public class BusProcessNewController extends BaseAction { 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 6b4a62e7..96d425a9 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 @@ -33,6 +33,4 @@ public interface BusProcessNewMapper extends BaseMapper { List everyDayTenOlock(); 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 e33d36a5..5e66d3e5 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 @@ -38,7 +38,7 @@ public interface IBusProcessNewService extends IService { String selectBusProcessNew(String taskId); - String deleteReplyToenNotice(String taskId, String answerer); + List 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 63af2f54..8775c500 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 @@ -107,28 +107,20 @@ public class BusProcessNewServiceImpl extends ServiceImpl deleteReplyToenNotice(String taskId, String answerer) { + ArrayList objects = new ArrayList<>(); QueryWrapper 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"; + QueryWrapper objectQueryWrapperTaskId = new QueryWrapper<>(); + objectQueryWrapperTaskId.eq("P_ID",busProcessNews.get(0).getPId()); + List busProcessNewsArr = baseMapper.selectList(objectQueryWrapperTaskId); + //返回当前任务的所有 taskId + return busProcessNewsArr; } @Override diff --git a/src/main/resources/mapper/datas/BusProcessNewMapper.xml b/src/main/resources/mapper/datas/BusProcessNewMapper.xml index 1561dbc3..bd2df8df 100644 --- a/src/main/resources/mapper/datas/BusProcessNewMapper.xml +++ b/src/main/resources/mapper/datas/BusProcessNewMapper.xml @@ -61,13 +61,4 @@ CONCAT( date_sub( DATE_FORMAT( NOW(), '%Y-%m-%d' ), INTERVAL 1 DAY), '%')) and TASK_INFO = '标准化活动参会流程-流程结束' - - - delete act_ru_task - - ID_ = #{taskId} - - - -