From c0f57154a0b9fa1242e40755b9220b10cb2eac60 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 20 Dec 2021 16:21:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=A3=E8=AF=BB=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=8F=91=E8=B5=B7=E8=8A=82=E7=82=B9=20=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=E5=90=8E=20=E7=AC=AC=E4=BA=8C=E6=AD=A5=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/standardRead/ResolveAfter.java | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java index 25b5dea8..dfcc5f85 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java @@ -86,21 +86,21 @@ public class ResolveAfter implements TaskListener{ one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); } - // 存储当前节点意见 - BusProcessNew busProcessNew = new BusProcessNew(); - busProcessNew.setMsgType("clause"); - busProcessNew.setPId(delegateTask.getProcessInstanceId()); - busProcessNew.setMesg(object.toJSONString()); - busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); - busProcessNew.setTaskId(delegateTask.getId()); - busProcessNew.setCommitText(object.getString("commentText")); - busProcessNew.setFinishFlag("0"); - busProcessNew.setTaskInfo(delegateTask.getName()); - busBean.save(busProcessNew); +// // 存储当前节点意见 +// BusProcessNew busProcessNew = new BusProcessNew(); +// busProcessNew.setMsgType("clause"); +// busProcessNew.setPId(delegateTask.getProcessInstanceId()); +// busProcessNew.setMesg(object.toJSONString()); +// busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); +// busProcessNew.setTaskId(delegateTask.getId()); +// busProcessNew.setCommitText(object.getString("commentText")); +// busProcessNew.setFinishFlag("0"); +// busProcessNew.setTaskInfo(delegateTask.getName()); +// busBean.save(busProcessNew); if(nextUserList != null && !nextUserList.isEmpty()){ for(String nextUser : nextUserList){ //2次 - List listRes = userGroupMap.get(nextUser); - object.put("itemList", JSON.toJSONString(listRes)); +// List listRes = userGroupMap.get(nextUser); +// object.put("itemList", JSON.toJSONString(listRes)); BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); From 8da4f77a8f45a43e06897d1b3a7d465c184eb6aa Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 20 Dec 2021 18:04:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=B4=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PEPmanagerApproveAfter.java | 37 +------------------ 1 file changed, 1 insertion(+), 36 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPmanagerApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPmanagerApproveAfter.java index fa27c72e..b0759d5d 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPmanagerApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPmanagerApproveAfter.java @@ -77,42 +77,7 @@ public class PEPmanagerApproveAfter implements TaskListener { for (DataList da : dataList) { PEPres pePres=new PEPres(); List pepdtos=new ArrayList<>(); - for (SarStandProjectLibraries sa:da.getSarStandProjectLibraries()) { - numberWithId.put(sa.getProjectNumber(),sa.getId()); - for (BreakdownList breakdownList1:breakdownList) { - //造数据 - //项目 - PEPDTO res = new PEPDTO(); - BeanUtils.copyProperties(pepdto, res); - List dataLists = new ArrayList<>(); - DataList dataList1 = new DataList(); - List list = new ArrayList<>(); - SarStandProjectLibraries libraries = new SarStandProjectLibraries(); - BeanUtils.copyProperties(sa, libraries); - res.setSarStandProjectLibraries(libraries); - list.add(sa); - dataList1.setSarStandProjectLibraries(list); - dataLists.add(dataList1); - res.setDataList(dataLists); - //标准 数据 - BreakdownList breakdownList2 = new BreakdownList(); - BeanUtils.copyProperties(breakdownList1, breakdownList2); - List breakdownLists = new ArrayList<>(); - breakdownLists.add(breakdownList2); - res.setBreakdownList(breakdownLists); - res.setCertifiedEngineerName(object.getString("certifiedEngineerName")); - res.setQualityEngineerName(object.getString("qualityEngineerName")); - //存储终点数据 - res.setDistributePerson(da.getDistributePerson()); - res.setDistributePersonId(da.getDistributePersonId()); - res.setUname(da.getUname()); - res.setProjectManager(da.getProjectManager()); - //时间 - res.setXCXSSRQ(breakdownList1.getXcxssrq()); - res.setZCCSSRQ(breakdownList1.getZccssrq()); - pepdtos.add(res); - } - } + pepdtos.add(pepdto); pePres.setPepdtos(pepdtos); map.put(da.getDistributePersonId(),pePres); // 处理分发责任人