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

标准合规评估结果流程 项目维度 字段修改

Browse Source
This commit is contained in:
Mr.Z
2021-08-13 13:53:09 +08:00
parent aed0913f86
commit e261b51849
2 changed files with 15 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/PCA/PCAdataList.java
+2
View File
@@ -45,5 +45,7 @@ public class PCAdataList {
private Date zcCompletionTime; private Date zcCompletionTime;
private Date completionTime; private Date completionTime;
private String zcComplianceReasons; private String zcComplianceReasons;
private String itemNum;
private String itemsName;
} }
src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAdlApproveAfter.java
+13 -3
View File
@@ -96,10 +96,17 @@ public class PCAdlApproveAfter implements TaskListener {
//111 //111
sarStandard.setProductionCompletionTime(pcAdataList.getZcCompletionTime()); sarStandard.setProductionCompletionTime(pcAdataList.getZcCompletionTime());
sarStandard.setProductionCountermeasures(pcAdataList.getZcCountermeasures()); sarStandard.setProductionCountermeasures(pcAdataList.getZcCountermeasures());
sarStandard.setProductionCompliance(pcAdataList.getZcNoCompliance()); sarStandard.setProductionCompliance(pcAdataList.getZcComplianceReasons());
sarStandard.setProductionNonCompliance(pcAdataList.getZcNoCompliance());
sarStandard.setProductionImplementationTime(pcAdataList.getZccssrqgj());
sarStandard.setResearchCompletionTime(pcAdataList.getCompletionTime()); sarStandard.setResearchCompletionTime(pcAdataList.getCompletionTime());
sarStandard.setResearchCountermeasures(pcAdataList.getCountermeasures()); sarStandard.setResearchCountermeasures(pcAdataList.getCountermeasures());
sarStandard.setResearchNonCompliance(pcAdataList.getNoCompliance()); sarStandard.setResearchNonCompliance(pcAdataList.getNoCompliance());
sarStandard.setResearchCompliance(pcAdataList.getComplianceReasons());
sarStandard.setResearchImplementationTime(pcAdataList.getXcxssrqgj());
sarStandard.setClauseName(pcAdataList.getItemsName());
sarStandard.setStandardItem(pcAdataList.getItemNum());
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
sarStandard.setResearchImplementationTime(pcAdataList.getXcxssrqgj()); sarStandard.setResearchImplementationTime(pcAdataList.getXcxssrqgj());
// simpleDateFormat.parse(String.valueOf(delegateTask.getVariable("XCXSSRQ"))) // simpleDateFormat.parse(String.valueOf(delegateTask.getVariable("XCXSSRQ")))
@@ -152,13 +159,16 @@ public class PCAdlApproveAfter implements TaskListener {
sarStandardChild.setStandNumber(pcAdataList.getStandSort()+" "+pcAdataList.getStandNumber()+"-"+pcAdataList.getStandYear()); sarStandardChild.setStandNumber(pcAdataList.getStandSort()+" "+pcAdataList.getStandNumber()+"-"+pcAdataList.getStandYear());
sarStandardChild.setProductionCompletionTime(pcAchildren.getZcCompletionTime()); sarStandardChild.setProductionCompletionTime(pcAchildren.getZcCompletionTime());
sarStandardChild.setProductionCountermeasures(pcAchildren.getZcCountermeasures()); sarStandardChild.setProductionCountermeasures(pcAchildren.getZcCountermeasures());
sarStandardChild.setProductionCompliance(pcAchildren.getZcNoCompliance()); sarStandardChild.setProductionCompliance(pcAchildren.getZcComplianceReasons());
sarStandardChild.setProductionNonCompliance(pcAchildren.getZcNoCompliance());
sarStandardChild.setResearchCompletionTime(pcAchildren.getCompletionTime()); sarStandardChild.setResearchCompletionTime(pcAchildren.getCompletionTime());
sarStandardChild.setResearchCountermeasures(pcAchildren.getCountermeasures()); sarStandardChild.setResearchCountermeasures(pcAchildren.getCountermeasures());
sarStandardChild.setResearchCompliance(pcAchildren.getComplianceReasons());
sarStandardChild.setResearchNonCompliance(pcAchildren.getNoCompliance()); sarStandardChild.setResearchNonCompliance(pcAchildren.getNoCompliance());
sarStandardChild.setResearchImplementationTime(pcAdataList.getXcxssrqgj()); sarStandardChild.setResearchImplementationTime(pcAdataList.getXcxssrqgj());
sarStandardChild.setProductionImplementationTime(pcAdataList.getZccssrqgj()); sarStandardChild.setProductionImplementationTime(pcAdataList.getZccssrqgj());
sarStandardChild.setClauseName(pcAchildren.getItemsName()); sarStandardChild.setClauseName(pcAchildren.getItemsName());
sarStandardChild.setStandardItem(pcAchildren.getItemsNum());
sarStandardComplianceProductAssesses.add(sarStandardChild); sarStandardComplianceProductAssesses.add(sarStandardChild);
} }
}); });
@@ -212,6 +222,6 @@ public class PCAdlApproveAfter implements TaskListener {
busBean.save(busProcessNewNext); busBean.save(busProcessNewNext);
} }
} }
throw new ActivitiException("sasaa"); // throw new ActivitiException("sasaa");
} }
} }