Commit 26c2bacf authored by wujipeng's avatar wujipeng
Browse files

模板新增字段展示

parent 5d971bd1
......@@ -47,7 +47,7 @@ public class ExcelTemplateController extends BaseController {
excelTemplateDTO.setJson(JSON.toJSONString(excelTemplateDTO.getTableHeaderList()));
}
if(!ObjectUtils.isEmpty(excelTemplateDTO) && !excelTemplateDTO.getAllList().isEmpty()){
excelTemplateDTO.setAll(JSON.toJSONString(excelTemplateDTO.getAllList()));
excelTemplateDTO.setAllHeader(JSON.toJSONString(excelTemplateDTO.getAllList()));
}
return Result.data(excelTemplateService.saveOrUpdate(excelTemplateDTO));
}
......
......@@ -30,7 +30,8 @@ public class ExcelTemplateEntity {
private String json;
@ApiModelProperty("原始全部表头")
private String all;
@TableField(value = "all_header")
private String allHeader;
@ApiModelProperty("模板json用于展示")
@TableField(exist = false)
......
......@@ -31,8 +31,8 @@ public class ExcelTemplateServiceImpl extends ServiceImpl<ExcelTemplateMapper, E
List<TableHeaderVO> tableHeaderList = JSON.parseArray(json, TableHeaderVO.class);
excelTemplateVO.setTableHeaderList(tableHeaderList);
}
if(!ObjectUtils.isEmpty(excelTemplateVO) && !ObjectUtils.isEmpty(excelTemplateVO.getAll())){
String json = excelTemplateVO.getAll();
if(!ObjectUtils.isEmpty(excelTemplateVO) && !ObjectUtils.isEmpty(excelTemplateVO.getAllHeader())){
String json = excelTemplateVO.getAllHeader();
List<TableHeaderVO> tableHeaderList = JSON.parseArray(json, TableHeaderVO.class);
excelTemplateVO.setAllList(tableHeaderList);
}
......@@ -48,8 +48,8 @@ public class ExcelTemplateServiceImpl extends ServiceImpl<ExcelTemplateMapper, E
List<TableHeaderVO> tableHeaderList = JSON.parseArray(json, TableHeaderVO.class);
excelTemplate.setTableHeaderList(tableHeaderList);
}
if(!ObjectUtils.isEmpty(excelTemplate) && !ObjectUtils.isEmpty(excelTemplate.getAll())){
String json = excelTemplate.getAll();
if(!ObjectUtils.isEmpty(excelTemplate) && !ObjectUtils.isEmpty(excelTemplate.getAllHeader())){
String json = excelTemplate.getAllHeader();
List<TableHeaderVO> tableHeaderList = JSON.parseArray(json, TableHeaderVO.class);
excelTemplate.setAllList(tableHeaderList);
}
......
......@@ -7,7 +7,8 @@
select
id,
name,
json
json,
all_header as allHeader
from
excel_template
<where>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment