From 2ced1d27a35bcfd212dc2d2ce73fc02dc1873a77 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 7 Dec 2021 15:17:06 +0800 Subject: [PATCH] =?UTF-8?q?12.7bug=E4=BF=AE=E5=A4=8D=20=E8=8D=89=E7=A8=BF?= =?UTF-8?q?=E6=94=B9=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4=20=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E6=B1=87=E6=80=BB=E5=BC=82=E5=B8=B8=E6=81=A2=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wkflow/business_activiti/task/TodoTaskController.java | 8 +++++++- .../datas/service/IBusProcessNameService.java | 2 +- .../datas/service/impl/BusProcessNameServiceImpl.java | 4 ++-- .../bat/wkflow/listener/aboliish/ProcessStep2After.java | 6 +++++- .../enterpriseBidReviewProcess/ProcessStep3After.java | 1 - 5 files changed, 15 insertions(+), 6 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 0a5729a1..d1fed25b 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 @@ -2521,7 +2521,13 @@ public class TodoTaskController extends BaseAction { @ApiOperation(value = "删除草稿") @PostMapping("/delCG") public String delCG(@RequestParam("id") String id) { - return iBusProcessNameService.delDB(id); + List strings=new ArrayList<>(); + if (id.contains(",")){ + strings.addAll(new ArrayList<>(Arrays.asList(id.split(",")))); + }else { + strings.add(id); + } + return iBusProcessNameService.delDB(strings); } diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNameService.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNameService.java index e0690fbe..4f4d534e 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNameService.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNameService.java @@ -23,5 +23,5 @@ public interface IBusProcessNameService extends IService { List todoTask(TaskCommonQuery taskCommonQuery); - String delDB(String id); + String delDB(List id); } diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNameServiceImpl.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNameServiceImpl.java index 53b7fef0..ec1737e9 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNameServiceImpl.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNameServiceImpl.java @@ -35,8 +35,8 @@ public class BusProcessNameServiceImpl extends ServiceImpl0) { + public String delDB(List id) { + if (busProcessNameMapper.deleteBatchIds(id)>0) { return "success"; }else { return "error"; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep2After.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep2After.java index 3c2531bf..afe97b04 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep2After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep2After.java @@ -10,6 +10,7 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.ActivitiException; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; @@ -42,7 +43,10 @@ public class ProcessStep2After implements TaskListener { } if (delegateTask.getVariable("count",Integer.class)==1){ //对数据进行处理 现阶段是数据貌似是只需要人和意见就可以了！！！！ - List busProcessNews = busBean.findLastworkPeople2("企标复审流程-起草人修改标准状态",delegateTask.getProcessInstanceId()); + QueryWrapper wrapper=new QueryWrapper<>(); + wrapper.eq("TASK_ID","6969696969696969"); + wrapper.eq("P_ID",delegateTask.getProcessInstanceId()); + List busProcessNews = busBean.list(wrapper); List stings=new ArrayList<>(); stings.add(object.getString("presentPeople")+"-"+object.getString("reviewComments")); busProcessNews.forEach(busProcessNew -> { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep3After.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep3After.java index 18b16954..2eb5d69e 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep3After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep3After.java @@ -84,7 +84,6 @@ public class ProcessStep3After implements TaskListener { queryWrapper1.eq("TASK_ID",delegateTask.getId()); BusProcessNew one1 = busBean.getOne(queryWrapper1); if(one1!=null){ - one1.setCommitFlag("0"); one1.setCommitText(object.getString("commentText")); busBean.saveOrUpdate(one1); }