|
@@ -3,9 +3,11 @@ package com.fdkankan.fusion.service.impl;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.fdkankan.fusion.entity.CaseFiles;
|
|
import com.fdkankan.fusion.entity.CaseFiles;
|
|
import com.fdkankan.fusion.entity.CaseFilesType;
|
|
import com.fdkankan.fusion.entity.CaseFilesType;
|
|
|
|
+import com.fdkankan.fusion.entity.CaseFilesTypeIcon;
|
|
import com.fdkankan.fusion.mapper.ICaseFilesTypeMapper;
|
|
import com.fdkankan.fusion.mapper.ICaseFilesTypeMapper;
|
|
import com.fdkankan.fusion.response.CaseFilesTypeTreeVo;
|
|
import com.fdkankan.fusion.response.CaseFilesTypeTreeVo;
|
|
import com.fdkankan.fusion.service.ICaseFilesService;
|
|
import com.fdkankan.fusion.service.ICaseFilesService;
|
|
|
|
+import com.fdkankan.fusion.service.ICaseFilesTypeIconService;
|
|
import com.fdkankan.fusion.service.ICaseFilesTypeService;
|
|
import com.fdkankan.fusion.service.ICaseFilesTypeService;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import org.springframework.beans.BeanUtils;
|
|
import org.springframework.beans.BeanUtils;
|
|
@@ -31,6 +33,8 @@ public class CaseFilesTypeServiceImpl extends ServiceImpl<ICaseFilesTypeMapper,
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
ICaseFilesService caseFilesService;
|
|
ICaseFilesService caseFilesService;
|
|
|
|
+ @Autowired
|
|
|
|
+ ICaseFilesTypeIconService caseFilesTypeIconService;
|
|
@Override
|
|
@Override
|
|
public List<CaseFilesType> getByParentId(Integer parentId) {
|
|
public List<CaseFilesType> getByParentId(Integer parentId) {
|
|
LambdaQueryWrapper<CaseFilesType> wrapper = new LambdaQueryWrapper<>();
|
|
LambdaQueryWrapper<CaseFilesType> wrapper = new LambdaQueryWrapper<>();
|
|
@@ -40,7 +44,16 @@ public class CaseFilesTypeServiceImpl extends ServiceImpl<ICaseFilesTypeMapper,
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public Object getByTree(Integer caseId) {
|
|
public Object getByTree(Integer caseId) {
|
|
- List<CaseFilesType> list = this.list();
|
|
|
|
|
|
+ LambdaQueryWrapper<CaseFilesType> wrapper = new LambdaQueryWrapper<>();
|
|
|
|
+ wrapper.orderByAsc(CaseFilesType::getSort);
|
|
|
|
+ List<CaseFilesType> list = this.list(wrapper);
|
|
|
|
+
|
|
|
|
+ List<Integer> ids = list.stream().map(CaseFilesType::getFilesTypeId).collect(Collectors.toList());
|
|
|
|
+ HashMap<Integer,List<CaseFilesTypeIcon>> iconMap = caseFilesTypeIconService.getMapByTypeIds(ids);
|
|
|
|
+ for (CaseFilesType caseFilesType : list) {
|
|
|
|
+ caseFilesType.setIconList(iconMap.get(caseFilesType.getFilesTypeId()));
|
|
|
|
+ }
|
|
|
|
+
|
|
List<CaseFiles> caseFilesList = caseFilesService.getByCaseId(caseId);
|
|
List<CaseFiles> caseFilesList = caseFilesService.getByCaseId(caseId);
|
|
HashMap<Integer,List<CaseFiles>> map = new HashMap<>();
|
|
HashMap<Integer,List<CaseFiles>> map = new HashMap<>();
|
|
|
|
|