Commit 46fcc05a authored by wujipeng's avatar wujipeng
Browse files

模板新增字段展示

parent 4403e831
...@@ -46,6 +46,9 @@ public class ExcelTemplateController extends BaseController { ...@@ -46,6 +46,9 @@ public class ExcelTemplateController extends BaseController {
if(!ObjectUtils.isEmpty(excelTemplateDTO) && !excelTemplateDTO.getTableHeaderList().isEmpty()){ if(!ObjectUtils.isEmpty(excelTemplateDTO) && !excelTemplateDTO.getTableHeaderList().isEmpty()){
excelTemplateDTO.setJson(JSON.toJSONString(excelTemplateDTO.getTableHeaderList())); excelTemplateDTO.setJson(JSON.toJSONString(excelTemplateDTO.getTableHeaderList()));
} }
if(!ObjectUtils.isEmpty(excelTemplateDTO) && !excelTemplateDTO.getAllList().isEmpty()){
excelTemplateDTO.setAll(JSON.toJSONString(excelTemplateDTO.getAllList()));
}
return Result.data(excelTemplateService.saveOrUpdate(excelTemplateDTO)); return Result.data(excelTemplateService.saveOrUpdate(excelTemplateDTO));
} }
......
...@@ -29,8 +29,15 @@ public class ExcelTemplateEntity { ...@@ -29,8 +29,15 @@ public class ExcelTemplateEntity {
@ApiModelProperty("模板json") @ApiModelProperty("模板json")
private String json; private String json;
@ApiModelProperty("原始全部表头")
private String all;
@ApiModelProperty("模板json用于展示") @ApiModelProperty("模板json用于展示")
@TableField(exist = false) @TableField(exist = false)
private List<TableHeaderVO> tableHeaderList; private List<TableHeaderVO> tableHeaderList;
@ApiModelProperty("模板json用于展示")
@TableField(exist = false)
private List<TableHeaderVO> allList;
} }
...@@ -26,11 +26,16 @@ public class ExcelTemplateServiceImpl extends ServiceImpl<ExcelTemplateMapper, E ...@@ -26,11 +26,16 @@ public class ExcelTemplateServiceImpl extends ServiceImpl<ExcelTemplateMapper, E
public List<ExcelTemplateVO> pageExcelTemplate(ExcelTemplateDTO excelTemplateDTO) { public List<ExcelTemplateVO> pageExcelTemplate(ExcelTemplateDTO excelTemplateDTO) {
List<ExcelTemplateVO> excelTemplateList = baseMapper.pageExcelTemplate(excelTemplateDTO); List<ExcelTemplateVO> excelTemplateList = baseMapper.pageExcelTemplate(excelTemplateDTO);
for (ExcelTemplateVO excelTemplateVO : excelTemplateList) { for (ExcelTemplateVO excelTemplateVO : excelTemplateList) {
if(!ObjectUtils.isEmpty(excelTemplateVO)){ if(!ObjectUtils.isEmpty(excelTemplateVO) && !ObjectUtils.isEmpty(excelTemplateVO.getJson())){
String json = excelTemplateVO.getJson(); String json = excelTemplateVO.getJson();
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())){
String json = excelTemplateVO.getAll();
List<TableHeaderVO> tableHeaderList = JSON.parseArray(json, TableHeaderVO.class);
excelTemplateVO.setAllList(tableHeaderList);
}
} }
return excelTemplateList; return excelTemplateList;
} }
...@@ -38,11 +43,16 @@ public class ExcelTemplateServiceImpl extends ServiceImpl<ExcelTemplateMapper, E ...@@ -38,11 +43,16 @@ public class ExcelTemplateServiceImpl extends ServiceImpl<ExcelTemplateMapper, E
@Override @Override
public ExcelTemplateVO detail(Integer id) { public ExcelTemplateVO detail(Integer id) {
ExcelTemplateVO excelTemplate = DozerUtils.convertBean(getById(id), ExcelTemplateVO.class); ExcelTemplateVO excelTemplate = DozerUtils.convertBean(getById(id), ExcelTemplateVO.class);
if(!ObjectUtils.isEmpty(excelTemplate)){ if(!ObjectUtils.isEmpty(excelTemplate) && !ObjectUtils.isEmpty(excelTemplate.getJson())){
String json = excelTemplate.getJson(); String json = excelTemplate.getJson();
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())){
String json = excelTemplate.getAll();
List<TableHeaderVO> tableHeaderList = JSON.parseArray(json, TableHeaderVO.class);
excelTemplate.setAllList(tableHeaderList);
}
return excelTemplate; return excelTemplate;
} }
} }
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