FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug: 企标计划、国内、海外、企标导出修改字段

Browse Source
This commit is contained in:
wxyclub
2023-11-13 13:47:45 +08:00
parent 2eae78fe52
commit b550395b10
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/utils/util/BussStandExportUtil.java
+4 -1
View File
@@ -33,8 +33,11 @@ public class BussStandExportUtil {
Map<String,String> 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();
adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java
+2 -2
View File
@@ -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 = "标准类别,标准编号,标准年份,中文名称,英文名称," +
"文本状态,发布日期,是否纳入认证清单,标准体系,适用认证,能源类型";// 导出基础表字段
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
+1 -1
View File
@@ -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,