From fa7e3353dedcfd802c48afc655eafeb64de2cfae Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 13 Oct 2021 21:12:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84=E8=AF=84?= =?UTF-8?q?=E4=BC=B0=E6=B5=81=E7=A8=8B-=E6=A0=87=E5=87=86=E7=BB=B4?= =?UTF-8?q?=E5=BA=A6=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ydw/bat/wkflow/business_main/datas/dto/DataList.java | 2 ++ .../projectEvaluationProcess/PEPDepartLeaderAfter.java | 8 ++++++-- .../projectEvaluationProcess/PEPffresPersonAfter.java | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/DataList.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/DataList.java index 0c5945cc..f64ca260 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/DataList.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/DataList.java @@ -51,6 +51,8 @@ public class DataList { private String zcCountermeasures; private String responsibleEngineer; private String zcComplianceReasons; + private String technicalRequir; + private String changePoint; private List sarStandProjectLibraries; public void setUname(String uname) { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPDepartLeaderAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPDepartLeaderAfter.java index e8233efe..f51ae55d 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPDepartLeaderAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPDepartLeaderAfter.java @@ -129,8 +129,12 @@ public class PEPDepartLeaderAfter implements TaskListener { sarStandard.setResearchNonCompliance(object1.getString("noCompliance")); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); try { - sarStandard.setResearchImplementationTime(simpleDateFormat.parse(String.valueOf(delegateTask.getVariable("XCXSSRQ")))); - sarStandard.setProductionImplementationTime(simpleDateFormat.parse(String.valueOf(delegateTask.getVariable("ZCCSSRQ")))); + if (null!=delegateTask.getVariable("XCXSSRQ")) { + sarStandard.setResearchImplementationTime(simpleDateFormat.parse(String.valueOf(delegateTask.getVariable("XCXSSRQ")))); + } + if (null!=delegateTask.getVariable("ZCCSSRQ")) { + sarStandard.setProductionImplementationTime(simpleDateFormat.parse(String.valueOf(delegateTask.getVariable("ZCCSSRQ")))); + } } catch (ParseException e) { e.printStackTrace(); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPffresPersonAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPffresPersonAfter.java index f1de19b5..55f10b37 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPffresPersonAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPffresPersonAfter.java @@ -144,6 +144,7 @@ public class PEPffresPersonAfter implements TaskListener { PEPDTO re = new PEPDTO(); BeanUtils.copyProperties(res, re); List mis = new ArrayList<>(); + mis.add(JSONObject.parseObject(String.valueOf(j), Step3DTO.class)); re.setStep3DTOS(mis); List dataLists = new ArrayList<>(); DataList list = JSONObject.parseObject(String.valueOf(dataList.get(i)), DataList.class); @@ -175,5 +176,4 @@ public class PEPffresPersonAfter implements TaskListener { delegateTask.getVariable("CPXpeoples", List.class).addAll(CPX); } } - } \ No newline at end of file