Commit 4a02406e authored by wujipeng's avatar wujipeng
Browse files

优化

parent 4d233d1f
package com.ruzhoukj.integration.controller; package com.ruzhoukj.integration.controller;
import com.ruzhoukj.integration.pojo.dto.ReportDTO; import com.ruzhoukj.integration.pojo.dto.ReportDTO;
import com.ruzhoukj.integration.pojo.dto.TemplateDTO;
import com.ruzhoukj.integration.pojo.vo.ReportVO; import com.ruzhoukj.integration.pojo.vo.ReportVO;
import com.ruzhoukj.integration.result.PageResult; import com.ruzhoukj.integration.result.PageResult;
import com.ruzhoukj.integration.result.Result; import com.ruzhoukj.integration.result.Result;
......
...@@ -60,19 +60,13 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt ...@@ -60,19 +60,13 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt
} }
//初始化模板详情和模板拓展 //初始化模板详情和模板拓展
List<TemplateDetailBasicEntity> templateDetailList = new ArrayList<>(); List<TemplateDetailBasicEntity> templateDetailList = new ArrayList<>();
// List<TemplateExpansionEntity> templateExpansionList = new ArrayList<>();
for (String location : locations) { for (String location : locations) {
templateDetailList.add(TemplateDetailBasicEntity.builder() templateDetailList.add(TemplateDetailBasicEntity.builder()
.templateId(templateDTO.getId()) .templateId(templateDTO.getId())
.location(location) .location(location)
.build()); .build());
// templateExpansionList.add(TemplateExpansionEntity.builder()
// .templateId(templateDTO.getId())
// .location(location)
// .build());
} }
templateDetailBasicService.saveBatch(templateDetailList); templateDetailBasicService.saveBatch(templateDetailList);
// templateExpansionService.saveBatch(templateExpansionList);
} }
} else { } else {
//编辑模板 //编辑模板
...@@ -82,12 +76,11 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt ...@@ -82,12 +76,11 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt
List<String> templateDetailList = templateDetailBasicService.getCellNumberList(templateDTO.getId()); List<String> templateDetailList = templateDetailBasicService.getCellNumberList(templateDTO.getId());
//处理模板详情 //处理模板详情
handleUpdateTemplateDetail(templateDTO.getCells(), templateDetailList, templateDTO.getId()); handleUpdateTemplateDetail(templateDTO.getCells(), templateDetailList, templateDTO.getId());
//查询模板拓展单元格编号集合
// List<String> templateExpansionList = templateExpansionService.getCellNumberList(templateDTO.getId());
//处理模板拓展
// handleUpdateTemplateExpansion(templateDTO.getExpansion(), templateExpansionList, templateDTO.getId());
//处理模板详情复合 //处理模板详情复合
List<TemplateDetailMergeEntity> merges = templateDTO.getMerges(); List<TemplateDetailMergeEntity> merges = templateDTO.getMerges();
for (TemplateDetailMergeEntity merge : merges) {
merge.setTemplateId(templateDTO.getId());
}
if (!ObjectUtils.isEmpty(merges)) { if (!ObjectUtils.isEmpty(merges)) {
templateDetailMergeService.saveOrUpdateBatch(merges); templateDetailMergeService.saveOrUpdateBatch(merges);
} }
...@@ -101,43 +94,13 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt ...@@ -101,43 +94,13 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt
if (!ObjectUtils.isEmpty(columns)) { if (!ObjectUtils.isEmpty(columns)) {
templateConfigList.addAll(columns.values()); templateConfigList.addAll(columns.values());
} }
for (TemplateConfigEntity templateConfigEntity : templateConfigList) {
templateConfigEntity.setTemplateId(templateDTO.getId());
}
templateConfigService.saveOrUpdateBatch(templateConfigList); templateConfigService.saveOrUpdateBatch(templateConfigList);
return Boolean.TRUE; return Boolean.TRUE;
} }
// private void handleUpdateTemplateExpansion(Map<String, TemplateExpansionEntity> expansion, List<String> CellNumberList, String templateId) {
// if (ObjectUtils.isEmpty(expansion)) {
// return;
// }
// List<String> removeIdList = new ArrayList<>();
// List<TemplateExpansionEntity> updateList = new ArrayList<>();
// List<TemplateExpansionEntity> insertList = new ArrayList<>();
// for (String cellNumber : CellNumberList) {
// if (expansion.containsKey(cellNumber)) {
// TemplateExpansionEntity templateExpansion = expansion.get(cellNumber);
// updateList.add(templateExpansion);
// } else {
// removeIdList.add(cellNumber);
// }
// }
// //删除旧数据
// if (!ObjectUtils.isEmpty(removeIdList)) {
// templateExpansionService.removeByCellNumber(removeIdList, templateId);
// }
// //更新数据
// templateExpansionService.updateBatchById(updateList);
// //新增新数据
// List<String> insertIdList = getUniqueKeys(expansion, CellNumberList);
// for (String cellNumber : insertIdList) {
// TemplateExpansionEntity templateExpansion = expansion.get(cellNumber);
// templateExpansion.setTemplateId(templateId);
// insertList.add(templateExpansion);
// }
// if (!ObjectUtils.isEmpty(insertList)) {
// templateExpansionService.saveBatch(insertList);
// }
// }
private void handleUpdateTemplateDetail(Map<String, TemplateDetailBasicEntity> basic, List<String> CellNumberList, String templateId) { private void handleUpdateTemplateDetail(Map<String, TemplateDetailBasicEntity> basic, List<String> CellNumberList, String templateId) {
if (ObjectUtils.isEmpty(basic)) { if (ObjectUtils.isEmpty(basic)) {
return; return;
......
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