From 3ffd73ba06f6f2a54d12fac6a36bbfa14ea9cb83 Mon Sep 17 00:00:00 2001
From: "Mr.Z" <709235321@qq.com>
Date: Tue, 7 Sep 2021 16:56:37 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=90=88=E8=A7=84=E8=AF=84?=
 =?UTF-8?q?=E4=BC=B0=E6=B5=81=E7=A8=8B-=E9=A1=B9=E7=9B=AE=20=E5=85=A5?=
 =?UTF-8?q?=E5=88=B0=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84=E8=AF=84=E4=BC=B0?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=20=E9=87=8C=E9=9D=A2=20=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E7=BA=BF=E3=80=81=E9=A1=B9=E7=9B=AE=E7=BC=96=E5=8F=B7=E3=80=81?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0=E6=B2=A1=E4=BC=A0=E5=80=BC?=
 =?UTF-8?q?~~~?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bat/wkflow/business_main/datas/dto/PCA/PCAdataList.java | 3 +++
 .../ProjectComplianceAssessment/PCAdlApproveAfter.java      | 6 ++++++
 2 files changed, 9 insertions(+)

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 1685e38c..e5f82ea2 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,9 @@ public class PCAdataList {
     private Date ssrq;
     private String zrbm;
     private String standId;
+    private String productLineId;
+    private String productId;
+    private String productName;
     private String standType;
     private String standSort;
     private String standNumber;
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 33035b52..3671b8ba 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
@@ -101,6 +101,9 @@ public class PCAdlApproveAfter implements TaskListener {
                 SarStandardComplianceProductAssess sarStandard = new SarStandardComplianceProductAssess();
                 sarStandard.setStandId(pcAdataList.getStandId());
                 sarStandard.setStandName(pcAdataList.getStandName());
+                sarStandard.setProductLineId(pcAdataList.getProductLineId());
+                sarStandard.setProductId(pcAdataList.getProductId());
+                sarStandard.setProductName(pcAdataList.getProductName());
                 sarStandard.setStandNumber(pcAdataList.getStandSort()+" "+pcAdataList.getStandNumber()+"-"+pcAdataList.getStandYear());
                 sarStandard.setStandType(pcAdataList.getStandType());
                 sarStandard.setType(pcAdataList.getTypeId());
@@ -174,6 +177,9 @@ public class PCAdlApproveAfter implements TaskListener {
                     sarStandardChild.setStandName(pcAdataList.getStandName());
                     sarStandardChild.setStandNumber(pcAdataList.getStandSort()+" "+pcAdataList.getStandNumber()+"-"+pcAdataList.getStandYear());
                     sarStandardChild.setType(pcAchildren.getTypeId());
+                    sarStandardChild.setProductLineId(pcAdataList.getProductLineId());
+                    sarStandardChild.setProductId(pcAdataList.getProductId());
+                    sarStandardChild.setProductName(pcAdataList.getProductName());
                     sarStandardChild.setProductionCompletionTime(pcAchildren.getZcCompletionTime());
                     sarStandardChild.setProductionCountermeasures(pcAchildren.getZcCountermeasures());
                     sarStandardChild.setProductionCompliance(pcAchildren.getZcComplianceReasons());