FT/foton-wkflow-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
super_liu
2021-10-14 14:44:23 +08:00
parent b3311d58fe f33b4f8f20
commit 2246c07b3f
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/DataList.java
+2
View File
@@ -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> sarStandProjectLibraries;
public void setUname(String uname) {
src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPDepartLeaderAfter.java
+6 -2
View File
@@ -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();
}
src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPffresPersonAfter.java
+1 -1
View File
@@ -144,6 +144,7 @@ public class PEPffresPersonAfter implements TaskListener {
PEPDTO re = new PEPDTO();
BeanUtils.copyProperties(res, re);
List<Step3DTO> mis = new ArrayList<>();
mis.add(JSONObject.parseObject(String.valueOf(j), Step3DTO.class));
re.setStep3DTOS(mis);
List<DataList> 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);
}
}
}