Commit c7738114 authored by wujipeng's avatar wujipeng
Browse files

优化

parent 691ce293
...@@ -71,18 +71,34 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt ...@@ -71,18 +71,34 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt
updateById(templateDTO); updateById(templateDTO);
} }
//查询模板详情单元格编号集合 //查询模板详情单元格编号集合
List<String> templateDetailList = templateDetailBasicService.getCellNumberList(templateDTO.getId()); // List<String> templateDetailList = templateDetailBasicService.getCellNumberList(templateDTO.getId());
//处理模板详情 //处理模板详情
handleUpdateTemplateDetail(templateDTO.getCells(), templateDetailList, templateDTO.getId()); //删除旧数据
templateDetailBasicService.remove(new LambdaQueryWrapper<TemplateDetailBasicEntity>().eq(TemplateDetailBasicEntity::getTemplateId, templateDTO.getId()));
// handleUpdateTemplateDetail(templateDTO.getCells(), templateDetailList, templateDTO.getId());
Map<String, TemplateDetailBasicEntity> cells = templateDTO.getCells();
List<TemplateDetailBasicEntity> templateDetailBasicList = new ArrayList<>();
if (!ObjectUtils.isEmpty(cells)) {
cells.forEach((cellNumber, templateDetail) -> {
templateDetail.setTemplateId(templateDTO.getId());
templateDetailBasicList.add(templateDetail);
});
templateDetailBasicService.saveBatch(templateDetailBasicList);
}
//处理模板详情复合 //处理模板详情复合
//删除旧数据
templateDetailMergeService.remove(new LambdaQueryWrapper<TemplateDetailMergeEntity>()
.eq(TemplateDetailMergeEntity::getTemplateId, templateDTO.getId()));
List<TemplateDetailMergeEntity> merges = templateDTO.getMerges(); List<TemplateDetailMergeEntity> merges = templateDTO.getMerges();
if (!ObjectUtils.isEmpty(merges)) { if (!ObjectUtils.isEmpty(merges)) {
for (TemplateDetailMergeEntity merge : merges) { for (TemplateDetailMergeEntity merge : merges) {
merge.setTemplateId(templateDTO.getId()); merge.setTemplateId(templateDTO.getId());
} }
templateDetailMergeService.saveOrUpdateBatch(merges); templateDetailMergeService.saveBatch(merges);
} }
//处理模板详情行列配置 //处理模板详情行列配置
//删除旧数据
templateConfigService.remove(new LambdaQueryWrapper<TemplateConfigEntity>().eq(TemplateConfigEntity::getTemplateId, templateDTO.getId()));
Map<String, TemplateConfigEntity> rows = templateDTO.getRows(); Map<String, TemplateConfigEntity> rows = templateDTO.getRows();
Map<String, TemplateConfigEntity> columns = templateDTO.getColumns(); Map<String, TemplateConfigEntity> columns = templateDTO.getColumns();
List<TemplateConfigEntity> templateConfigList = new ArrayList<>(); List<TemplateConfigEntity> templateConfigList = new ArrayList<>();
...@@ -96,7 +112,7 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt ...@@ -96,7 +112,7 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt
for (TemplateConfigEntity templateConfigEntity : templateConfigList) { for (TemplateConfigEntity templateConfigEntity : templateConfigList) {
templateConfigEntity.setTemplateId(templateDTO.getId()); templateConfigEntity.setTemplateId(templateDTO.getId());
} }
templateConfigService.saveOrUpdateBatch(templateConfigList); templateConfigService.saveBatch(templateConfigList);
} }
return Boolean.TRUE; return Boolean.TRUE;
} }
......
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