From b3f9244345726b2c2b62b0f2e09fe36b4e52dae1 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Thu, 22 Jul 2021 10:58:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=9B=BD=E5=86=85?=
 =?UTF-8?q?=E6=B3=95=E8=A7=84=E5=AF=BC=E5=87=BAexcl=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E7=9A=84=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/adc/da/utils/util/FieldConvertUtil.java     | 4 ++--
 .../main/java/com/adc/da/utils/util/StandExportUtil.java | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java
index ddfe9cfa..1888d4e7 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java
@@ -27,8 +27,8 @@ public class FieldConvertUtil {
 
     public static String mustFieldsLaws = "id,laws_id,valid_flag,creation_user,creation_time,modify_time"; // 自定义属性表中必须字段
 
-    public static String exportBaseFieldNames = "适用区域,重要度,标准类别,标准编号,标准年份,中文名称,英文名称," +
-            "标准状态,发布日期,文本说明"; // 导出基础表字段 //删除 实施日期 2021-05-28
+    public static String exportBaseFieldNames = "标准体系,是否纳入认证清单,标准性质,标准类别,标准编号,标准年份,中文名称,英文名称," +
+            "文本状态,发布日期"; // 导出基础表字段 //删除 实施日期 2021-05-28
 
     public static String exportBaseFieldNamesForeign = "重要度,标准类别,标准编号,标准年份/系列,中文名称,英文名称," +
             "标准状态,发布日期,文本说明"; // 导出基础表字段
diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/StandExportUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/StandExportUtil.java
index 6ceaf11b..7cd978cf 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/StandExportUtil.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/StandExportUtil.java
@@ -100,6 +100,15 @@ public class StandExportUtil {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd-HH");
         Map<String,Object> attrValueMap = sarStandardsInfoEO.getAttrInfoMap();
         switch (name) {
+            case "标准性质":
+                value = sarStandardsInfoEO.getStandNature();
+                break;
+            case "是否纳入认证清单":
+                value = sarStandardsInfoEO.getIsRelateAccess();
+                break;
+            case "标准体系":
+                value = sarStandardsInfoEO.getStandSystem();
+                break;
             case "适用区域":
                 value = sarStandardsInfoEO.getCountryShow();
                 break;