Commit 1808b5d4 authored by wujipeng's avatar wujipeng
Browse files

模板新增编辑优化

parent 7980809c
...@@ -33,13 +33,9 @@ public class TemplateEntity { ...@@ -33,13 +33,9 @@ public class TemplateEntity {
@TableField("column_number") @TableField("column_number")
private Integer columnNumber; private Integer columnNumber;
@ApiModelProperty(value = "数据") @ApiModelProperty(value = "基础单元格")
@TableField(exist = false) @TableField(exist = false)
private Map<String, String> data; private Map<String, TemplateDetailEntity> cells;
@ApiModelProperty(value = "基本属性")
@TableField(exist = false)
private Map<String, TemplateDetailEntity> basic;
@ApiModelProperty(value = "拓展属性") @ApiModelProperty(value = "拓展属性")
@TableField(exist = false) @TableField(exist = false)
......
...@@ -48,7 +48,7 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt ...@@ -48,7 +48,7 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt
for (int row = 1; row <= templateDTO.getLineNumber(); row++) { for (int row = 1; row <= templateDTO.getLineNumber(); row++) {
for (int col = 0; col < templateDTO.getColumnNumber(); col++) { for (int col = 0; col < templateDTO.getColumnNumber(); col++) {
String columnLabel = getExcelColumnLabel(col); String columnLabel = getExcelColumnLabel(col);
locations.add(columnLabel + row + ":" + columnLabel + row); locations.add(columnLabel + row);
} }
} }
//初始化模板详情和模板拓展 //初始化模板详情和模板拓展
...@@ -73,7 +73,7 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt ...@@ -73,7 +73,7 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt
//查询模板详情单元格编号集合 //查询模板详情单元格编号集合
List<String> templateDetailList = templateDetailService.getCellNumberList(templateDTO.getId()); List<String> templateDetailList = templateDetailService.getCellNumberList(templateDTO.getId());
//处理模板详情 //处理模板详情
handleUpdateTemplateDetail(templateDTO.getData(), templateDTO.getBasic(), templateDetailList, templateDTO.getId()); handleUpdateTemplateDetail(templateDTO.getCells(), templateDetailList, templateDTO.getId());
//查询模板拓展单元格编号集合 //查询模板拓展单元格编号集合
List<String> templateExpansionList = templateExpansionService.getCellNumberList(templateDTO.getId()); List<String> templateExpansionList = templateExpansionService.getCellNumberList(templateDTO.getId());
//处理模板拓展 //处理模板拓展
...@@ -114,17 +114,16 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt ...@@ -114,17 +114,16 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt
} }
} }
private void handleUpdateTemplateDetail(Map<String, String> data, Map<String, TemplateDetailEntity> basic, List<String> CellNumberList, String templateId) { private void handleUpdateTemplateDetail(Map<String, TemplateDetailEntity> basic, List<String> CellNumberList, String templateId) {
if (ObjectUtils.isEmpty(data) || ObjectUtils.isEmpty(basic)) { if (ObjectUtils.isEmpty(basic)) {
return; return;
} }
List<String> removeIdList = new ArrayList<>(); List<String> removeIdList = new ArrayList<>();
List<TemplateDetailEntity> updateList = new ArrayList<>(); List<TemplateDetailEntity> updateList = new ArrayList<>();
List<TemplateDetailEntity> insertList = new ArrayList<>(); List<TemplateDetailEntity> insertList = new ArrayList<>();
for (String cellNumber : CellNumberList) { for (String cellNumber : CellNumberList) {
if (data.containsKey(cellNumber)) { if (basic.containsKey(cellNumber)) {
TemplateDetailEntity templateDetail = basic.get(cellNumber); TemplateDetailEntity templateDetail = basic.get(cellNumber);
templateDetail.setValue(data.get(cellNumber));
updateList.add(templateDetail); updateList.add(templateDetail);
} else { } else {
removeIdList.add(cellNumber); removeIdList.add(cellNumber);
...@@ -137,10 +136,9 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt ...@@ -137,10 +136,9 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt
//更新数据 //更新数据
templateDetailService.updateBatchById(updateList); templateDetailService.updateBatchById(updateList);
//新增新数据 //新增新数据
List<String> insertIdList = getUniqueKeys(data, CellNumberList); List<String> insertIdList = getUniqueKeys(basic, CellNumberList);
for (String cellNumber : insertIdList) { for (String cellNumber : insertIdList) {
TemplateDetailEntity templateDetail = basic.get(cellNumber); TemplateDetailEntity templateDetail = basic.get(cellNumber);
templateDetail.setValue(data.get(cellNumber));
templateDetail.setTemplateId(templateId); templateDetail.setTemplateId(templateId);
insertList.add(templateDetail); insertList.add(templateDetail);
} }
...@@ -174,7 +172,6 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt ...@@ -174,7 +172,6 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt
@Override @Override
public TemplateVO getTemplateDetail(String id) { public TemplateVO getTemplateDetail(String id) {
Map<String, String> data = new HashMap<>();
Map<String, TemplateDetailEntity> basic = new HashMap<>(); Map<String, TemplateDetailEntity> basic = new HashMap<>();
Map<String, TemplateExpansionEntity> expansion = new HashMap<>(); Map<String, TemplateExpansionEntity> expansion = new HashMap<>();
TemplateVO result = baseMapper.getTemplateDetail(id); TemplateVO result = baseMapper.getTemplateDetail(id);
...@@ -183,7 +180,6 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt ...@@ -183,7 +180,6 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt
.list(new LambdaQueryWrapper<TemplateDetailEntity>() .list(new LambdaQueryWrapper<TemplateDetailEntity>()
.eq(TemplateDetailEntity::getTemplateId, id)); .eq(TemplateDetailEntity::getTemplateId, id));
for (TemplateDetailEntity templateDetailEntity : templateDetailList) { for (TemplateDetailEntity templateDetailEntity : templateDetailList) {
data.put(templateDetailEntity.getLocation(), templateDetailEntity.getValue());
basic.put(templateDetailEntity.getLocation(), templateDetailEntity); basic.put(templateDetailEntity.getLocation(), templateDetailEntity);
} }
//查询模板拓展 //查询模板拓展
...@@ -193,8 +189,7 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt ...@@ -193,8 +189,7 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt
for (TemplateExpansionEntity templateExpansionEntity : templateExpansionList) { for (TemplateExpansionEntity templateExpansionEntity : templateExpansionList) {
expansion.put(templateExpansionEntity.getLocation(), templateExpansionEntity); expansion.put(templateExpansionEntity.getLocation(), templateExpansionEntity);
} }
result.setData(data); result.setCells(basic);
result.setBasic(basic);
result.setExpansion(expansion); result.setExpansion(expansion);
return result; return result;
} }
......
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