From 81b05b01fcb207bacd77434e07b910474bd953ae Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Thu, 11 May 2023 18:02:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E4=B8=AD=E5=BF=83=20?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=9F=A5=E8=AF=A2=20=E5=BE=85=E5=8A=9E=20?= =?UTF-8?q?=E5=B7=B2=E5=8F=91=20=E5=B7=B2=E5=8A=9E=20=E7=9B=91=E6=8E=A7=20?= =?UTF-8?q?=E6=8A=80=E6=9C=AF=E6=A0=87=E5=87=86=20=E4=B8=8E=E5=88=B6?= =?UTF-8?q?=E4=BF=AE=E8=AE=A2=E5=88=86=E9=A1=B5=E9=97=AE=E9=A2=98bug=20?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BusProcessNewController.java | 6 ++++ .../datas/service/IBusProcessNewService.java | 2 ++ .../impl/BusProcessNewServiceImpl.java | 32 +++++++++++++++++++ 3 files changed, 40 insertions(+) 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 e052c43a..af5d4bf0 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 @@ -101,5 +101,11 @@ public class BusProcessNewController extends BaseAction { public List getSarBussionStandPageNo(@RequestBody List rows) { return iBusProcessNewService.getSarBussionStandPageNo(rows); } + + @ApiOperation(value = "福企标制修订计划流程变更 在合并 延期 取消 更名 流程变更 批准则结束") + @GetMapping("/endPrcName") + public String endPrcName(@RequestParam("prcName")String prcName,@RequestParam("esId") String esId) { + return iBusProcessNewService.endPrcName(prcName,esId); + } } 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 a3a7ab95..5fc43b59 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 @@ -53,4 +53,6 @@ public interface IBusProcessNewService extends IService { ResponseMessage updateBusProcessNew(String id, String mags); List getSarBussionStandPageNo(List rows); + + String endPrcName(String prcName,String esId); } 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 db67ef9c..8919c5ca 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 @@ -14,9 +14,14 @@ import com.ydw.bat.wkflow.business_main.datas.mapper.BusProcessNewMapper; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; import com.ydw.bat.wkflow.business_oa.webService.service.impl.WebServiceOAServiceImpl; import com.ydw.bat.wkflow.config.ScheduledJobEsPlan; +import com.ydw.bat.wkflow.util.activiti.DeleteTaskCommond; import com.ydw.bat.wkflow.util.http.ResponseMessage; import com.ydw.bat.wkflow.util.http.Result; +import org.activiti.engine.ProcessEngine; +import org.activiti.engine.RuntimeService; import org.activiti.engine.TaskService; +import org.activiti.engine.impl.ProcessEngineImpl; +import org.activiti.engine.runtime.ProcessInstanceQuery; import org.activiti.engine.task.Task; import org.activiti.engine.task.TaskQuery; import org.apache.commons.lang.StringUtils; @@ -40,6 +45,9 @@ public class BusProcessNewServiceImpl extends ServiceImpl busProcessNewQueryWrapper = new QueryWrapper<>(); + busProcessNewQueryWrapper.eq("PRC_NAME",prcName); + List busProcessNews = baseMapper.selectList(busProcessNewQueryWrapper); + if(!busProcessNews.isEmpty()){ + for (BusProcessNew newData:busProcessNews){ + //判断是否是同一条企标计划 + JSONObject jsonObject = JSON.parseObject(newData.getMesg()); + String esIdMesg = jsonObject.getString("esId"); + if(StringUtils.isNotBlank(esIdMesg)){ + if(esId.equals(esIdMesg)){ + //是同一条企标计划 删除当前待办 是否是起草页面 + //删除OA待办任务 + // taskService.deleteTask(newData.getTaskId()); + runtimeService.deleteProcessInstance(newData.getPId(),"原始数据已被更改"); + } + } + } + } + return "成功"; + } + public void taskInfo(List busProcessNews){ }