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/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"); } 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); }