修改

xuhy

4 天以前 508f3e225df87e0da974424981e7782fc5ce875c

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFoundationPersonServiceImpl.java

@@ -19,6 +19,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;

import java.util.ArrayList;
import java.util.Comparator;
import java.util.HashSet;
import java.util.List;
@@ -69,6 +70,8 @@
        if(b){
            throw new ServiceException("设置存在重复用餐人数");
        }
        this.remove(Wrappers.lambdaQuery(TFoundationPerson.class)
                .eq(TFoundationPerson::getMealType,dto.getMealType()));
        for (TFoundationPersonDTO tFoundationPersonDTO : foundationPersonDTOS) {
            List<TFoundationConfig> foundationConfigs = tFoundationPersonDTO.getFoundationConfigs();
            long count = foundationConfigs.stream().map(TFoundationConfig::getTypeId).distinct().count();
@@ -76,7 +79,7 @@
                throw new ServiceException("菜品重复设置");
            }
            // 添加人数
            this.updateById(tFoundationPersonDTO);
            this.saveOrUpdate(tFoundationPersonDTO);
            // 删除菜品
            foundationConfigService.remove(Wrappers.lambdaQuery(TFoundationConfig.class)
                    .eq(TFoundationConfig::getPersonId,tFoundationPersonDTO.getId()));
@@ -122,21 +125,40 @@
    }

    @Override
    public List<TFoundationPersonVO> getSetList(TFoundationPersonQuery query) {
        List<TFoundationPersonVO> list = this.baseMapper.getSetList(query);
        List<Long> ids = list.stream().map(TFoundationPersonVO::getId).collect(Collectors.toList());
        if(!CollectionUtils.isEmpty(ids)){
            List<TFoundationConfig> list1 = foundationConfigService.list(Wrappers.lambdaQuery(TFoundationConfig.class)
                    .in(TFoundationConfig::getPersonId, ids));
            list.forEach(item -> {
                List<TFoundationConfig> collect = list1.stream().filter(item1 -> item1.getPersonId().equals(item.getId())).collect(Collectors.toList());
                if(!CollectionUtils.isEmpty(collect)){
                    item.setMinDish(collect.stream().sorted(Comparator.comparingInt(TFoundationConfig::getMinCount)).findFirst().get().getMinCount());
                    item.setMaxDish(collect.stream().sorted(Comparator.comparingInt(TFoundationConfig::getMaxCount).reversed()).findFirst().get().getMaxCount());
                    item.setFoundationConfigs(collect);
                }
            });
    public List<TFoundationPersonVO> getSetList() {
        List<TFoundationPersonVO> list = new ArrayList<>();
        List<TFoundationPersonVO> setList = this.baseMapper.getSetList();
        for (int i = 1; i <= 2; i++) {
            TFoundationPersonVO foundationPersonVO = new TFoundationPersonVO();
            foundationPersonVO.setMealType(i);
            int finalI = i;
            List<TFoundationPersonVO> collect = setList.stream().filter(e -> e.getMealType() == finalI).collect(Collectors.toList());
            if(!CollectionUtils.isEmpty(collect)){
                Integer minPerson = collect.stream().sorted(Comparator.comparingInt(TFoundationPerson::getMealCount)).findFirst().get().getMealCount();
                foundationPersonVO.setMinPerson(minPerson);
                Integer maxPerson = collect.stream().sorted(Comparator.comparingInt(TFoundationPerson::getMealCount).reversed()).findFirst().get().getMealCount();
                foundationPersonVO.setMaxPerson(maxPerson);
            }
            List<Long> ids = collect.stream().map(TFoundationPersonVO::getId).collect(Collectors.toList());
            if(!CollectionUtils.isEmpty(ids)){
                List<TFoundationConfig> list1 = foundationConfigService.list(Wrappers.lambdaQuery(TFoundationConfig.class)
                        .in(TFoundationConfig::getPersonId, ids));
                list.forEach(item -> {
                    List<TFoundationConfig> collect1 = list1.stream().filter(item1 -> item1.getPersonId().equals(item.getId())).collect(Collectors.toList());
                    if(!CollectionUtils.isEmpty(collect1)){
                        item.setMinDish(collect1.stream().sorted(Comparator.comparingInt(TFoundationConfig::getMinCount)).findFirst().get().getMinCount());
                        item.setMaxDish(collect1.stream().sorted(Comparator.comparingInt(TFoundationConfig::getMaxCount).reversed()).findFirst().get().getMaxCount());
                        item.setFoundationConfigs(collect1);
                    }
                });
            }
            list.add(foundationPersonVO);
        }
        return list;
    }

    @Override
    public List<TFoundationPersonVO> getPersonList() {
        return this.baseMapper.getSetList();
    }
}