From 86de1b2d4d70a04697371bae31f6daa65aae0d6d Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Tue, 10 Aug 2021 19:27:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E8=AF=BB=E6=95=B0=E6=8D=AE=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ydw/bat/wkflow/business_slrs/dao/SarStandItems.java   | 2 ++
 .../projectEvaluationProcess/PEPDepartLeaderAfter.java        | 3 +++
 .../ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java | 4 +++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarStandItems.java b/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarStandItems.java
index 4b7fb715..fedd7807 100644
--- a/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarStandItems.java
+++ b/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarStandItems.java
@@ -110,5 +110,7 @@ public class SarStandItems  {
     @ApiModelProperty(value = "合规性分析")
     private String complianceState;
 
+    private String complianceRequire;
+
 
 }
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPDepartLeaderAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPDepartLeaderAfter.java
index adb76c1b..51091632 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPDepartLeaderAfter.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPDepartLeaderAfter.java
@@ -105,6 +105,9 @@ public class PEPDepartLeaderAfter implements TaskListener {
             }
             //合估评规 结果！
             SarStandardComplianceProductAssess sarStandard=new SarStandardComplianceProductAssess();
+            sarStandard.setProductName(o.getProjectName());
+            sarStandard.setProductId(o.getProjectNumber());
+            //差一个条款名称
             sarStandard.setProductLineId(o.getProductLine());
             sarStandard.setStandName(o.getStandName());
             sarStandard.setStandNumber(o.getStandNumber());
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java
index 129ad070..751f52e7 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java
@@ -58,11 +58,13 @@ public class DeptApplayAfter implements TaskListener{
                sarStandItems1.setResponsibleUnit(object.getString("responsibleUnitShow"));
                sarStandItems1.setDutyEngineer(object.getString("zxUserId"));
                sarStandItems1.setApplyArctic(object.getString("applyArctic"));
-               sarStandItems1.setTermsConditions(object.getString("itermsConditions"));
+               sarStandItems1.setTermsConditions(os.getString("itermsConditions"));
                sarStandItems1.setXccssrq(os.getDate("newData"));
                sarStandItems1.setZccssrq(os.getDate("onlineData"));
                sarStandItems1.setComparedWithPrevious(os.getString("changePoint"));
                sarStandItems1.setComplianceState(os.getString("complianceState"));
+               sarStandItems1.setApplyArctic(os.getString("applyArctic"));
+               sarStandItems1.setComplianceRequire(os.getString("complianceRequir"));
                sarStandItems.add(sarStandItems1);
                //结果数据
                SarInterpretationNationalStandard standard=new SarInterpretationNationalStandard();