zxl
2025-04-17 da269c70838314527ca3e5c281be54e19fde1b2f
ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java
@@ -167,7 +167,7 @@
//        }
        List<CheckScore> checkScores = scoreMapper.selectCheckScoreMap(checkScore);
        log.error("打印:{}",checkScores);
        // 如果数据为空,则查询之前的数据
        if (CollectionUtils.isEmpty(checkScores) && (query.getStartDate() ==null || query.getStartDate() ==null)) {
            CheckScore one = scoreMapper.getLast(checkScore);
@@ -180,7 +180,30 @@
        }
        //分数保留一位小数
        checkScores.stream().forEach(item -> item.setScore(item.getScore().setScale(1, RoundingMode.HALF_UP)));
        return checkScores.stream().collect(Collectors.groupingBy(CheckScore::getDeptId));
        Map<Long, List<CheckScore>> map = checkScores.stream().collect(Collectors.groupingBy(CheckScore::getDeptId));
        for (Map.Entry<Long, List<CheckScore>> entry : map.entrySet()) {
            List<CheckScore> tempList = getCheckScores(entry);
            // 迭代结束后,将新元素添加到原始列表中
            entry.getValue().addAll(tempList);
        }
        return map;
    }
    private List<CheckScore> getCheckScores(Map.Entry<Long, List<CheckScore>> entry) {
        List<CheckScore> tempList = new ArrayList<>(); // 临时存储需要添加的元素
        for (CheckScore listCheckScore : entry.getValue()) {
            if (listCheckScore.getExamineCategory() == 1 && entry.getValue().size() == 1) {
                CheckScore face = new CheckScore();
                face.setExamineCategory((short) 2);
                face.setScore(new BigDecimal("0.0"));
                CheckScore car = new CheckScore();
                car.setExamineCategory((short) 3);
                car.setScore(new BigDecimal("0.0"));
                tempList.add(face);
                tempList.add(car);
            }
        }
        return tempList;
    }
    private void getCheckScore(CheckScore checkScore) {