|
|
@ -59,11 +59,7 @@ import org.springblade.system.feign.IUserClient; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
|
|
|
|
|
|
|
|
|
import java.time.LocalDate; |
|
|
|
import java.util.*; |
|
|
|
import java.util.ArrayList; |
|
|
|
|
|
|
|
import java.util.Date; |
|
|
|
|
|
|
|
import java.util.List; |
|
|
|
|
|
|
|
import java.util.Map; |
|
|
|
|
|
|
|
import java.util.stream.Collectors; |
|
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
@ -334,7 +330,7 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif |
|
|
|
indicatorsVO.setCreatedUserName(userR.getData().getName()); |
|
|
|
indicatorsVO.setCreatedUserName(userR.getData().getName()); |
|
|
|
} |
|
|
|
} |
|
|
|
if (Func.isNotEmpty(list)) { |
|
|
|
if (Func.isNotEmpty(list)) { |
|
|
|
Map<Integer, List<IndicatorsAnnexEntity>> resourceMap = list.stream().collect(Collectors.groupingBy(IndicatorsAnnexEntity::getType)); |
|
|
|
Map<Integer, List<IndicatorsAnnexEntity>> resourceMap = list.stream().filter(item -> !Objects.isNull(item.getType())).collect(Collectors.groupingBy(IndicatorsAnnexEntity::getType)); |
|
|
|
if (Func.isNotEmpty(resourceMap.get(1))) { |
|
|
|
if (Func.isNotEmpty(resourceMap.get(1))) { |
|
|
|
//存在图片资源
|
|
|
|
//存在图片资源
|
|
|
|
indicatorsVO.setPictures(resourceMap.get(1)); |
|
|
|
indicatorsVO.setPictures(resourceMap.get(1)); |
|
|
|