diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/PCA/PCAdataList.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/PCA/PCAdataList.java index 5694d4ad..be5f9ff1 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/PCA/PCAdataList.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/PCA/PCAdataList.java @@ -45,5 +45,7 @@ public class PCAdataList { private Date zcCompletionTime; private Date completionTime; private String zcComplianceReasons; + private String itemNum; + private String itemsName; } \ No newline at end of file diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAdlApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAdlApproveAfter.java index f9ca6b47..a76add78 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAdlApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAdlApproveAfter.java @@ -96,10 +96,17 @@ public class PCAdlApproveAfter implements TaskListener { //111 sarStandard.setProductionCompletionTime(pcAdataList.getZcCompletionTime()); 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.setResearchCountermeasures(pcAdataList.getCountermeasures()); 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"); sarStandard.setResearchImplementationTime(pcAdataList.getXcxssrqgj()); // 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.setProductionCompletionTime(pcAchildren.getZcCompletionTime()); sarStandardChild.setProductionCountermeasures(pcAchildren.getZcCountermeasures()); - sarStandardChild.setProductionCompliance(pcAchildren.getZcNoCompliance()); + sarStandardChild.setProductionCompliance(pcAchildren.getZcComplianceReasons()); + sarStandardChild.setProductionNonCompliance(pcAchildren.getZcNoCompliance()); sarStandardChild.setResearchCompletionTime(pcAchildren.getCompletionTime()); sarStandardChild.setResearchCountermeasures(pcAchildren.getCountermeasures()); + sarStandardChild.setResearchCompliance(pcAchildren.getComplianceReasons()); sarStandardChild.setResearchNonCompliance(pcAchildren.getNoCompliance()); sarStandardChild.setResearchImplementationTime(pcAdataList.getXcxssrqgj()); sarStandardChild.setProductionImplementationTime(pcAdataList.getZccssrqgj()); sarStandardChild.setClauseName(pcAchildren.getItemsName()); + sarStandardChild.setStandardItem(pcAchildren.getItemsNum()); sarStandardComplianceProductAssesses.add(sarStandardChild); } }); @@ -212,6 +222,6 @@ public class PCAdlApproveAfter implements TaskListener { busBean.save(busProcessNewNext); } } - throw new ActivitiException("sasaa"); +// throw new ActivitiException("sasaa"); } }