From b550395b104d0d88b1571f726be13cb042df99c1 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Mon, 13 Nov 2023 13:47:45 +0800 Subject: [PATCH] =?UTF-8?q?bug:=20=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E3=80=81=E5=9B=BD=E5=86=85=E3=80=81=E6=B5=B7=E5=A4=96=E3=80=81?= =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=AF=BC=E5=87=BA=E4=BF=AE=E6=94=B9=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/adc/da/utils/util/BussStandExportUtil.java | 5 ++++- .../main/java/com/adc/da/utils/util/FieldConvertUtil.java | 4 ++-- .../mapper/sarStandardsInfo/SarStandardsInfoMapper.xml | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/BussStandExportUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/BussStandExportUtil.java index ab1c43e1..a7181c46 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/BussStandExportUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/BussStandExportUtil.java @@ -33,8 +33,11 @@ public class BussStandExportUtil { Map attrInfoMap = new HashMap<>(); for (SarStandAttrDetails detailsEO : detailsEOList) { if (!InitStandAttrUtil.fileFieldListBuss.contains(detailsEO.getAttrField())) { - attrBud.append(detailsEO.getAttrName() + ","); attrInfoMap.put(detailsEO.getAttrName(),detailsEO.getAttrField()); + if ("关联流程".equals(detailsEO.getAttrName())) { + continue; + } + attrBud.append(detailsEO.getAttrName() + ","); } } String header = FieldConvertUtil.exportBaseFieldNamesBuss + "," + attrBud.toString(); 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 1703f7e6..643db6da 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 @@ -33,8 +33,8 @@ public class FieldConvertUtil { public static String exportBaseFieldNames = "标准体系,是否纳入认证清单,标准性质,标准类别,标准编号,标准年份,中文名称,英文名称," + "文本状态,发布日期"; // 导出基础表字段 //删除 实施日期 2021-05-28 - public static String exportBaseFieldNewNames = "标准体系,是否纳入认证清单,标准性质,标准编号,中文名称,英文名称," + - "文本状态,发布日期"; // 导出基础表字段 //删除 标准类别 标准编号 标准年份 ，统一为标准编号 2023-11-13 + public static String exportBaseFieldNewNames = "标准编号,中文名称,英文名称,标准体系," + + "文本状态,发布日期,标准性质"; // 导出基础表字段 // 删除是否纳入认证清单，删除 标准类别 标准编号 标准年份 ，统一为标准编号 2023-11-13 public static String exportBaseFieldNamesForeign = "标准类别,标准编号,标准年份,中文名称,英文名称," + "文本状态,发布日期,是否纳入认证清单,标准体系,适用认证,能源类型";// 导出基础表字段 diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index 7468836f..e8b4ac04 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml @@ -116,7 +116,7 @@ SAR_STANDARDS_INFO.stand_sort, SAR_STANDARDS_INFO.stand_number, SAR_STANDARDS_INFO.stand_year, - concat(SAR_STANDARDS_INFO.stand_sort,' ',SAR_STANDARDS_INFO.stand_number,'-',SAR_STANDARDS_INFO.stand_year) as standCode, + concat(COALESCE(SAR_STANDARDS_INFO.stand_sort, ''), ' ', COALESCE(SAR_STANDARDS_INFO.stand_number, ''), '-' , COALESCE(SAR_STANDARDS_INFO.stand_year, '')) as standCode, SAR_STANDARDS_INFO.stand_name, SAR_STANDARDS_INFO.stand_en_name, SAR_STANDARDS_INFO.stand_state,