标准预警-导出,将发布日期导出放到一行显示
This commit is contained in:
@@ -61,6 +61,7 @@ public class EarlyWarningEO extends BaseEntity {
|
||||
private String standName;
|
||||
|
||||
@ExcelProperty(value = "发布日期",index = 5)
|
||||
@ColumnWidth(20)
|
||||
@ApiModelProperty("发布日期")
|
||||
@TableField(exist = false)
|
||||
@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())) {
|
||||
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)) {
|
||||
page.setAdvanceSearchStr(advanceStr);
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user