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 12:24:46 +08:00
parent f71115e045
commit eac7f3395f
4 changed files with 63 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java
+6
View File
@@ -33,9 +33,15 @@ public class FieldConvertUtil {
public static String exportBaseFieldNames = "标准体系,是否纳入认证清单,标准性质,标准类别,标准编号,标准年份,中文名称,英文名称," +
"文本状态,发布日期"; // 导出基础表字段 //删除 实施日期 2021-05-28
public static String exportBaseFieldNewNames = "标准体系,是否纳入认证清单,标准性质,标准编号,中文名称,英文名称," +
"文本状态,发布日期"; // 导出基础表字段 //删除 标准类别 标准编号 标准年份 ，统一为标准编号 2023-11-13
public static String exportBaseFieldNamesForeign = "标准类别,标准编号,标准年份,中文名称,英文名称," +
"文本状态,发布日期,是否纳入认证清单,标准体系,适用认证,能源类型";// 导出基础表字段
public static String exportBaseFieldNamesNewForeign = "标准编号,中文名称,英文名称," +
"文本状态,发布日期,是否纳入认证清单,标准体系,适用认证,能源类型";// 导出基础表字段 //删除 标准类别 标准编号 标准年份 ，统一为标准编号 2023-11-13
public static String exportAttrFieldNamesInland = "归口管理部门,发布机构,工作组信息,我司参与深度,适用车辆类型,要求类型," +
"标签,发布稿（必读）,增补件（必读）,报批稿,送审稿,征求意见稿,草案,相关资料,新车型实施日期（文本）,在产车实施日期（文本）," +
"EOP实施日期（文本）,责任部门,相关部门,SVPPS,FO,项目评估角色,法规维护人,代替标准编号," +
adc-da-slrs/src/main/java/com/adc/da/utils/util/StandExportUtil.java
+17 -10
View File
@@ -39,17 +39,21 @@ public class StandExportUtil {
}
for (SarStandAttrDetails detailsEO : detailsEOList) {
if (!InitStandAttrUtil.fileFieldList.contains(detailsEO.getAttrField())) {
attrBud.append(detailsEO.getAttrName() + ",");
attrInfoMap.put(detailsEO.getAttrName(),detailsEO.getAttrField());
// 去掉 参会记录 和 相关流程 两个导出字段 2023-11-13
if("参会记录".equals(detailsEO.getAttrName()) || "相关流程".equals(detailsEO.getAttrName())) {
continue;
}
attrBud.append(detailsEO.getAttrName() + ",");
}
}
String header = FieldConvertUtil.exportBaseFieldNames + "," + attrBud.toString();
String header = FieldConvertUtil.exportBaseFieldNewNames + "," + attrBud.toString();
//国内导出去掉体系类别
if (SarTypeEnum.INLAND_STAND.getValue().equals(standType)) {
header = header.replace(",体系类别","");
}
if (SarTypeEnum.FOREIGN_STAND.getValue().equals(standType)) {
header = FieldConvertUtil.exportBaseFieldNamesForeign + "," + attrBud.toString();
header = FieldConvertUtil.exportBaseFieldNamesNewForeign + "," + attrBud.toString();
}
//创建工作表对象
Sheet sheet = workbook.createSheet();
@@ -125,9 +129,9 @@ public class StandExportUtil {
case "适用区域":
value = verifyBean(sarStandardsInfoEO.getCountryShow());
break;
case "标准类别":
value = verifyBean(sarStandardsInfoEO.getStandSortShow());
break;
// case "标准类别":
// value = verifyBean(sarStandardsInfoEO.getStandSortShow());
// break;
case "重要度":
if (StringUtils.isNotBlank(sarStandardsInfoEO.getIsRelateAccess())) {
if ("1".equals(sarStandardsInfoEO.getIsRelateAccess())) {
@@ -138,11 +142,14 @@ public class StandExportUtil {
}
value = sarStandardsInfoEO.getIsRelateAccess();
break;
// case "标准编号":
// value = verifyBean(sarStandardsInfoEO.getStandNumber());
// break;
// case "标准年份":
// value = verifyBean(sarStandardsInfoEO.getStandYear());
// break;
case "标准编号":
value = verifyBean(sarStandardsInfoEO.getStandNumber());
break;
case "标准年份":
value = verifyBean(sarStandardsInfoEO.getStandYear());
value = sarStandardsInfoEO.getStandCode();
break;
case "中文名称":
value = verifyBean(sarStandardsInfoEO.getStandName());