From c3f7c2d7863e3b8cc285dd00bc0837b113e05ec4 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Wed, 10 May 2023 11:34:52 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A4=8D=E5=AE=A1=E6=B5=81=E7=A8=8BOA?= =?UTF-8?q?=E5=8F=91=E9=80=81=20=E6=B2=A1=E6=9C=89=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E5=88=B0=E5=AF=B9=E5=BA=94=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ydw/bat/wkflow/listener/bussFs/BussFsSub1Before.java | 3 ++- .../com/ydw/bat/wkflow/listener/bussFs/BussFsSub2Before.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsSub1Before.java b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsSub1Before.java index 21366bfc..792247d8 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsSub1Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsSub1Before.java @@ -44,7 +44,8 @@ public class BussFsSub1Before implements TaskListener{ busBean.saveOrUpdate(one1); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("bussFsSub1?prcType=buss3"); + //one1.setLink("bussFsSub1?prcType=buss3"); + one1.setLink("qbfsStepSub1?prcType=buss3"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsSub2Before.java b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsSub2Before.java index 1a6810f3..51438774 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsSub2Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsSub2Before.java @@ -41,7 +41,8 @@ public class BussFsSub2Before implements TaskListener{ busBean.saveOrUpdate(one1); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("bussFsSub2?prcType=buss3"); + //one1.setLink("bussFsSub2?prcType=buss3"); + one1.setLink("qbfsStepSub2?prcType=buss3"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); From 9ba97b91c4ede6a0df2159fb37fbfff35713f4c6 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Thu, 11 May 2023 13:44:07 +0800 Subject: [PATCH 2/3] =?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 --- .../dto/TaskCommonQuery.java | 3 + .../task/TodoTaskController.java | 418 +++++++++++++++++- 2 files changed, 413 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_activiti/dto/TaskCommonQuery.java b/src/main/java/com/ydw/bat/wkflow/business_activiti/dto/TaskCommonQuery.java index 107c9d47..f7ce52c7 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_activiti/dto/TaskCommonQuery.java +++ b/src/main/java/com/ydw/bat/wkflow/business_activiti/dto/TaskCommonQuery.java @@ -54,4 +54,7 @@ public class TaskCommonQuery { @ApiModelProperty(value = "流程编号") private String prcNum; + @ApiModelProperty(value = "标识") + private Boolean tag = true; + } 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 6205d445..67af73ba 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 @@ -26,27 +26,19 @@ 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; import com.ydw.bat.wkflow.business_wkflow.form.service.FormValsService; -import com.ydw.bat.wkflow.util.SpringContextUtil; -import org.activiti.bpmn.model.BpmnModel; -import org.activiti.bpmn.model.FlowNode; import org.activiti.engine.*; import org.activiti.engine.history.*; import org.activiti.engine.repository.ProcessDefinition; import org.activiti.engine.runtime.ProcessInstance; import org.activiti.engine.runtime.ProcessInstanceQuery; -import org.activiti.engine.task.Comment; import org.activiti.engine.task.NativeTaskQuery; import org.activiti.engine.task.Task; -import org.activiti.engine.task.TaskQuery; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.scheduling.annotation.Async; import org.springframework.web.bind.annotation.*; import com.tmsps.fk.common.base.action.BaseAction; @@ -190,6 +182,111 @@ public class TodoTaskController extends BaseAction { } } + + if(taskCommonQuery.getPrcType().equals("buss1") && taskCommonQuery.getTag()){ + QueryWrapper objectQueryWrapper = new QueryWrapper<>(); + objectQueryWrapper.eq("PRC_TYPE",25); + if(StringUtils.isNotBlank(taskCommonQuery.getPrcNum())){ + objectQueryWrapper.eq("PRC_NUM",taskCommonQuery.getPrcNum()); + } + if(StringUtils.isNotBlank(taskCommonQuery.getPrcName())){ + objectQueryWrapper.like("PRC_NAME",taskCommonQuery.getPrcName()); + } + int count = iBusProcessNameService.count(objectQueryWrapper); + TaskCommonQuery taskCommonQueryInfo = new TaskCommonQuery(); + taskCommonQueryInfo.setPrcType("25"); + //标识 如果是技术标准搜索，则无需进入 制修订的方法 + taskCommonQueryInfo.setTag(false); + taskCommonQueryInfo.setSize(count); + taskCommonQueryInfo.setTaskName(taskCommonQuery.getTaskName()); + taskCommonQueryInfo.setCategory_id(taskCommonQuery.getCategory_id()); + taskCommonQueryInfo.setCreatuserId(taskCommonQuery.getCreatuserId()); + taskCommonQueryInfo.setCurrent(taskCommonQuery.getCurrent()); + taskCommonQueryInfo.setEndTime(taskCommonQuery.getEndTime()); + taskCommonQueryInfo.setFinishEndTime(taskCommonQuery.getFinishEndTime()); + taskCommonQueryInfo.setFinishStartTime(taskCommonQuery.getFinishStartTime()); + taskCommonQueryInfo.setName(taskCommonQuery.getName()); + taskCommonQueryInfo.setPrcName(taskCommonQuery.getPrcName()); + taskCommonQueryInfo.setPrcNameOrId(taskCommonQuery.getPrcNameOrId()); + taskCommonQueryInfo.setPrcNum(taskCommonQuery.getPrcNum()); + taskCommonQueryInfo.setPrcState(taskCommonQuery.getPrcState()); + taskCommonQueryInfo.setStartTime(taskCommonQuery.getStartTime()); + taskCommonQueryInfo.setTaskList(taskCommonQuery.getTaskList()); + taskCommonQueryInfo.setUserId(taskCommonQuery.getUserId()); + + + List busProcessNames = todoTaskListByUserId(taskCommonQueryInfo); + List listName = new ArrayList<>(); + if(!todoList.isEmpty()){ + for (BusProcessName nameData:todoList){ + listName.add(nameData); + } + } + if(!busProcessNames.isEmpty()){ + for (BusProcessName nameData : busProcessNames){ + if(nameData.getTaskInfo().equals("技术标准起草")){ + listName.add(nameData); + } + } + listName.sort((m1,m2)-> m2.getCreatTime().compareTo(m1.getCreatTime())); + todoList.clear(); + //page.setCount(pageInfo.getCount()+page.getCount()); + for (int i = 0; i i){ + todoList.add(listName.get(i)); + //} + } + } + } + if(taskCommonQuery.getPrcType().equals("25") && taskCommonQuery.getTag()){ + QueryWrapper objectQueryWrapper = new QueryWrapper<>(); + objectQueryWrapper.eq("PRC_TYPE",25); + if(StringUtils.isNotBlank(taskCommonQuery.getPrcNum())){ + objectQueryWrapper.eq("PRC_NUM",taskCommonQuery.getPrcNum()); + } + if(StringUtils.isNotBlank(taskCommonQuery.getPrcName())){ + objectQueryWrapper.like("PRC_NAME",taskCommonQuery.getPrcName()); + } + int count = iBusProcessNameService.count(objectQueryWrapper); + TaskCommonQuery taskCommonQueryInfo = new TaskCommonQuery(); + taskCommonQueryInfo.setPrcType("25"); + taskCommonQueryInfo.setTag(false); + taskCommonQueryInfo.setSize(count); + taskCommonQueryInfo.setTaskName(taskCommonQuery.getTaskName()); + taskCommonQueryInfo.setCategory_id(taskCommonQuery.getCategory_id()); + taskCommonQueryInfo.setCreatuserId(taskCommonQuery.getCreatuserId()); + taskCommonQueryInfo.setCurrent(taskCommonQuery.getCurrent()); + taskCommonQueryInfo.setEndTime(taskCommonQuery.getEndTime()); + taskCommonQueryInfo.setFinishEndTime(taskCommonQuery.getFinishEndTime()); + taskCommonQueryInfo.setFinishStartTime(taskCommonQuery.getFinishStartTime()); + taskCommonQueryInfo.setName(taskCommonQuery.getName()); + taskCommonQueryInfo.setPrcName(taskCommonQuery.getPrcName()); + taskCommonQueryInfo.setPrcNameOrId(taskCommonQuery.getPrcNameOrId()); + taskCommonQueryInfo.setPrcNum(taskCommonQuery.getPrcNum()); + taskCommonQueryInfo.setPrcState(taskCommonQuery.getPrcState()); + taskCommonQueryInfo.setStartTime(taskCommonQuery.getStartTime()); + taskCommonQueryInfo.setTaskList(taskCommonQuery.getTaskList()); + taskCommonQueryInfo.setUserId(taskCommonQuery.getUserId()); + + + List busProcessNames = todoTaskListByUserId(taskCommonQueryInfo); + List listName = new ArrayList<>(); + + if(!busProcessNames.isEmpty()){ + for (BusProcessName nameData : busProcessNames){ + if(!nameData.getTaskInfo().equals("技术标准起草")){ + listName.add(nameData); + } + } + listName.sort((m1,m2)-> m2.getCreatTime().compareTo(m1.getCreatTime())); + todoList.clear(); + //page.setCount(pageInfo.getCount()+page.getCount()); + for (int i = 0; i m2.getCreatTime().compareTo(m1.getCreatTime())); return todoList; } @@ -2193,6 +2290,106 @@ public class TodoTaskController extends BaseAction { page.setPageSize(taskCommonQuery.getSize()); page.setPageNo(taskCommonQuery.getCurrent()); } + if(taskCommonQuery.getPrcType().equals("buss1") && taskCommonQuery.getTag()){ + QueryWrapper objectQueryWrapper = new QueryWrapper<>(); + objectQueryWrapper.eq("PRC_TYPE",25); + if(StringUtils.isNotBlank(taskCommonQuery.getPrcNum())){ + objectQueryWrapper.eq("PRC_NUM",taskCommonQuery.getPrcNum()); + } + if(StringUtils.isNotBlank(taskCommonQuery.getPrcName())){ + objectQueryWrapper.like("PRC_NAME",taskCommonQuery.getPrcName()); + } + int count = iBusProcessNameService.count(objectQueryWrapper); + TaskCommonQuery taskCommonQueryInfo = new TaskCommonQuery(); + taskCommonQueryInfo.setPrcType("25"); + taskCommonQueryInfo.setTag(false); + taskCommonQueryInfo.setSize(count); + taskCommonQueryInfo.setTaskName(taskCommonQuery.getTaskName()); + taskCommonQueryInfo.setCategory_id(taskCommonQuery.getCategory_id()); + taskCommonQueryInfo.setCreatuserId(taskCommonQuery.getCreatuserId()); + taskCommonQueryInfo.setCurrent(taskCommonQuery.getCurrent()); + taskCommonQueryInfo.setEndTime(taskCommonQuery.getEndTime()); + taskCommonQueryInfo.setFinishEndTime(taskCommonQuery.getFinishEndTime()); + taskCommonQueryInfo.setFinishStartTime(taskCommonQuery.getFinishStartTime()); + taskCommonQueryInfo.setName(taskCommonQuery.getName()); + taskCommonQueryInfo.setPrcName(taskCommonQuery.getPrcName()); + taskCommonQueryInfo.setPrcNameOrId(taskCommonQuery.getPrcNameOrId()); + taskCommonQueryInfo.setPrcNum(taskCommonQuery.getPrcNum()); + taskCommonQueryInfo.setPrcState(taskCommonQuery.getPrcState()); + taskCommonQueryInfo.setStartTime(taskCommonQuery.getStartTime()); + taskCommonQueryInfo.setTaskList(taskCommonQuery.getTaskList()); + taskCommonQueryInfo.setUserId(taskCommonQuery.getUserId()); + Page pageInfo = IssuedProcess(taskCommonQueryInfo); + List listName = new ArrayList<>(); + if(!page.getList().isEmpty()){ + for (BusProcessName nameData: page.getList()){ + listName.add(nameData); + } + } + if(!pageInfo.getList().isEmpty()){ + for (BusProcessName nameData : pageInfo.getList()){ + if(nameData.getTaskInfo().equals("技术标准起草")){ + listName.add(nameData); + } + } + listName.sort((m1,m2)-> m2.getCreatTime().compareTo(m1.getCreatTime())); + page.getList().clear(); + page.setCount(Long.valueOf(listName.size())); + for (int i = 0; i i){ + page.getList().add(listName.get(i)); + } + } + } + } + if(taskCommonQuery.getPrcType().equals("25") && taskCommonQuery.getTag()){ + QueryWrapper objectQueryWrapper = new QueryWrapper<>(); + objectQueryWrapper.eq("PRC_TYPE",25); + if(StringUtils.isNotBlank(taskCommonQuery.getPrcNum())){ + objectQueryWrapper.eq("PRC_NUM",taskCommonQuery.getPrcNum()); + } + if(StringUtils.isNotBlank(taskCommonQuery.getPrcName())){ + objectQueryWrapper.like("PRC_NAME",taskCommonQuery.getPrcName()); + } + int count = iBusProcessNameService.count(objectQueryWrapper); + TaskCommonQuery taskCommonQueryInfo = new TaskCommonQuery(); + taskCommonQueryInfo.setPrcType("25"); + taskCommonQueryInfo.setTag(false); + taskCommonQueryInfo.setSize(count); + taskCommonQueryInfo.setTaskName(taskCommonQuery.getTaskName()); + taskCommonQueryInfo.setCategory_id(taskCommonQuery.getCategory_id()); + taskCommonQueryInfo.setCreatuserId(taskCommonQuery.getCreatuserId()); + taskCommonQueryInfo.setCurrent(taskCommonQuery.getCurrent()); + taskCommonQueryInfo.setEndTime(taskCommonQuery.getEndTime()); + taskCommonQueryInfo.setFinishEndTime(taskCommonQuery.getFinishEndTime()); + taskCommonQueryInfo.setFinishStartTime(taskCommonQuery.getFinishStartTime()); + taskCommonQueryInfo.setName(taskCommonQuery.getName()); + taskCommonQueryInfo.setPrcName(taskCommonQuery.getPrcName()); + taskCommonQueryInfo.setPrcNameOrId(taskCommonQuery.getPrcNameOrId()); + taskCommonQueryInfo.setPrcNum(taskCommonQuery.getPrcNum()); + taskCommonQueryInfo.setPrcState(taskCommonQuery.getPrcState()); + taskCommonQueryInfo.setStartTime(taskCommonQuery.getStartTime()); + taskCommonQueryInfo.setTaskList(taskCommonQuery.getTaskList()); + taskCommonQueryInfo.setUserId(taskCommonQuery.getUserId()); + Page pageInfo = IssuedProcess(taskCommonQueryInfo); + List listName = new ArrayList<>(); + if(!pageInfo.getList().isEmpty()){ + for (BusProcessName nameData : pageInfo.getList()){ + if(!nameData.getTaskInfo().equals("技术标准起草")){ + listName.add(nameData); + } + } + listName.sort((m1,m2)-> m2.getCreatTime().compareTo(m1.getCreatTime())); + page.getList().clear(); + page.setCount(Long.valueOf(listName.size())); + for (int i = 0; i i){ + page.getList().add(listName.get(i)); + } + } + } + } + page.getList().sort((m1,m2)-> m2.getCreatTime().compareTo(m1.getCreatTime())); return page; } @@ -2338,6 +2535,110 @@ public class TodoTaskController extends BaseAction { page.setPageSize(taskCommonQuery.getSize()); page.setPageNo(taskCommonQuery.getCurrent()); } + if(taskCommonQuery.getPrcType().equals("buss1") && taskCommonQuery.getTag()){ + QueryWrapper objectQueryWrapper = new QueryWrapper<>(); + objectQueryWrapper.eq("PRC_TYPE",25); + if(StringUtils.isNotBlank(taskCommonQuery.getPrcNum())){ + objectQueryWrapper.eq("PRC_NUM",taskCommonQuery.getPrcNum()); + } + if(StringUtils.isNotBlank(taskCommonQuery.getPrcName())){ + objectQueryWrapper.like("PRC_NAME",taskCommonQuery.getPrcName()); + } + int count = iBusProcessNameService.count(objectQueryWrapper); + TaskCommonQuery taskCommonQueryInfo = new TaskCommonQuery(); + taskCommonQueryInfo.setPrcType("25"); + taskCommonQueryInfo.setTag(false); + taskCommonQueryInfo.setSize(count); + taskCommonQueryInfo.setTaskName(taskCommonQuery.getTaskName()); + taskCommonQueryInfo.setCategory_id(taskCommonQuery.getCategory_id()); + taskCommonQueryInfo.setCreatuserId(taskCommonQuery.getCreatuserId()); + taskCommonQueryInfo.setCurrent(taskCommonQuery.getCurrent()); + taskCommonQueryInfo.setEndTime(taskCommonQuery.getEndTime()); + taskCommonQueryInfo.setFinishEndTime(taskCommonQuery.getFinishEndTime()); + taskCommonQueryInfo.setFinishStartTime(taskCommonQuery.getFinishStartTime()); + taskCommonQueryInfo.setName(taskCommonQuery.getName()); + taskCommonQueryInfo.setPrcName(taskCommonQuery.getPrcName()); + taskCommonQueryInfo.setPrcNameOrId(taskCommonQuery.getPrcNameOrId()); + taskCommonQueryInfo.setPrcNum(taskCommonQuery.getPrcNum()); + taskCommonQueryInfo.setPrcState(taskCommonQuery.getPrcState()); + taskCommonQueryInfo.setStartTime(taskCommonQuery.getStartTime()); + taskCommonQueryInfo.setTaskList(taskCommonQuery.getTaskList()); + taskCommonQueryInfo.setUserId(taskCommonQuery.getUserId()); + + + Page pageInfo = doneProcess(taskCommonQueryInfo); + List listName = new ArrayList<>(); + if(!page.getList().isEmpty()){ + for (BusProcessName nameData: page.getList()){ + listName.add(nameData); + } + } + if(!pageInfo.getList().isEmpty()){ + for (BusProcessName nameData : pageInfo.getList()){ + if(nameData.getTaskInfo().equals("技术标准起草")){ + listName.add(nameData); + } + } + listName.sort((m1,m2)-> m2.getCreatTime().compareTo(m1.getCreatTime())); + page.getList().clear(); + page.setCount(Long.valueOf(listName.size())); + for (int i = 0; i i){ + page.getList().add(listName.get(i)); + } + } + } + } + if(taskCommonQuery.getPrcType().equals("25") && taskCommonQuery.getTag()){ + QueryWrapper objectQueryWrapper = new QueryWrapper<>(); + objectQueryWrapper.eq("PRC_TYPE",25); + if(StringUtils.isNotBlank(taskCommonQuery.getPrcNum())){ + objectQueryWrapper.eq("PRC_NUM",taskCommonQuery.getPrcNum()); + } + if(StringUtils.isNotBlank(taskCommonQuery.getPrcName())){ + objectQueryWrapper.like("PRC_NAME",taskCommonQuery.getPrcName()); + } + int count = iBusProcessNameService.count(objectQueryWrapper); + TaskCommonQuery taskCommonQueryInfo = new TaskCommonQuery(); + taskCommonQueryInfo.setPrcType("25"); + taskCommonQueryInfo.setTag(false); + taskCommonQueryInfo.setSize(count); + taskCommonQueryInfo.setTaskName(taskCommonQuery.getTaskName()); + taskCommonQueryInfo.setCategory_id(taskCommonQuery.getCategory_id()); + taskCommonQueryInfo.setCreatuserId(taskCommonQuery.getCreatuserId()); + taskCommonQueryInfo.setCurrent(taskCommonQuery.getCurrent()); + taskCommonQueryInfo.setEndTime(taskCommonQuery.getEndTime()); + taskCommonQueryInfo.setFinishEndTime(taskCommonQuery.getFinishEndTime()); + taskCommonQueryInfo.setFinishStartTime(taskCommonQuery.getFinishStartTime()); + taskCommonQueryInfo.setName(taskCommonQuery.getName()); + taskCommonQueryInfo.setPrcName(taskCommonQuery.getPrcName()); + taskCommonQueryInfo.setPrcNameOrId(taskCommonQuery.getPrcNameOrId()); + taskCommonQueryInfo.setPrcNum(taskCommonQuery.getPrcNum()); + taskCommonQueryInfo.setPrcState(taskCommonQuery.getPrcState()); + taskCommonQueryInfo.setStartTime(taskCommonQuery.getStartTime()); + taskCommonQueryInfo.setTaskList(taskCommonQuery.getTaskList()); + taskCommonQueryInfo.setUserId(taskCommonQuery.getUserId()); + + + Page pageInfo = doneProcess(taskCommonQueryInfo); + List listName = new ArrayList<>(); + if(!pageInfo.getList().isEmpty()){ + for (BusProcessName nameData : pageInfo.getList()){ + if(!nameData.getTaskInfo().equals("技术标准起草")){ + listName.add(nameData); + } + } + listName.sort((m1,m2)-> m2.getCreatTime().compareTo(m1.getCreatTime())); + page.getList().clear(); + page.setCount(Long.valueOf(listName.size())); + for (int i = 0; i i){ + page.getList().add(listName.get(i)); + } + } + } + } + page.getList().sort((m1,m2)-> m2.getCreatTime().compareTo(m1.getCreatTime())); return page; } @@ -2437,6 +2738,107 @@ public class TodoTaskController extends BaseAction { page.setPageSize(taskCommonQuery.getSize()); page.setPageNo(taskCommonQuery.getCurrent()); } + if(taskCommonQuery.getPrcType().equals("buss1") && taskCommonQuery.getTag()){ + QueryWrapper objectQueryWrapper = new QueryWrapper<>(); + objectQueryWrapper.eq("PRC_TYPE",25); + if(StringUtils.isNotBlank(taskCommonQuery.getPrcNum())){ + objectQueryWrapper.eq("PRC_NUM",taskCommonQuery.getPrcNum()); + } + if(StringUtils.isNotBlank(taskCommonQuery.getPrcName())){ + objectQueryWrapper.like("PRC_NAME",taskCommonQuery.getPrcName()); + } + int count = iBusProcessNameService.count(objectQueryWrapper); + TaskCommonQuery taskCommonQueryInfo = new TaskCommonQuery(); + taskCommonQueryInfo.setPrcType("25"); + taskCommonQueryInfo.setTag(false); + taskCommonQueryInfo.setSize(count); + taskCommonQueryInfo.setTaskName(taskCommonQuery.getTaskName()); + taskCommonQueryInfo.setCategory_id(taskCommonQuery.getCategory_id()); + taskCommonQueryInfo.setCreatuserId(taskCommonQuery.getCreatuserId()); + taskCommonQueryInfo.setCurrent(taskCommonQuery.getCurrent()); + taskCommonQueryInfo.setEndTime(taskCommonQuery.getEndTime()); + taskCommonQueryInfo.setFinishEndTime(taskCommonQuery.getFinishEndTime()); + taskCommonQueryInfo.setFinishStartTime(taskCommonQuery.getFinishStartTime()); + taskCommonQueryInfo.setName(taskCommonQuery.getName()); + taskCommonQueryInfo.setPrcName(taskCommonQuery.getPrcName()); + taskCommonQueryInfo.setPrcNameOrId(taskCommonQuery.getPrcNameOrId()); + taskCommonQueryInfo.setPrcNum(taskCommonQuery.getPrcNum()); + taskCommonQueryInfo.setPrcState(taskCommonQuery.getPrcState()); + taskCommonQueryInfo.setStartTime(taskCommonQuery.getStartTime()); + taskCommonQueryInfo.setTaskList(taskCommonQuery.getTaskList()); + taskCommonQueryInfo.setUserId(taskCommonQuery.getUserId()); + Page pageInfo = allProcess(taskCommonQueryInfo); + List listName = new ArrayList<>(); + if(!page.getList().isEmpty()){ + for (BusProcessName nameData: page.getList()){ + listName.add(nameData); + } + } + + if(!pageInfo.getList().isEmpty()){ + for (BusProcessName nameData : pageInfo.getList()){ + if(nameData.getTaskInfo().equals("技术标准起草")){ + listName.add(nameData); + } + } + listName.sort((m1,m2)-> m2.getCreatTime().compareTo(m1.getCreatTime())); + page.getList().clear(); + page.setCount(Long.valueOf(listName.size())); + for (int i = 0; i i){ + page.getList().add(listName.get(i)); + } + } + } + } + if(taskCommonQuery.getPrcType().equals("25") && taskCommonQuery.getTag()){ + QueryWrapper objectQueryWrapper = new QueryWrapper<>(); + objectQueryWrapper.eq("PRC_TYPE",25); + if(StringUtils.isNotBlank(taskCommonQuery.getPrcNum())){ + objectQueryWrapper.eq("PRC_NUM",taskCommonQuery.getPrcNum()); + } + if(StringUtils.isNotBlank(taskCommonQuery.getPrcName())){ + objectQueryWrapper.like("PRC_NAME",taskCommonQuery.getPrcName()); + } + int count = iBusProcessNameService.count(objectQueryWrapper); + TaskCommonQuery taskCommonQueryInfo = new TaskCommonQuery(); + taskCommonQueryInfo.setPrcType("25"); + taskCommonQueryInfo.setTag(false); + taskCommonQueryInfo.setSize(count); + taskCommonQueryInfo.setTaskName(taskCommonQuery.getTaskName()); + taskCommonQueryInfo.setCategory_id(taskCommonQuery.getCategory_id()); + taskCommonQueryInfo.setCreatuserId(taskCommonQuery.getCreatuserId()); + taskCommonQueryInfo.setCurrent(taskCommonQuery.getCurrent()); + taskCommonQueryInfo.setEndTime(taskCommonQuery.getEndTime()); + taskCommonQueryInfo.setFinishEndTime(taskCommonQuery.getFinishEndTime()); + taskCommonQueryInfo.setFinishStartTime(taskCommonQuery.getFinishStartTime()); + taskCommonQueryInfo.setName(taskCommonQuery.getName()); + taskCommonQueryInfo.setPrcName(taskCommonQuery.getPrcName()); + taskCommonQueryInfo.setPrcNameOrId(taskCommonQuery.getPrcNameOrId()); + taskCommonQueryInfo.setPrcNum(taskCommonQuery.getPrcNum()); + taskCommonQueryInfo.setPrcState(taskCommonQuery.getPrcState()); + taskCommonQueryInfo.setStartTime(taskCommonQuery.getStartTime()); + taskCommonQueryInfo.setTaskList(taskCommonQuery.getTaskList()); + taskCommonQueryInfo.setUserId(taskCommonQuery.getUserId()); + Page pageInfo = allProcess(taskCommonQueryInfo); + List listName = new ArrayList<>(); + if(!pageInfo.getList().isEmpty()){ + for (BusProcessName nameData : pageInfo.getList()){ + if(!nameData.getTaskInfo().equals("技术标准起草")){ + listName.add(nameData); + } + } + listName.sort((m1,m2)-> m2.getCreatTime().compareTo(m1.getCreatTime())); + page.getList().clear(); + page.setCount(Long.valueOf(listName.size())); + for (int i = 0; i i){ + page.getList().add(listName.get(i)); + } + } + } + } + page.getList().sort((m1,m2)-> m2.getCreatTime().compareTo(m1.getCreatTime())); return page; } From 81b05b01fcb207bacd77434e07b910474bd953ae Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Thu, 11 May 2023 18:02:37 +0800 Subject: [PATCH 3/3] =?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){ }