From 1745f329cb8ba08bea2a72fecaa16fc74f753b2b Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Mon, 15 May 2023 09:25:46 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=88=B6=E4=BF=AE=E8=AE=A2=20OA=20?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E4=B8=8D=E4=B8=80=E8=87=B4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enterpriseStandardSystemRevisionPlan/ProcessStep1Before.java | 1 + .../enterpriseStandardSystemRevisionPlan/ProcessStep2Before.java | 1 + .../enterpriseStandardSystemRevisionPlan/ProcessStep3Before.java | 1 + .../enterpriseStandardSystemRevisionPlan/ProcessStep4Before.java | 1 + .../enterpriseStandardSystemRevisionPlan/ProcessStep5Before.java | 1 + .../enterpriseStandardSystemRevisionPlan/ProcessStep6Before.java | 1 + 6 files changed, 6 insertions(+) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep1Before.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep1Before.java index 660eab2d..57671c5a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep1Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep1Before.java @@ -26,6 +26,7 @@ public class ProcessStep1Before implements TaskListener { if(!list.isEmpty()) { BusProcessNew one1 = list.get(0); one1.setTaskId(delegateTask.getId()); + one1.setTaskInfo(delegateTask.getName()); busBean.saveOrUpdate(one1); CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep2Before.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep2Before.java index 6b2aaf4e..f9ff0274 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep2Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep2Before.java @@ -26,6 +26,7 @@ public class ProcessStep2Before implements TaskListener { if(!list.isEmpty()) { BusProcessNew one1 = list.get(0); one1.setTaskId(delegateTask.getId()); + one1.setTaskInfo(delegateTask.getName()); busBean.saveOrUpdate(one1); CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep3Before.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep3Before.java index 357483bb..c5320ab1 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep3Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep3Before.java @@ -26,6 +26,7 @@ public class ProcessStep3Before implements TaskListener { if(!list.isEmpty()) { BusProcessNew one1 = list.get(0); one1.setTaskId(delegateTask.getId()); + one1.setTaskInfo(delegateTask.getName()); busBean.saveOrUpdate(one1); CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4Before.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4Before.java index c48d93c9..21eda99c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4Before.java @@ -26,6 +26,7 @@ public class ProcessStep4Before implements TaskListener { if(!list.isEmpty()) { BusProcessNew one1 = list.get(0); one1.setTaskId(delegateTask.getId()); + one1.setTaskInfo(delegateTask.getName()); busBean.saveOrUpdate(one1); CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep5Before.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep5Before.java index edcf9f91..9625f6bf 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep5Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep5Before.java @@ -26,6 +26,7 @@ public class ProcessStep5Before implements TaskListener { if(!list.isEmpty()) { BusProcessNew one1 = list.get(0); one1.setTaskId(delegateTask.getId()); + one1.setTaskInfo(delegateTask.getName()); busBean.saveOrUpdate(one1); CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep6Before.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep6Before.java index 11a5c027..a94a66fe 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep6Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep6Before.java @@ -27,6 +27,7 @@ public class ProcessStep6Before implements TaskListener { if(!list.isEmpty()) { BusProcessNew one1 = list.get(0); one1.setTaskId(delegateTask.getId()); + one1.setTaskInfo(delegateTask.getName()); busBean.saveOrUpdate(one1); CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); From edd6d71cf48675cdc2781493a1e5ea44e4ee4aeb Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Mon, 15 May 2023 09:55:05 +0800 Subject: [PATCH 2/7] =?UTF-8?q?OA=20=E6=A0=87=E5=87=86=E5=8F=B7=20?= =?UTF-8?q?=E7=89=B9=E6=AE=8A=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProcessStep6Before.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep6Before.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep6Before.java index a94a66fe..735f5e17 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep6Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep6Before.java @@ -9,6 +9,7 @@ import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; import org.apache.commons.lang.StringUtils; +import java.util.Arrays; import java.util.List; /** @@ -37,7 +38,13 @@ public class ProcessStep6Before implements TaskListener { if(one1.getTaskInfo().equals("技术标准起草")){ if(StringUtils.isNotBlank(one1.getPrcName())){ String[] split = one1.getPrcName().split("-"); - one1.setPrcName(split[0]+"-"+split[1]+"-企标制修订"); + List asList = Arrays.asList(split); + if(asList.size()>3) { + one1.setPrcName(split[0] + "-" + split[1] +"-"+ split[2] + "-企标制修订"); + }else { + one1.setPrcName(split[0] + "-" + split[1] + "-企标制修订"); + } + } } oaService.sendTodoMq(one1); From 6966a42b03ecaef39dec61121b7bd5fcb5340986 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Mon, 15 May 2023 14:48:22 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=BE=85=E5=8A=9E=20=E5=B7=B2=E5=8A=9E=20?= =?UTF-8?q?=E5=B7=B2=E5=8F=91=20=E7=9B=91=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/TodoTaskController.java | 642 +++++++----------- 1 file changed, 229 insertions(+), 413 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 6bd8258a..a9fc3e2c 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 @@ -119,8 +119,68 @@ public class TodoTaskController extends BaseAction { } // 获取查询列表 // List list = nativeTaskQuery.listPage((current - 1) * size, size); - List list = nativeTaskQuery.list(); + List tasks = nativeTaskQuery.list(); + List list = new ArrayList<>(); + if(taskCommonQuery.getPrcType() != null && !taskCommonQuery.getPrcType().equals("")){ + if(taskCommonQuery.getPrcType().equals("buss1") || taskCommonQuery.getPrcType().equals("25")){ + for (Task data: tasks){ + if(taskCommonQuery.getPrcType().equals("buss1")){ + QueryWrapper objectQueryWrapperNew = new QueryWrapper<>(); + objectQueryWrapperNew.eq("TASK_ID",data.getId()); + BusProcessNew oneNew = iBusProcessNewService.getOne(objectQueryWrapperNew); + if(oneNew!=null){ + QueryWrapper objectQueryWrapperName = new QueryWrapper<>(); + objectQueryWrapperName.eq("PRC_ID",oneNew.getPId()); + BusProcessName oneName = iBusProcessNameService.getOne(objectQueryWrapperName); + if (oneName!=null){ + if(StringUtils.isNotBlank(oneName.getPrcType())){ + if(oneName.getPrcType().equals("buss1")){ + list.add(data); + } + if(oneName.getPrcType().equals("25")){ + if(data.getName().equals("技术标准起草")){ + list.add(data); + } + } + } + } + } + } + if(taskCommonQuery.getPrcType().equals("25")){ + QueryWrapper objectQueryWrapperNew = new QueryWrapper<>(); + objectQueryWrapperNew.eq("TASK_ID",data.getId()); + BusProcessNew oneNew = iBusProcessNewService.getOne(objectQueryWrapperNew); + if(oneNew!=null){ + QueryWrapper objectQueryWrapperName = new QueryWrapper<>(); + objectQueryWrapperName.eq("PRC_ID",oneNew.getPId()); + BusProcessName oneName = iBusProcessNameService.getOne(objectQueryWrapperName); + if (oneName!=null){ + if(StringUtils.isNotBlank(oneName.getPrcType())){ + if(oneName.getPrcType().equals("25")){ + if(!data.getName().equals("技术标准起草")){ + list.add(data); + } + } + } + } + } + + + } + } + + }else { + for (Task data: tasks){ + list.add(data); + } + } + }else { + for (Task data: tasks){ + list.add(data); + } + } List> listEnd = ActivitiTools.turnTasks(list); + for (Map map : listEnd) { ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(map.get("processDefinitionId") + "").singleResult(); map.put("processInstanceName", processDefinition.getName()); @@ -155,8 +215,18 @@ public class TodoTaskController extends BaseAction { if (taskCommonQuery.getPrcName() != null && !taskCommonQuery.getPrcName().equals("")) { queryWrapper.like("PRC_NAME", taskCommonQuery.getPrcName()); } +// if (taskCommonQuery.getPrcType() != null && !taskCommonQuery.getPrcType().equals("")) { +// queryWrapper.eq("PRC_TYPE", taskCommonQuery.getPrcType()); +// } if (taskCommonQuery.getPrcType() != null && !taskCommonQuery.getPrcType().equals("")) { - queryWrapper.eq("PRC_TYPE", taskCommonQuery.getPrcType()); + if(taskCommonQuery.getPrcType().equals("buss1")){ + //技术制修订 + String prcType = taskCommonQuery.getPrcType()+","+25; + String[] split = prcType.split(","); + queryWrapper.in("PRC_TYPE", split); + }else { + queryWrapper.eq("PRC_TYPE", taskCommonQuery.getPrcType()); + } } BusProcessName busProcessName = iBusProcessNameService.getOne(queryWrapper); String taskIds = ""; @@ -183,109 +253,6 @@ 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; } @@ -2266,13 +2233,64 @@ public class TodoTaskController extends BaseAction { if (taskCommonQuery.getPrcName() != null && !taskCommonQuery.getPrcName().equals("")) { queryWrapper.like("PRC_NAME", taskCommonQuery.getPrcName()); } +// if (taskCommonQuery.getPrcType() != null && !taskCommonQuery.getPrcType().equals("")) { +// queryWrapper.eq("PRC_TYPE", taskCommonQuery.getPrcType()); +// } if (taskCommonQuery.getPrcType() != null && !taskCommonQuery.getPrcType().equals("")) { - queryWrapper.eq("PRC_TYPE", taskCommonQuery.getPrcType()); + if(taskCommonQuery.getPrcType().equals("buss1")){ + //技术制修订 + String prcType = taskCommonQuery.getPrcType()+","+25; + String[] split = prcType.split(","); + queryWrapper.in("PRC_TYPE", split); + }else { + queryWrapper.eq("PRC_TYPE", taskCommonQuery.getPrcType()); + } } queryWrapper.orderByDesc("CREAT_TIME"); queryWrapper.isNotNull("PRC_ID"); queryWrapper.isNotNull("PRC_NUM"); - List list = iBusProcessNameService.list(queryWrapper); + //List list = iBusProcessNameService.list(queryWrapper); + List busProcessNames = iBusProcessNameService.list(queryWrapper); + //判断是否是25 如果是25 则进行数据纠正 只有是起草页面的 + List list = new ArrayList<>(); + if(taskCommonQuery.getPrcType() != null && !taskCommonQuery.getPrcType().equals("")){ + if(taskCommonQuery.getPrcType().equals("buss1")){ + for (BusProcessName data:busProcessNames){ + HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery() + .processInstanceId(data.getPrcId()).orderByHistoricTaskInstanceEndTime().asc(); + List historicTaskInstanceQueryList = historicTaskInstanceQuery.list(); + if(StringUtils.isNotBlank(data.getPrcType())) { + if (data.getPrcType().equals("buss1")) { + list.add(data); + } + if (data.getPrcType().equals("25") && historicTaskInstanceQueryList.size()>0) { + if (historicTaskInstanceQueryList.get(0).getName().equals("技术标准起草")) { + list.add(data); + } + } + } + } + } else if(taskCommonQuery.getPrcType().equals("25")){ + for (BusProcessName data:busProcessNames){ + HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery() + .processInstanceId(data.getPrcId()).orderByHistoricTaskInstanceEndTime().asc(); + List historicTaskInstanceQueryList = historicTaskInstanceQuery.list(); + if(StringUtils.isNotBlank(data.getPrcType())) { + if (data.getPrcType().equals("25") && historicTaskInstanceQueryList.size()>0) { + if (!historicTaskInstanceQueryList.get(0).getName().equals("技术标准起草")) { + list.add(data); + } + } + } + } + } + } + if(list.isEmpty()){ + for (BusProcessName data:busProcessNames){ + list.add(data); + } + } + Page page = new Page(); if (list != null && list.size() > 0) { List list1 = this.startPage(list, taskCommonQuery.getCurrent(), taskCommonQuery.getSize()); @@ -2375,105 +2393,6 @@ 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; } @@ -2509,10 +2428,60 @@ public class TodoTaskController extends BaseAction { if (taskCommonQuery.getPrcName() != null && !taskCommonQuery.getPrcName().equals("")) { queryWrapper.like("PRC_NAME", taskCommonQuery.getPrcName()); } +// if (taskCommonQuery.getPrcType() != null && !taskCommonQuery.getPrcType().equals("")) { +// queryWrapper.eq("PRC_TYPE", taskCommonQuery.getPrcType()); +// } if (taskCommonQuery.getPrcType() != null && !taskCommonQuery.getPrcType().equals("")) { - queryWrapper.eq("PRC_TYPE", taskCommonQuery.getPrcType()); + if(taskCommonQuery.getPrcType().equals("buss1")){ + //技术制修订 + String prcType = taskCommonQuery.getPrcType()+","+25; + String[] split = prcType.split(","); + queryWrapper.in("PRC_TYPE", split); + }else { + queryWrapper.eq("PRC_TYPE", taskCommonQuery.getPrcType()); + } } - List list = iBusProcessNameService.list(queryWrapper); + List busProcessNames = iBusProcessNameService.list(queryWrapper); + //判断是否是25 如果是25 则进行数据纠正 只有是起草页面的 + List list = new ArrayList<>(); + if(taskCommonQuery.getPrcType() != null && !taskCommonQuery.getPrcType().equals("")){ + if(taskCommonQuery.getPrcType().equals("buss1")){ + for (BusProcessName data:busProcessNames){ + HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery() + .processInstanceId(data.getPrcId()).orderByHistoricTaskInstanceEndTime().asc(); + List historicTaskInstanceQueryList = historicTaskInstanceQuery.list(); + if(StringUtils.isNotBlank(data.getPrcType())) { + if (data.getPrcType().equals("buss1")) { + list.add(data); + } + if (data.getPrcType().equals("25") && historicTaskInstanceQueryList.size()>0) { + if (historicTaskInstanceQueryList.get(0).getName().equals("技术标准起草")) { + list.add(data); + } + } + } + } + } else if(taskCommonQuery.getPrcType().equals("25")){ + for (BusProcessName data:busProcessNames){ + HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery() + .processInstanceId(data.getPrcId()).orderByHistoricTaskInstanceEndTime().asc(); + List historicTaskInstanceQueryList = historicTaskInstanceQuery.list(); + if(StringUtils.isNotBlank(data.getPrcType())) { + if (data.getPrcType().equals("25") && historicTaskInstanceQueryList.size()>0) { + if (!historicTaskInstanceQueryList.get(0).getName().equals("技术标准起草")) { + list.add(data); + } + } + } + } + } + } + if(list.isEmpty()){ + for (BusProcessName data:busProcessNames){ + list.add(data); + } + } + List list1 = this.startPage(list, taskCommonQuery.getCurrent(), taskCommonQuery.getSize()); if (list != null && list.size() > 0) { for (BusProcessName busProcessName : list1) { @@ -2620,109 +2589,6 @@ 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; } @@ -2738,12 +2604,62 @@ public class TodoTaskController extends BaseAction { if (taskCommonQuery.getPrcName() != null && !taskCommonQuery.getPrcName().equals("")) { queryWrapper.like("PRC_NAME", taskCommonQuery.getPrcName()); } +// if (taskCommonQuery.getPrcType() != null && !taskCommonQuery.getPrcType().equals("")) { +// queryWrapper.eq("PRC_TYPE", taskCommonQuery.getPrcType()); +// } if (taskCommonQuery.getPrcType() != null && !taskCommonQuery.getPrcType().equals("")) { - queryWrapper.eq("PRC_TYPE", taskCommonQuery.getPrcType()); + if(taskCommonQuery.getPrcType().equals("buss1")){ + //技术制修订 + String prcType = taskCommonQuery.getPrcType()+","+25; + String[] split = prcType.split(","); + queryWrapper.in("PRC_TYPE", split); + }else { + queryWrapper.eq("PRC_TYPE", taskCommonQuery.getPrcType()); + } } queryWrapper.isNotNull("PRC_ID"); queryWrapper.isNotNull("PRC_NAME"); - List list = iBusProcessNameService.list(queryWrapper); + // List list = iBusProcessNameService.list(queryWrapper); + List busProcessNames = iBusProcessNameService.list(queryWrapper); + //判断是否是25 如果是25 则进行数据纠正 只有是起草页面的 + List list = new ArrayList<>(); + if(taskCommonQuery.getPrcType() != null && !taskCommonQuery.getPrcType().equals("")){ + if(taskCommonQuery.getPrcType().equals("buss1")){ + for (BusProcessName data:busProcessNames){ + HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery() + .processInstanceId(data.getPrcId()).orderByHistoricTaskInstanceEndTime().asc(); + List historicTaskInstanceQueryList = historicTaskInstanceQuery.list(); + if(StringUtils.isNotBlank(data.getPrcType())) { + if (data.getPrcType().equals("buss1")) { + list.add(data); + } + if (data.getPrcType().equals("25") && historicTaskInstanceQueryList.size()>0) { + if (historicTaskInstanceQueryList.get(0).getName().equals("技术标准起草")) { + list.add(data); + } + } + } + } + } else if(taskCommonQuery.getPrcType().equals("25")){ + for (BusProcessName data:busProcessNames){ + HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery() + .processInstanceId(data.getPrcId()).orderByHistoricTaskInstanceEndTime().asc(); + List historicTaskInstanceQueryList = historicTaskInstanceQuery.list(); + if(StringUtils.isNotBlank(data.getPrcType())) { + if (data.getPrcType().equals("25") && historicTaskInstanceQueryList.size()>0) { + if (!historicTaskInstanceQueryList.get(0).getName().equals("技术标准起草")) { + list.add(data); + } + } + } + } + } + } + if(list.isEmpty()){ + for (BusProcessName data:busProcessNames){ + list.add(data); + } + } Page page = new Page(); if (list != null && list.size() > 0) { List list1 = this.startPage(list, taskCommonQuery.getCurrent(), taskCommonQuery.getSize()); @@ -2823,106 +2739,6 @@ 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 469488eee6de08f1d027633c222291554f1ca597 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Mon, 15 May 2023 16:26:40 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=9B=B4=E5=90=8D=E6=B5=81=E7=A8=8B=20?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=BF=87=E6=89=8D=E5=8F=91=E8=B5=B7=20?= =?UTF-8?q?=E6=B2=A1=E5=88=A0=E9=99=A4=E8=BF=87=E4=B8=8D=E5=8F=91=E8=B5=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/BusProcessNewServiceImpl.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) 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 717be53a..41a253a1 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 @@ -21,6 +21,7 @@ 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.ProcessInstance; import org.activiti.engine.runtime.ProcessInstanceQuery; import org.activiti.engine.task.Task; import org.activiti.engine.task.TaskQuery; @@ -260,6 +261,7 @@ public class BusProcessNewServiceImpl extends ServiceImpl busProcessNewQueryWrapper = new QueryWrapper<>(); busProcessNewQueryWrapper.eq("PRC_NAME",prcName); List busProcessNews = baseMapper.selectList(busProcessNewQueryWrapper); + String log = ""; if(!busProcessNews.isEmpty()){ for (BusProcessNew newData:busProcessNews){ //判断是否是同一条企标计划 @@ -272,21 +274,30 @@ public class BusProcessNewServiceImpl extends ServiceImpl busProcessNews){ From 7de0ae810c53185fef47a3efe634a0158291a8eb Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Mon, 15 May 2023 16:37:59 +0800 Subject: [PATCH 5/7] =?UTF-8?q?OA=20=E6=94=BE=E5=BC=80=20=E6=96=B9?= =?UTF-8?q?=E4=BE=BF=E9=83=A8=E7=BD=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/BusProcessNewServiceImpl.java | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) 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 41a253a1..592c82c8 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 @@ -272,15 +272,24 @@ public class BusProcessNewServiceImpl extends ServiceImpl Date: Mon, 15 May 2023 16:38:37 +0800 Subject: [PATCH 6/7] =?UTF-8?q?OA=20=E6=94=BE=E5=BC=80=20=E6=96=B9?= =?UTF-8?q?=E4=BE=BF=E9=83=A8=E7=BD=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/BusProcessNewServiceImpl.java | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) 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 592c82c8..d7e8d0b9 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 @@ -272,17 +272,15 @@ public class BusProcessNewServiceImpl extends ServiceImpl Date: Mon, 15 May 2023 17:28:35 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datas/service/impl/BusProcessNewServiceImpl.java | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) 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 d7e8d0b9..fee4f983 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 @@ -277,11 +277,7 @@ public class BusProcessNewServiceImpl extends ServiceImpl