"src/main/java/git@gitlab.ruzhoukj.com:wujipeng/relation.git" did not exist on "e2409a8b4372703c6ca06a066e6956b47cc075ed"
Commit 26c2bacf authored by wujipeng's avatar wujipeng
Browse files

模板新增字段展示

parent 5d971bd1
...@@ -47,7 +47,7 @@ public class ExcelTemplateController extends BaseController { ...@@ -47,7 +47,7 @@ public class ExcelTemplateController extends BaseController {
excelTemplateDTO.setJson(JSON.toJSONString(excelTemplateDTO.getTableHeaderList())); excelTemplateDTO.setJson(JSON.toJSONString(excelTemplateDTO.getTableHeaderList()));
} }
if(!ObjectUtils.isEmpty(excelTemplateDTO) && !excelTemplateDTO.getAllList().isEmpty()){ 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)); return Result.data(excelTemplateService.saveOrUpdate(excelTemplateDTO));
} }
......
...@@ -30,7 +30,8 @@ public class ExcelTemplateEntity { ...@@ -30,7 +30,8 @@ public class ExcelTemplateEntity {
private String json; private String json;
@ApiModelProperty("原始全部表头") @ApiModelProperty("原始全部表头")
private String all; @TableField(value = "all_header")
private String allHeader;
@ApiModelProperty("模板json用于展示") @ApiModelProperty("模板json用于展示")
@TableField(exist = false) @TableField(exist = false)
......
...@@ -31,8 +31,8 @@ public class ExcelTemplateServiceImpl extends ServiceImpl<ExcelTemplateMapper, E ...@@ -31,8 +31,8 @@ public class ExcelTemplateServiceImpl extends ServiceImpl<ExcelTemplateMapper, E
List<TableHeaderVO> tableHeaderList = JSON.parseArray(json, TableHeaderVO.class); List<TableHeaderVO> tableHeaderList = JSON.parseArray(json, TableHeaderVO.class);
excelTemplateVO.setTableHeaderList(tableHeaderList); excelTemplateVO.setTableHeaderList(tableHeaderList);
} }
if(!ObjectUtils.isEmpty(excelTemplateVO) && !ObjectUtils.isEmpty(excelTemplateVO.getAll())){ if(!ObjectUtils.isEmpty(excelTemplateVO) && !ObjectUtils.isEmpty(excelTemplateVO.getAllHeader())){
String json = excelTemplateVO.getAll(); String json = excelTemplateVO.getAllHeader();
List<TableHeaderVO> tableHeaderList = JSON.parseArray(json, TableHeaderVO.class); List<TableHeaderVO> tableHeaderList = JSON.parseArray(json, TableHeaderVO.class);
excelTemplateVO.setAllList(tableHeaderList); excelTemplateVO.setAllList(tableHeaderList);
} }
...@@ -48,8 +48,8 @@ public class ExcelTemplateServiceImpl extends ServiceImpl<ExcelTemplateMapper, E ...@@ -48,8 +48,8 @@ public class ExcelTemplateServiceImpl extends ServiceImpl<ExcelTemplateMapper, E
List<TableHeaderVO> tableHeaderList = JSON.parseArray(json, TableHeaderVO.class); List<TableHeaderVO> tableHeaderList = JSON.parseArray(json, TableHeaderVO.class);
excelTemplate.setTableHeaderList(tableHeaderList); excelTemplate.setTableHeaderList(tableHeaderList);
} }
if(!ObjectUtils.isEmpty(excelTemplate) && !ObjectUtils.isEmpty(excelTemplate.getAll())){ if(!ObjectUtils.isEmpty(excelTemplate) && !ObjectUtils.isEmpty(excelTemplate.getAllHeader())){
String json = excelTemplate.getAll(); String json = excelTemplate.getAllHeader();
List<TableHeaderVO> tableHeaderList = JSON.parseArray(json, TableHeaderVO.class); List<TableHeaderVO> tableHeaderList = JSON.parseArray(json, TableHeaderVO.class);
excelTemplate.setAllList(tableHeaderList); excelTemplate.setAllList(tableHeaderList);
} }
......
...@@ -7,7 +7,8 @@ ...@@ -7,7 +7,8 @@
select select
id, id,
name, name,
json json,
all_header as allHeader
from from
excel_template excel_template
<where> <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