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