Commit 691ce293 authored by wujipeng's avatar wujipeng
Browse files

优化

parent e376afcf
...@@ -34,8 +34,6 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt ...@@ -34,8 +34,6 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt
@Resource @Resource
private TemplateDetailBasicService templateDetailBasicService; private TemplateDetailBasicService templateDetailBasicService;
// @Resource
// private TemplateExpansionService templateExpansionService;
@Resource @Resource
private TemplateDetailMergeService templateDetailMergeService; private TemplateDetailMergeService templateDetailMergeService;
@Resource @Resource
...@@ -162,7 +160,6 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt ...@@ -162,7 +160,6 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt
@Override @Override
public TemplateVO getTemplateDetail(String id) { public TemplateVO getTemplateDetail(String id) {
Map<String, TemplateDetailBasicEntity> basic = new HashMap<>(); Map<String, TemplateDetailBasicEntity> basic = new HashMap<>();
// Map<String, TemplateExpansionEntity> expansion = new HashMap<>();
TemplateVO result = baseMapper.getTemplateDetail(id); TemplateVO result = baseMapper.getTemplateDetail(id);
//查询模板详情基础 //查询模板详情基础
List<TemplateDetailBasicEntity> templateDetailList = templateDetailBasicService List<TemplateDetailBasicEntity> templateDetailList = templateDetailBasicService
...@@ -171,15 +168,7 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt ...@@ -171,15 +168,7 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt
for (TemplateDetailBasicEntity templateDetailBasicEntity : templateDetailList) { for (TemplateDetailBasicEntity templateDetailBasicEntity : templateDetailList) {
basic.put(templateDetailBasicEntity.getLocation(), templateDetailBasicEntity); basic.put(templateDetailBasicEntity.getLocation(), templateDetailBasicEntity);
} }
//查询模板拓展
// List<TemplateExpansionEntity> templateExpansionList = templateExpansionService
// .list(new LambdaQueryWrapper<TemplateExpansionEntity>()
// .eq(TemplateExpansionEntity::getTemplateId, id));
// for (TemplateExpansionEntity templateExpansionEntity : templateExpansionList) {
// expansion.put(templateExpansionEntity.getLocation(), templateExpansionEntity);
// }
result.setCells(basic); result.setCells(basic);
// result.setExpansion(expansion);
//获取模板详情复合 //获取模板详情复合
List<TemplateDetailMergeEntity> templateDetailMergeList = templateDetailMergeService.list(new LambdaQueryWrapper<TemplateDetailMergeEntity>() List<TemplateDetailMergeEntity> templateDetailMergeList = templateDetailMergeService.list(new LambdaQueryWrapper<TemplateDetailMergeEntity>()
.eq(TemplateDetailMergeEntity::getTemplateId, id)); .eq(TemplateDetailMergeEntity::getTemplateId, id));
...@@ -205,7 +194,6 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt ...@@ -205,7 +194,6 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt
@Transactional @Transactional
public Boolean deleteTemplate(String id) { public Boolean deleteTemplate(String id) {
templateDetailBasicService.remove(new LambdaQueryWrapper<TemplateDetailBasicEntity>().eq(TemplateDetailBasicEntity::getTemplateId, id)); templateDetailBasicService.remove(new LambdaQueryWrapper<TemplateDetailBasicEntity>().eq(TemplateDetailBasicEntity::getTemplateId, id));
// templateExpansionService.remove(new LambdaQueryWrapper<TemplateExpansionEntity>().eq(TemplateExpansionEntity::getTemplateId, id));
templateDetailMergeService.remove(new LambdaQueryWrapper<TemplateDetailMergeEntity>().eq(TemplateDetailMergeEntity::getTemplateId, id)); templateDetailMergeService.remove(new LambdaQueryWrapper<TemplateDetailMergeEntity>().eq(TemplateDetailMergeEntity::getTemplateId, id));
templateConfigService.remove(new LambdaQueryWrapper<TemplateConfigEntity>().eq(TemplateConfigEntity::getTemplateId, id)); templateConfigService.remove(new LambdaQueryWrapper<TemplateConfigEntity>().eq(TemplateConfigEntity::getTemplateId, id));
return removeById(id); return removeById(id);
......
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