标准预警-导出,将发布日期导出放到一行显示
This commit is contained in:
@@ -61,6 +61,7 @@ public class EarlyWarningEO extends BaseEntity {
|
|||||||
private String standName;
|
private String standName;
|
||||||
|
|
||||||
@ExcelProperty(value = "发布日期",index = 5)
|
@ExcelProperty(value = "发布日期",index = 5)
|
||||||
|
@ColumnWidth(20)
|
||||||
@ApiModelProperty("发布日期")
|
@ApiModelProperty("发布日期")
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||||
|
|||||||
+7
-1
@@ -1816,7 +1816,13 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
|
|||||||
}
|
}
|
||||||
if (org.apache.commons.lang.StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
|
if (org.apache.commons.lang.StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
|
||||||
List<SarAdvanceSearchVO> searchList = com.alibaba.fastjson.JSONObject.parseArray(page.getAdvanceSearchVOStr(), SarAdvanceSearchVO.class);
|
List<SarAdvanceSearchVO> searchList = com.alibaba.fastjson.JSONObject.parseArray(page.getAdvanceSearchVOStr(), SarAdvanceSearchVO.class);
|
||||||
String advanceStr = SarAdvanceSearchUtil.createSql(searchList,"SAR_STAND_ATTR_INFO");
|
//不改传参强行置换
|
||||||
|
searchList.forEach(sarAdvanceSearchVO -> {
|
||||||
|
if ("TXLB".equals(sarAdvanceSearchVO.getField())){
|
||||||
|
sarAdvanceSearchVO.setField("STAND_SYSTEM");
|
||||||
|
}
|
||||||
|
});
|
||||||
|
String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"sar_standards_info");
|
||||||
if (StringUtils.isNotBlank(advanceStr)) {
|
if (StringUtils.isNotBlank(advanceStr)) {
|
||||||
page.setAdvanceSearchStr(advanceStr);
|
page.setAdvanceSearchStr(advanceStr);
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -35,8 +35,7 @@ public class FieldConvertUtil {
|
|||||||
"文本状态,发布日期"; // 导出基础表字段 //删除 实施日期 2021-05-28
|
"文本状态,发布日期"; // 导出基础表字段 //删除 实施日期 2021-05-28
|
||||||
|
|
||||||
public static String exportBaseFieldNamesForeign = "标准类别,标准编号,标准年份,中文名称,英文名称," +
|
public static String exportBaseFieldNamesForeign = "标准类别,标准编号,标准年份,中文名称,英文名称," +
|
||||||
"文本状态,发布日期,是否纳入认证清单,体系类别,标签,适用认证,能源类型," +
|
"文本状态,发布日期,是否纳入认证清单,标准体系,适用认证,能源类型";// 导出基础表字段
|
||||||
"关联文件,发布稿,增补件,勘误件,草案"; // 导出基础表字段
|
|
||||||
|
|
||||||
public static String exportAttrFieldNamesInland = "归口管理部门,发布机构,工作组信息,我司参与深度,适用车辆类型,要求类型," +
|
public static String exportAttrFieldNamesInland = "归口管理部门,发布机构,工作组信息,我司参与深度,适用车辆类型,要求类型," +
|
||||||
"标签,发布稿(必读),增补件(必读),报批稿,送审稿,征求意见稿,草案,相关资料,新车型实施日期(文本),在产车实施日期(文本)," +
|
"标签,发布稿(必读),增补件(必读),报批稿,送审稿,征求意见稿,草案,相关资料,新车型实施日期(文本),在产车实施日期(文本)," +
|
||||||
|
|||||||
Reference in New Issue
Block a user