From 0f322ea42a55807079d73ac6c9c9cb5676185400 Mon Sep 17 00:00:00 2001 From: dingbingqing Date: Tue, 13 Dec 2022 09:32:14 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=96=B9=E6=B3=95=20/g?= =?UTF-8?q?et=5Flist=5Fby=5Finstance=20=E5=B7=B2=E5=8A=9E=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E4=B8=AD=E7=9A=84=E6=B1=87=E6=80=BB=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/TaskController.java | 99 +++++++++++++++++++ 1 file changed, 99 insertions(+) diff --git a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java index 3a3fcdfd..edbb0dad 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java @@ -179,4 +179,103 @@ public class TaskController { } return list; } + @ApiOperation(value = "流程实例汇总列表") + @ApiImplicitParam(name = "prcNum", value = "流程实例id") + @GetMapping("/get_gather_by_instance") + public List> get_gather_by_instance(String prcNum,String sortWord,String shunxu) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("PRC_NUM",prcNum); + BusProcessName one = iBusProcessNameService.getOne(queryWrapper); + HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery() + .processInstanceId(one.getPrcId()).orderByHistoricTaskInstanceEndTime().asc(); + List list2 = historicTaskInstanceQuery.list(); + List middle =new ArrayList<>(); + list2.forEach(historicTaskInstance -> { + if (null==historicTaskInstance.getEndTime()){ + middle.add(historicTaskInstance); + } + }); + list2.removeAll(middle); + list2.addAll(middle); + List> list = ActivitiTools.turnHistoricTaskInstance(list2); + for (Map historicTaskInstance : list) { +// if(ChkUtil.isNull(historicTaskInstance.get("assignee"))) { +// continue; +// } + //需要修改 根据当前表结构查询 +// Map map = jt.queryForMap("select t.USR_NAME from view_t_au_usr t where t.OBJECT_ID=?", historicTaskInstance.get("assignee")); +// if(ChkUtil.isNotNull(map)) { +// historicTaskInstance.put("assignee", map.get("USR_NAME")); +// } + if(StringUtils.isNotBlank(one.getId())){ + historicTaskInstance.put("bpnId",one.getId()); + } + if(ChkUtil.isNull(historicTaskInstance.get("assignee"))) { +// ResponseMessage> listUser = lawsUserInfoService.getManagerByOrgIdNew("企业标准管理工程师"); + ResponseMessage> listUser = new ResponseMessage<>(); + if(false){ + List qbgcs = new ArrayList<>(); + for (OrgEO orgEO : listUser.getData()) { + qbgcs.add(orgEO.getUserName()); + } + String str= StringUtils.join(qbgcs, ","); + historicTaskInstance.put("assignee", str); + } + }else{ + ResponseMessage assignee = lawsUserInfoService.getById(historicTaskInstance.get("assignee").toString()); + + if(assignee.getData()!=null){ + historicTaskInstance.put("assignee", assignee.getData().getUname()); + historicTaskInstance.put("assigneeId", assignee.getData().getUsid()); + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("TASK_ID",historicTaskInstance.get("id")); + queryWrapper2.orderByDesc("CREATE_TIME"); + List list1 = iBusProcessEntrustService.list(queryWrapper2); + String str = ""; + if(list1.size()>0){ + ResponseMessage assignee1 = lawsUserInfoService.getById(list1.get(0).getUserId()); + historicTaskInstance.put("assignee", assignee.getData().getUname()+"("+assignee1.getData().getUname()+" 转办)"); + } + } + } + historicTaskInstance.put("prcType",one.getPrcType()); + historicTaskInstance.put("prcName",one.getPrcName()); + historicTaskInstance.put("prcNum",one.getPrcNum()); + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("TASK_ID",historicTaskInstance.get("id")); + queryWrapper1.eq("TASK_INFO",historicTaskInstance.get("name")); + queryWrapper1.isNotNull("COMMIT_TEXT"); + List list1 = iBusProcessNewService.list(queryWrapper1); + if(!list1.isEmpty()){ + historicTaskInstance.put("comment",list1.get(0).getCommitFlag()); + historicTaskInstance.put("commentText",list1.get(0).getCommitText()); + }else{ + historicTaskInstance.put("comment",""); + historicTaskInstance.put("commentText",""); + } + + } + if(StringUtils.isNotBlank(sortWord)){ + Collections.sort(list, new Comparator>() { + public int compare(Map o1, Map o2) { + String id1=""; + String id2=""; + if(sortWord.equals("startTime")){ + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + id1 = df.format(o1.get(sortWord)); + id2 = df.format(o2.get(sortWord)); + }else{ + id1 = (String) o1.get(sortWord); + id2 = (String) o2.get(sortWord); + } + if(shunxu.equals("desc")){ + return id2.compareTo(id1); + }else{ + return id1.compareTo(id2); + } + } + }); + } + return list; + } } From 0ff903895c3b1e5a48c2c027f60ba8d11379bc65 Mon Sep 17 00:00:00 2001 From: dingbingqing Date: Tue, 13 Dec 2022 14:18:43 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=96=B9=E6=B3=95=20/g?= =?UTF-8?q?et=5Fgather=5Fby=5Finstance=20=E5=B7=B2=E5=8A=9E=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E4=B8=AD=E7=9A=84=E6=B1=87=E6=80=BB=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=20=E4=B8=AD=E7=9A=84=E6=98=AF=E5=90=A6=E5=8F=AF=E6=B1=87?= =?UTF-8?q?=E6=80=BB=E7=9A=84=E5=8A=9F=E8=83=BD=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/TaskController.java | 59 ++++++++++++++++++- 1 file changed, 58 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java index edbb0dad..969015ec 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java @@ -185,6 +185,7 @@ public class TaskController { public List> get_gather_by_instance(String prcNum,String sortWord,String shunxu) { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("PRC_NUM",prcNum); + Boolean isGather=false; BusProcessName one = iBusProcessNameService.getOne(queryWrapper); HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery() .processInstanceId(one.getPrcId()).orderByHistoricTaskInstanceEndTime().asc(); @@ -253,7 +254,59 @@ public class TaskController { historicTaskInstance.put("comment",""); historicTaskInstance.put("commentText",""); } - + //判断是否可汇总功能 + String prcType=(String)historicTaskInstance.get("prcType"); + String name=(String)historicTaskInstance.get("name"); + String endTime=(String)historicTaskInstance.get("endTime"); + if (prcType.equals("1") && name.equals("起草") && !endTime.isEmpty()) { + // 标准入库流程数据 + isGather=true; + }else if(prcType == "buss1"&& name.equals("批准") && !endTime.isEmpty()){ + //企标入库 + isGather=true; + }else if(prcType == "buss2"&& name.equals("意见汇总修订") && !endTime.isEmpty()){ + //企标入库 + isGather=true; + }else if(prcType == "buss3"&& name.equals("汇总") && !endTime.isEmpty()){ + //企标复审 + isGather=true; + }else if(prcType == "4"&& name.equals("起草") && !endTime.isEmpty()){ + //标准清单发布流程数据 + isGather=true; + }else if (prcType == "5"&& name.equals("批准") && !endTime.isEmpty()){ + //标准项目合规评估 + isGather=true; + }else if(prcType == "6"&& name.equals("批准") && !endTime.isEmpty()){ + //标准项目合规评估 项目维度 + isGather=true; + } else if (prcType == "8"&& name.equals("合规排查(上传合规举证材料)") && !endTime.isEmpty()) { + // 未符合项整改 + isGather=true; + } else if(prcType == "9" && name.equals("批准") && !endTime.isEmpty()){ + // 标准解读流程 + isGather=true; + }else if(prcType == "2"&& name.equals("调研结果处理") && !endTime.isEmpty()){ + //标准调研流程 + isGather=true; + }else if(prcType == "3"&& name.equals("意见处理") && !endTime.isEmpty()){ + //标准征求意见 + isGather=true; + }else if(prcType == "10"&& name.equals("批准") && !endTime.isEmpty()){ + //项目清单确认 + isGather=true; + }else if(prcType == "24"&& name.equals("起草人修改标准状态") && !endTime.isEmpty()){ + //企标废止 + isGather=true; + }else if(prcType == "25"&& name.equals("起草") && !endTime.isEmpty()){ + //企标制修订计划管控 + isGather=true; + }else if(prcType == "26"&& name.equals("起草") && !endTime.isEmpty()){ + //企标制修订立项计划 + isGather=true; + } else if(prcType == "23"&& name.equals("汇总") && !endTime.isEmpty()){ + //企标复审 + isGather=true; + } } if(StringUtils.isNotBlank(sortWord)){ Collections.sort(list, new Comparator>() { @@ -276,6 +329,10 @@ public class TaskController { } }); } + Map m=new HashMap<>(); + m.put("isGather",isGather); + list.add(m); return list; } + } From 447b2cabb72c55958c18d007a0ec031284b4e2d3 Mon Sep 17 00:00:00 2001 From: dingbingqing Date: Tue, 13 Dec 2022 16:47:46 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=96=B9=E6=B3=95=20/g?= =?UTF-8?q?et=5Fgather=5Fby=5Finstance=20=E5=B7=B2=E5=8A=9E=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E4=B8=AD=E7=9A=84=E6=B1=87=E6=80=BB=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=20=E4=B8=AD=E7=9A=84=E6=98=AF=E5=90=A6=E5=8F=AF=E6=B1=87?= =?UTF-8?q?=E6=80=BB=E7=9A=84=E5=8A=9F=E8=83=BD=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/TaskController.java | 39 +++++++++---------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java index 969015ec..9a269232 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java @@ -3,7 +3,6 @@ package com.ydw.bat.wkflow.business_activiti.task; import java.text.SimpleDateFormat; import java.util.*; -import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; import com.ydw.bat.wkflow.business_main.datas.entity.*; @@ -255,55 +254,55 @@ public class TaskController { historicTaskInstance.put("commentText",""); } //判断是否可汇总功能 - String prcType=(String)historicTaskInstance.get("prcType"); - String name=(String)historicTaskInstance.get("name"); - String endTime=(String)historicTaskInstance.get("endTime"); - if (prcType.equals("1") && name.equals("起草") && !endTime.isEmpty()) { + String prcType=historicTaskInstance.get("prcType").toString(); + String name=historicTaskInstance.get("name").toString(); + Boolean endTime=historicTaskInstance.get("endTime")!=null; + if (prcType.equals("1") && name.equals("起草") && endTime) { // 标准入库流程数据 isGather=true; - }else if(prcType == "buss1"&& name.equals("批准") && !endTime.isEmpty()){ + }else if(prcType == "buss1"&& name.equals("批准") && endTime){ //企标入库 isGather=true; - }else if(prcType == "buss2"&& name.equals("意见汇总修订") && !endTime.isEmpty()){ + }else if(prcType == "buss2"&& name.equals("意见汇总修订") && endTime){ //企标入库 isGather=true; - }else if(prcType == "buss3"&& name.equals("汇总") && !endTime.isEmpty()){ + }else if(prcType == "buss3"&& name.equals("汇总") && endTime){ //企标复审 isGather=true; - }else if(prcType == "4"&& name.equals("起草") && !endTime.isEmpty()){ + }else if(prcType == "4"&& name.equals("起草") && endTime){ //标准清单发布流程数据 isGather=true; - }else if (prcType == "5"&& name.equals("批准") && !endTime.isEmpty()){ + }else if (prcType == "5"&& name.equals("批准") && endTime){ //标准项目合规评估 isGather=true; - }else if(prcType == "6"&& name.equals("批准") && !endTime.isEmpty()){ + }else if(prcType == "6"&& name.equals("批准") && endTime){ //标准项目合规评估 项目维度 isGather=true; - } else if (prcType == "8"&& name.equals("合规排查(上传合规举证材料)") && !endTime.isEmpty()) { + } else if (prcType == "8"&& name.equals("合规排查(上传合规举证材料)") && endTime) { // 未符合项整改 isGather=true; - } else if(prcType == "9" && name.equals("批准") && !endTime.isEmpty()){ + } else if(prcType == "9" && name.equals("批准") && endTime){ // 标准解读流程 isGather=true; - }else if(prcType == "2"&& name.equals("调研结果处理") && !endTime.isEmpty()){ + }else if(prcType == "2"&& name.equals("调研结果处理") && endTime){ //标准调研流程 isGather=true; - }else if(prcType == "3"&& name.equals("意见处理") && !endTime.isEmpty()){ + }else if(prcType == "3"&& name.equals("意见处理") && endTime){ //标准征求意见 isGather=true; - }else if(prcType == "10"&& name.equals("批准") && !endTime.isEmpty()){ + }else if(prcType == "10"&& name.equals("清单发布") && endTime){ //项目清单确认 isGather=true; - }else if(prcType == "24"&& name.equals("起草人修改标准状态") && !endTime.isEmpty()){ + }else if(prcType == "24"&& name.equals("起草人修改标准状态") && endTime){ //企标废止 isGather=true; - }else if(prcType == "25"&& name.equals("起草") && !endTime.isEmpty()){ + }else if(prcType == "25"&& name.equals("起草") && endTime){ //企标制修订计划管控 isGather=true; - }else if(prcType == "26"&& name.equals("起草") && !endTime.isEmpty()){ + }else if(prcType == "26"&& name.equals("起草") && endTime){ //企标制修订立项计划 isGather=true; - } else if(prcType == "23"&& name.equals("汇总") && !endTime.isEmpty()){ + } else if(prcType == "23"&& name.equals("汇总") && endTime){ //企标复审 isGather=true; } From befae7ba9b4c49e0beac3ba9b3734d189f82a4f5 Mon Sep 17 00:00:00 2001 From: dingbingqing Date: Tue, 13 Dec 2022 17:21:10 +0800 Subject: [PATCH 04/12] =?UTF-8?q?/get=5Fgather=5Fby=5Finstance=20=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=88=A4=E6=96=ADbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/TaskController.java | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java index 9a269232..ddf6b720 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java @@ -260,49 +260,49 @@ public class TaskController { if (prcType.equals("1") && name.equals("起草") && endTime) { // 标准入库流程数据 isGather=true; - }else if(prcType == "buss1"&& name.equals("批准") && endTime){ + }else if(prcType.equals("buss1")&& name.equals("批准") && endTime){ //企标入库 isGather=true; - }else if(prcType == "buss2"&& name.equals("意见汇总修订") && endTime){ + }else if(prcType.equals("buss2")&& name.equals("意见汇总修订") && endTime){ //企标入库 isGather=true; - }else if(prcType == "buss3"&& name.equals("汇总") && endTime){ + }else if(prcType.equals("buss3")&& name.equals("汇总") && endTime){ //企标复审 isGather=true; - }else if(prcType == "4"&& name.equals("起草") && endTime){ + }else if(prcType.equals("4")&& name.equals("起草") && endTime){ //标准清单发布流程数据 isGather=true; - }else if (prcType == "5"&& name.equals("批准") && endTime){ + }else if (prcType.equals("5")&& name.equals("批准") && endTime){ //标准项目合规评估 isGather=true; - }else if(prcType == "6"&& name.equals("批准") && endTime){ + }else if(prcType.equals("6")&& name.equals("批准") && endTime){ //标准项目合规评估 项目维度 isGather=true; - } else if (prcType == "8"&& name.equals("合规排查(上传合规举证材料)") && endTime) { + } else if (prcType.equals("8")&& name.equals("合规排查(上传合规举证材料)") && endTime) { // 未符合项整改 isGather=true; - } else if(prcType == "9" && name.equals("批准") && endTime){ + } else if(prcType.equals("9") && name.equals("批准") && endTime){ // 标准解读流程 isGather=true; - }else if(prcType == "2"&& name.equals("调研结果处理") && endTime){ + }else if(prcType.equals("2")&& name.equals("调研结果处理") && endTime){ //标准调研流程 isGather=true; - }else if(prcType == "3"&& name.equals("意见处理") && endTime){ + }else if(prcType.equals("3")&& name.equals("意见处理") && endTime){ //标准征求意见 isGather=true; - }else if(prcType == "10"&& name.equals("清单发布") && endTime){ + }else if(prcType.equals("10")&& name.equals("清单发布") && endTime){ //项目清单确认 isGather=true; - }else if(prcType == "24"&& name.equals("起草人修改标准状态") && endTime){ + }else if(prcType.equals("24")&& name.equals("起草人修改标准状态") && endTime){ //企标废止 isGather=true; - }else if(prcType == "25"&& name.equals("起草") && endTime){ + }else if(prcType.equals("25")&& name.equals("起草") && endTime){ //企标制修订计划管控 isGather=true; - }else if(prcType == "26"&& name.equals("起草") && endTime){ + }else if(prcType.equals("26")&& name.equals("起草") && endTime){ //企标制修订立项计划 isGather=true; - } else if(prcType == "23"&& name.equals("汇总") && endTime){ + } else if(prcType.equals("23")&& name.equals("汇总") && endTime){ //企标复审 isGather=true; } From a3cbb25e4917ebcbca583c11000781a220e89a70 Mon Sep 17 00:00:00 2001 From: dingbingqing Date: Tue, 13 Dec 2022 17:52:34 +0800 Subject: [PATCH 05/12] =?UTF-8?q?/get=5Fgather=5Fby=5Finstance=20=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E6=B1=87=E6=80=BB=E6=95=B0=E7=BB=84=E4=B8=8B=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/TaskController.java | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java index ddf6b720..45cb3ede 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java @@ -185,6 +185,7 @@ public class TaskController { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("PRC_NUM",prcNum); Boolean isGather=false; + Integer index=0; BusProcessName one = iBusProcessNameService.getOne(queryWrapper); HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery() .processInstanceId(one.getPrcId()).orderByHistoricTaskInstanceEndTime().asc(); @@ -198,7 +199,8 @@ public class TaskController { list2.removeAll(middle); list2.addAll(middle); List> list = ActivitiTools.turnHistoricTaskInstance(list2); - for (Map historicTaskInstance : list) { + for(int i=0;i historicTaskInstance= list.get(i); // if(ChkUtil.isNull(historicTaskInstance.get("assignee"))) { // continue; // } @@ -260,51 +262,67 @@ public class TaskController { if (prcType.equals("1") && name.equals("起草") && endTime) { // 标准入库流程数据 isGather=true; + index=i; }else if(prcType.equals("buss1")&& name.equals("批准") && endTime){ //企标入库 isGather=true; + index=i; }else if(prcType.equals("buss2")&& name.equals("意见汇总修订") && endTime){ //企标入库 isGather=true; + index=i; }else if(prcType.equals("buss3")&& name.equals("汇总") && endTime){ //企标复审 isGather=true; + index=i; }else if(prcType.equals("4")&& name.equals("起草") && endTime){ //标准清单发布流程数据 isGather=true; + index=i; }else if (prcType.equals("5")&& name.equals("批准") && endTime){ //标准项目合规评估 isGather=true; + index=i; }else if(prcType.equals("6")&& name.equals("批准") && endTime){ //标准项目合规评估 项目维度 isGather=true; + index=i; } else if (prcType.equals("8")&& name.equals("合规排查(上传合规举证材料)") && endTime) { // 未符合项整改 isGather=true; + index=i; } else if(prcType.equals("9") && name.equals("批准") && endTime){ // 标准解读流程 isGather=true; + index=i; }else if(prcType.equals("2")&& name.equals("调研结果处理") && endTime){ //标准调研流程 isGather=true; + index=i; }else if(prcType.equals("3")&& name.equals("意见处理") && endTime){ //标准征求意见 isGather=true; + index=i; }else if(prcType.equals("10")&& name.equals("清单发布") && endTime){ //项目清单确认 isGather=true; + index=i; }else if(prcType.equals("24")&& name.equals("起草人修改标准状态") && endTime){ //企标废止 isGather=true; + index=i; }else if(prcType.equals("25")&& name.equals("起草") && endTime){ //企标制修订计划管控 isGather=true; + index=i; }else if(prcType.equals("26")&& name.equals("起草") && endTime){ //企标制修订立项计划 isGather=true; + index=i; } else if(prcType.equals("23")&& name.equals("汇总") && endTime){ //企标复审 isGather=true; + index=i; } } if(StringUtils.isNotBlank(sortWord)){ @@ -330,6 +348,7 @@ public class TaskController { } Map m=new HashMap<>(); m.put("isGather",isGather); + m.put("index",index); list.add(m); return list; } From bc0584fb591f5048c4d01ace5b954aff0a5adc25 Mon Sep 17 00:00:00 2001 From: cuijiaming <1410452759@qq.com> Date: Wed, 14 Dec 2022 11:56:26 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B1=87=E6=80=BB?= =?UTF-8?q?=E6=8C=87=E5=AE=9A=E4=BB=BB=E5=8A=A1=E6=8E=A5=E5=8F=A3/queryTas?= =?UTF-8?q?kIndex?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/TodoTaskController.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) 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 33399637..818c1fef 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 @@ -1775,6 +1775,24 @@ public class TodoTaskController extends BaseAction { } } + /** + * 查询第index步 + * @param bpnId + * @return + */ + @ApiOperation(value = "查询index步") + @GetMapping("/queryTaskIndex") + public BusProcessName queryTaskIndex(String bpnId,Integer index) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ID", bpnId); + List list = iBusProcessNameService.list(queryWrapper); + if (list.size() >= index) { + return list.get(index); + } else { + return null; + } + } + /** * 查询草稿 * From a9b95d4d5d87881003817f14285a73803da0b4d1 Mon Sep 17 00:00:00 2001 From: dingbingqing Date: Wed, 14 Dec 2022 15:09:05 +0800 Subject: [PATCH 07/12] =?UTF-8?q?/queryTaskIndex=E6=9F=A5=E8=AF=A2bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bat/wkflow/business_activiti/task/TodoTaskController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 818c1fef..4d40d843 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 @@ -1786,7 +1786,7 @@ public class TodoTaskController extends BaseAction { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ID", bpnId); List list = iBusProcessNameService.list(queryWrapper); - if (list.size() >= index) { + if (list.size() > 0) { return list.get(index); } else { return null; From 334bd6ddb305520124bc8fe9d9fe008d4170108d Mon Sep 17 00:00:00 2001 From: dingbingqing Date: Thu, 15 Dec 2022 09:56:55 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9/queryTaskIndex?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/TodoTaskController.java | 45 +++++++++++++++---- 1 file changed, 37 insertions(+), 8 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 4d40d843..8a40d987 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 @@ -1777,20 +1777,49 @@ public class TodoTaskController extends BaseAction { /** * 查询第index步 - * @param bpnId + * @param prcId * @return */ - @ApiOperation(value = "查询index步") + @ApiOperation(value = "查询汇总项") @GetMapping("/queryTaskIndex") - public BusProcessName queryTaskIndex(String bpnId,Integer index) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("ID", bpnId); - List list = iBusProcessNameService.list(queryWrapper); - if (list.size() > 0) { - return list.get(index); + public BusProcessNew queryTaskIndex(String prcId) { + QueryWrapper q=new QueryWrapper<>(); + List list = iBusProcessNewService.list(q.eq("P_ID", prcId)); + if (list.size()>0) { + for (BusProcessNew bpn:list) { + if (bpn.getTaskInfo().equals("起草")) { + // 标准入库流程数据 + return bpn; + }else if(bpn.getTaskInfo().equals("批准")){ + //企标入库 + return bpn; + }else if(bpn.getTaskInfo().equals("意见汇总修订") ){ + //企标入库 + return bpn; + }else if(bpn.getTaskInfo().equals("汇总") ){ + //企标复审 + return bpn; + } else if (bpn.getTaskInfo().equals("合规排查(上传合规举证材料)") ) { + // 未符合项整改 + return bpn; + }else if(bpn.getTaskInfo().equals("调研结果处理") ){ + //标准调研流程 + return bpn; + }else if(bpn.getTaskInfo().equals("意见处理") ){ + //标准征求意见 + return bpn; + }else if(bpn.getTaskInfo().equals("清单发布") ){ + //项目清单确认 + return bpn; + }else if(bpn.getTaskInfo().equals("起草人修改标准状态") ) { + //企标废止 + return bpn; + } + } } else { return null; } + return null; } /** From 128ef8d69c61505848b1e28bde59b0371009e227 Mon Sep 17 00:00:00 2001 From: dingbingqing Date: Thu, 15 Dec 2022 14:56:19 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9/queryTaskIndex?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/TodoTaskController.java | 33 ++----------------- 1 file changed, 3 insertions(+), 30 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 8a40d987..67e121e1 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 @@ -1776,45 +1776,18 @@ public class TodoTaskController extends BaseAction { } /** - * 查询第index步 + * 查询 taskIds项 * @param prcId * @return */ @ApiOperation(value = "查询汇总项") @GetMapping("/queryTaskIndex") - public BusProcessNew queryTaskIndex(String prcId) { + public BusProcessNew queryTaskIndex(String prcId,String taskIds) { QueryWrapper q=new QueryWrapper<>(); List list = iBusProcessNewService.list(q.eq("P_ID", prcId)); if (list.size()>0) { for (BusProcessNew bpn:list) { - if (bpn.getTaskInfo().equals("起草")) { - // 标准入库流程数据 - return bpn; - }else if(bpn.getTaskInfo().equals("批准")){ - //企标入库 - return bpn; - }else if(bpn.getTaskInfo().equals("意见汇总修订") ){ - //企标入库 - return bpn; - }else if(bpn.getTaskInfo().equals("汇总") ){ - //企标复审 - return bpn; - } else if (bpn.getTaskInfo().equals("合规排查(上传合规举证材料)") ) { - // 未符合项整改 - return bpn; - }else if(bpn.getTaskInfo().equals("调研结果处理") ){ - //标准调研流程 - return bpn; - }else if(bpn.getTaskInfo().equals("意见处理") ){ - //标准征求意见 - return bpn; - }else if(bpn.getTaskInfo().equals("清单发布") ){ - //项目清单确认 - return bpn; - }else if(bpn.getTaskInfo().equals("起草人修改标准状态") ) { - //企标废止 - return bpn; - } + if (bpn.getTaskId().equals(taskIds)) return bpn; } } else { return null; From 83aa04531674bc68ec5688b25d05a321d31d6a71 Mon Sep 17 00:00:00 2001 From: dingbingqing Date: Thu, 15 Dec 2022 17:45:16 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9/get=5Fgather=5Fby=5Fin?= =?UTF-8?q?stance=E6=8E=A5=E5=8F=A3bug=20=E5=BD=93=E9=A9=B3=E5=9B=9E?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=B0=86=E6=97=A0=E6=B3=95=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E6=B1=87=E6=80=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/TaskController.java | 91 ++++++------------- 1 file changed, 26 insertions(+), 65 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java index 45cb3ede..fdb24080 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java @@ -185,7 +185,24 @@ public class TaskController { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("PRC_NUM",prcNum); Boolean isGather=false; - Integer index=0; + Integer index=-1; + Map typeDate=new HashMap<>(); + typeDate.put("1","起草");// 标准入库流程数据 + typeDate.put("buss1","批准");//企标入库 + typeDate.put("buss2","意见汇总修订");//企标入库 + typeDate.put("buss3","汇总");//企标复审 + typeDate.put("4","起草");//标准清单发布流程数据 + typeDate.put("5","批准");//标准项目合规评估 + typeDate.put("6","批准");//标准项目合规评估 项目维度 + typeDate.put("8","合规排查(上传合规举证材料)");// 未符合项整改 + typeDate.put("9","批准");// 标准解读流程 + typeDate.put("2","调研结果处理");//标准调研流程 + typeDate.put("3","意见处理");//标准征求意见 + typeDate.put("10","清单发布");//项目清单确认 + typeDate.put("24","起草人修改标准状态");//企标废止 + typeDate.put("25","起草");//企标制修订计划管控 + typeDate.put("26","起草");//企标制修订立项计划 + typeDate.put("23","汇总");//企标复审 BusProcessName one = iBusProcessNameService.getOne(queryWrapper); HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery() .processInstanceId(one.getPrcId()).orderByHistoricTaskInstanceEndTime().asc(); @@ -259,70 +276,14 @@ public class TaskController { String prcType=historicTaskInstance.get("prcType").toString(); String name=historicTaskInstance.get("name").toString(); Boolean endTime=historicTaskInstance.get("endTime")!=null; - if (prcType.equals("1") && name.equals("起草") && endTime) { - // 标准入库流程数据 - isGather=true; - index=i; - }else if(prcType.equals("buss1")&& name.equals("批准") && endTime){ - //企标入库 - isGather=true; - index=i; - }else if(prcType.equals("buss2")&& name.equals("意见汇总修订") && endTime){ - //企标入库 - isGather=true; - index=i; - }else if(prcType.equals("buss3")&& name.equals("汇总") && endTime){ - //企标复审 - isGather=true; - index=i; - }else if(prcType.equals("4")&& name.equals("起草") && endTime){ - //标准清单发布流程数据 - isGather=true; - index=i; - }else if (prcType.equals("5")&& name.equals("批准") && endTime){ - //标准项目合规评估 - isGather=true; - index=i; - }else if(prcType.equals("6")&& name.equals("批准") && endTime){ - //标准项目合规评估 项目维度 - isGather=true; - index=i; - } else if (prcType.equals("8")&& name.equals("合规排查(上传合规举证材料)") && endTime) { - // 未符合项整改 - isGather=true; - index=i; - } else if(prcType.equals("9") && name.equals("批准") && endTime){ - // 标准解读流程 - isGather=true; - index=i; - }else if(prcType.equals("2")&& name.equals("调研结果处理") && endTime){ - //标准调研流程 - isGather=true; - index=i; - }else if(prcType.equals("3")&& name.equals("意见处理") && endTime){ - //标准征求意见 - isGather=true; - index=i; - }else if(prcType.equals("10")&& name.equals("清单发布") && endTime){ - //项目清单确认 - isGather=true; - index=i; - }else if(prcType.equals("24")&& name.equals("起草人修改标准状态") && endTime){ - //企标废止 - isGather=true; - index=i; - }else if(prcType.equals("25")&& name.equals("起草") && endTime){ - //企标制修订计划管控 - isGather=true; - index=i; - }else if(prcType.equals("26")&& name.equals("起草") && endTime){ - //企标制修订立项计划 - isGather=true; - index=i; - } else if(prcType.equals("23")&& name.equals("汇总") && endTime){ - //企标复审 - isGather=true; - index=i; + if (typeDate.get(prcType).equals(name)) { + if(endTime) { + isGather = true; + index = i; + }else{ + isGather=false; + index=-1; + } } } if(StringUtils.isNotBlank(sortWord)){ From 9ad2d42bfa865c862c932fa2799a7822e53f032b Mon Sep 17 00:00:00 2001 From: dingbingqing Date: Fri, 23 Dec 2022 09:11:33 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E6=96=B0=E5=A2=9E/decodeDetail=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=20=E6=A0=87=E5=87=86=E8=A7=A3=E8=AF=BB=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E7=9A=84=E6=B1=87=E6=80=BB=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/TaskController.java | 36 +++++++------- .../task/TodoTaskController.java | 48 ++++++++++++++++++- 2 files changed, 65 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java index fdb24080..602178f3 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java @@ -186,23 +186,23 @@ public class TaskController { queryWrapper.eq("PRC_NUM",prcNum); Boolean isGather=false; Integer index=-1; - Map typeDate=new HashMap<>(); - typeDate.put("1","起草");// 标准入库流程数据 - typeDate.put("buss1","批准");//企标入库 - typeDate.put("buss2","意见汇总修订");//企标入库 - typeDate.put("buss3","汇总");//企标复审 - typeDate.put("4","起草");//标准清单发布流程数据 - typeDate.put("5","批准");//标准项目合规评估 - typeDate.put("6","批准");//标准项目合规评估 项目维度 - typeDate.put("8","合规排查(上传合规举证材料)");// 未符合项整改 - typeDate.put("9","批准");// 标准解读流程 - typeDate.put("2","调研结果处理");//标准调研流程 - typeDate.put("3","意见处理");//标准征求意见 - typeDate.put("10","清单发布");//项目清单确认 - typeDate.put("24","起草人修改标准状态");//企标废止 - typeDate.put("25","起草");//企标制修订计划管控 - typeDate.put("26","起草");//企标制修订立项计划 - typeDate.put("23","汇总");//企标复审 + Map typeData=new HashMap<>(); + typeData.put("1","起草");// 标准入库流程数据 + typeData.put("buss1","批准");//企标入库 + typeData.put("buss2","意见汇总修订");//企标入库 + typeData.put("buss3","汇总");//企标复审 + typeData.put("4","起草");//标准清单发布流程数据 + typeData.put("5","批准");//标准项目合规评估 + typeData.put("6","批准");//标准项目合规评估 项目维度 + typeData.put("8","合规排查(上传合规举证材料)");// 未符合项整改 + typeData.put("9","批准");// 标准解读流程 + typeData.put("2","调研结果处理");//标准调研流程 + typeData.put("3","意见处理");//标准征求意见 + typeData.put("10","清单发布");//项目清单确认 + typeData.put("24","起草人修改标准状态");//企标废止 + typeData.put("25","起草");//企标制修订计划管控 + typeData.put("26","起草");//企标制修订立项计划 + typeData.put("23","汇总");//企标复审 BusProcessName one = iBusProcessNameService.getOne(queryWrapper); HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery() .processInstanceId(one.getPrcId()).orderByHistoricTaskInstanceEndTime().asc(); @@ -276,7 +276,7 @@ public class TaskController { String prcType=historicTaskInstance.get("prcType").toString(); String name=historicTaskInstance.get("name").toString(); Boolean endTime=historicTaskInstance.get("endTime")!=null; - if (typeDate.get(prcType).equals(name)) { + if (typeData.get(prcType).equals(name)) { if(endTime) { isGather = true; index = i; 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 67e121e1..63e3d15c 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 @@ -597,7 +597,6 @@ public class TodoTaskController extends BaseAction { } } - JSONObject object3 = JSONObject.parseObject(list.get(0).getMesg()); JSONArray arr2 = new JSONArray(); object3.put("taskBreak", arr2); @@ -609,6 +608,7 @@ public class TodoTaskController extends BaseAction { long count = oaTaskExecService.count(wrapper); processNew.setCommitStatus(count); return processNew; + } /** @@ -1775,6 +1775,52 @@ public class TodoTaskController extends BaseAction { } } + + @ApiOperation(value = "解读流程汇总详情") + @GetMapping("/decodeDetail") + public BusProcessNew Detail(String taskIds, String pId) { + QueryWrapper q=new QueryWrapper<>(); + Map msgData =new HashMap<>(); + List nameData=new ArrayList<>(); + List listData = iBusProcessNewService.list(q.eq("P_ID", pId)); + for (BusProcessNew bpn:listData) { + if(bpn.getTaskInfo().equals("审核")){ + nameData.add(bpn.getUserId()); + msgData.put(bpn.getUserId(),JSONObject.parseObject(bpn.getMesg())); + } + } + JSONArray jsonArray=new JSONArray(); + for (String name:nameData) { + jsonArray.addAll(msgData.get(name).getJSONArray("itemList")); + } + List taskIdList = new ArrayList<>(Arrays.asList(taskIds.split(","))); + List list = iBusProcessNewService.findNoExecuteBusProcessNewForEnd(taskIdList); + if (list.isEmpty()) { + return null; + } + BusProcessNew processNew = new BusProcessNew(); + BeanUtils.copyProperties(list.get(0), processNew); + if(StringUtils.isNotBlank(pId)){ + List list2 = taskService.createTaskQuery().processInstanceId(pId).active().list(); + if(!list2.isEmpty()){ + processNew.setNowTaskInfo(list2.get(0).getName()); + } + } + + JSONObject object3 = JSONObject.parseObject(list.get(0).getMesg()); + JSONArray arr2 = new JSONArray(); + object3.put("taskBreak", arr2); + object3.put("itemList",jsonArray); + processNew.setMesg(object3.toJSONString()); + QueryWrapper wrapper = new QueryWrapper(); + wrapper.eq("TODO_ID",processNew.getId()); + wrapper.eq("EXEC_TYPE",2); + wrapper.eq("EXEC_STATUS",0); + long count = oaTaskExecService.count(wrapper); + processNew.setCommitStatus(count); + return processNew; + } + /** * 查询 taskIds项 * @param prcId From 36ad1374768d89de8887d8facf5cab7b9cd609b1 Mon Sep 17 00:00:00 2001 From: cuijiaming <1410452759@qq.com> Date: Tue, 27 Dec 2022 09:15:50 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E8=A7=A3=E8=AF=BB=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E6=B1=87=E6=80=BB=E6=8E=A5=E5=8F=A3=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wkflow/business_activiti/task/TodoTaskController.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 63e3d15c..bd898a0d 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 @@ -1784,7 +1784,12 @@ public class TodoTaskController extends BaseAction { List nameData=new ArrayList<>(); List listData = iBusProcessNewService.list(q.eq("P_ID", pId)); for (BusProcessNew bpn:listData) { - if(bpn.getTaskInfo().equals("审核")){ + + String mesg = bpn.getMesg(); + JSONObject object = JSONObject.parseObject(mesg); + String resolveFlag = object.getString("resolveFlag"); + + if(bpn.getTaskInfo().equals("审核")&&resolveFlag.equals("1")){ nameData.add(bpn.getUserId()); msgData.put(bpn.getUserId(),JSONObject.parseObject(bpn.getMesg())); }