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 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;