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 e34a6510..5694d4ad 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 @@ -19,6 +19,10 @@ public class PCAdataList { private Date ssrq; private String zrbm; private String standId; + private String standType; + private String standSort; + private String standNumber; + private String standYear; private String cycvppsbm; private String cycvppscn; private String kccvppsbm; 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 43877962..6e817ad0 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 @@ -88,9 +88,10 @@ public class PCAdlApproveAfter implements TaskListener { //合估评规 结果! SarStandardComplianceProductAssess sarStandard = new SarStandardComplianceProductAssess(); -// sarStandard.setProductLineId(o.getProductLine()); + sarStandard.setStandId(pcAdataList.getStandId()); sarStandard.setStandName(pcAdataList.getStandName()); - sarStandard.setStandNumber(pcAdataList.getStandId()); + sarStandard.setStandNumber(pcAdataList.getStandSort()+" "+pcAdataList.getStandNumber()+"-"+pcAdataList.getStandYear()); + sarStandard.setStandType(pcAdataList.getStandType()); //111 sarStandard.setProductionCompletionTime(pcAdataList.getZcCompletionTime()); sarStandard.setProductionCountermeasures(pcAdataList.getZcCountermeasures()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableDistributeAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableDistributeAfter.java index e9e882a1..ca6f35b5 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableDistributeAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableDistributeAfter.java @@ -81,7 +81,9 @@ public class PCAffLiableDistributeAfter implements TaskListener { } }); map.forEach((s, pcAtotal1) -> { - nextUserList.add(s); + if (null!=s) { + nextUserList.add(s); + } }); delegateTask.setVariable("workPeoples",nextUserList); //截止时间 流程描述 创建人