From a7a4d7f3b6842da6a6e3adf912d1c562917f50fe Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 16 Sep 2021 17:46:02 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E6=B5=81=E7=A8=8B!!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StandardSurvey/SelectResponsibleUserAfter.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SelectResponsibleUserAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SelectResponsibleUserAfter.java index 111378f9..166eebab 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SelectResponsibleUserAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SelectResponsibleUserAfter.java @@ -58,7 +58,11 @@ public class SelectResponsibleUserAfter implements TaskListener { } delegateTask.setVariable("responUserList",responUserList); - delegateTask.setVariable("responUserLists",strings); + if (null == delegateTask.getVariable("responUserLists",List.class)){ + delegateTask.setVariable("responUserLists",strings); + }else { + delegateTask.getVariable("responUserLists", List.class).addAll(strings); + } delegateTask.setVariable("datas",map); @@ -101,7 +105,7 @@ public class SelectResponsibleUserAfter implements TaskListener { count++; delegateTask.setVariable("selectResponCount",count); - if(count>=delegateTask.getVariable("dockUserList",List.class).size()){ +// if(count>=delegateTask.getVariable("dockUserList",List.class).size()){ if(!responUserList.isEmpty()){ for (int i = 0; i < responUserList.size(); i++) { JSONObject jsonObject = responUserList.getJSONObject(i); @@ -116,7 +120,7 @@ public class SelectResponsibleUserAfter implements TaskListener { busProcessNewNext.setPrcName(prcName); busBean.save(busProcessNewNext); } - } +// } } // throw new ActivitiException("dahsdgadiauhfugauyfgqffiygv"); } From 42ab165dddff1a435aeab142f540ee1bac055c14 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 16 Sep 2021 21:57:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B=EF=BC=81=EF=BC=81=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ydw/bat/wkflow/business_main/datas/dto/BreakdownList.java | 2 ++ .../com/ydw/bat/wkflow/business_main/datas/dto/Step3DTO.java | 3 +++ .../projectEvaluationProcess/PEPmanagerApproveAfter.java | 2 -- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/BreakdownList.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/BreakdownList.java index c1f8dc45..01b879d3 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/BreakdownList.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/BreakdownList.java @@ -26,6 +26,8 @@ public class BreakdownList { private String busStandCover; private String responsibleUnit; private String responsibleEngineer; + private String technicalRequir; + private String changePoint; @JsonFormat( pattern = "yyyy-MM-dd HH:mm:ss") private Date xcxssrq; @JsonFormat( pattern = "yyyy-MM-dd HH:mm:ss") diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/Step3DTO.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/Step3DTO.java index 08f03c41..f14718d8 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/Step3DTO.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/Step3DTO.java @@ -41,4 +41,7 @@ public class Step3DTO { private String standardInfo; private String typeId; + private String technicalRequir; + private String changePoint; + } \ No newline at end of file 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 8c852d6b..79b49b58 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 @@ -106,9 +106,7 @@ public class PEPmanagerApproveAfter implements TaskListener { res.setUname(da.getUname()); res.setProjectManager(da.getProjectManager()); //时间 -// res.setXCXSSRQ(String.valueOf(delegateTask.getVariable("XCXSSRQ"))); res.setXCXSSRQ(breakdownList1.getXcxssrq()); -// res.setZCCSSRQ(String.valueOf(delegateTask.getVariable("ZCCSSRQ"))); res.setZCCSSRQ(breakdownList1.getZccssrq()); pepdtos.add(res); }