From e3b5c4d13204f6720e3107079f265a34fe8aee31 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Sun, 8 Aug 2021 16:52:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84=E8=AF=84?= =?UTF-8?q?=E4=BC=B0=E6=B5=81=E7=A8=8B=20=E9=A1=B9=E7=9B=AE=E7=BB=B4?= =?UTF-8?q?=E5=BA=A6=20=E5=85=A5=E5=BA=93=E6=95=B0=E6=8D=AE=E5=AE=8C?= =?UTF-8?q?=E5=96=84=20=E4=BB=A5=E5=8F=8A=20bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bat/wkflow/business_main/datas/dto/PCA/PCAdataList.java | 4 ++++ .../ProjectComplianceAssessment/PCAdlApproveAfter.java | 5 +++-- .../PCAffLiableDistributeAfter.java | 4 +++- 3 files changed, 10 insertions(+), 3 deletions(-) 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); //截止时间 流程描述 创建人