无关风月
2025-08-06 053f6187b5f6cda1725ed63df8a8766b5976fb53
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TStrainReportServiceImpl.java
@@ -77,23 +77,28 @@
                        .filter(e -> e.getReportId().equals(tStrainReport.getId())&&
                                e.getEvaluateHumanType()==2).collect(Collectors.toList());
                // 菌种工程积分
                sum1 = tStrainReportDetails2.stream()
                sum1 = sum1.add(tStrainReportDetails2.stream()
                        .filter(e -> e.getEvaluateHumanType().equals(2))
                        .map(TStrainReportDetail::getEvaluateTotal)
                        .reduce(BigDecimal::add)
                        .orElse(BigDecimal.ZERO);
                        .orElse(BigDecimal.ZERO));
                // 菌种实验员积分
                sum2 = tStrainReportDetails1.stream()
                        .filter(e -> e.getEvaluateHumanType().equals(1))
                sum2 = sum2.add(tStrainReportDetails1.stream()
                        .filter(e -> e.getEvaluateHumanType().equals(1)
                        &&e.getReportType()==1)
                        .map(TStrainReportDetail::getEvaluateTotal)
                        .reduce(BigDecimal::add)
                        .orElse(BigDecimal.ZERO);
                List<TStrainReportDetail> collect3 = tStrainReportDetails.stream().filter(e -> e.getReportType() == 1).collect(Collectors.toList());
                for (TStrainReportDetail tStrainReportDetail : collect3) {
                        .orElse(BigDecimal.ZERO));
                List<TStrainReportDetail> tStrainReportDetails3 = tStrainReportDetails.stream().filter(e ->
                        e.getReportId().equals(tStrainReport.getId())
                        &&
                        e.getReportType() == 1).collect(Collectors.toList());
                for (TStrainReportDetail tStrainReportDetail : tStrainReportDetails3) {
                    // 根据评定等级统计失败次数
                    if (StringUtils.hasLength(tStrainReportDetail.getEvaluate())&&  tStrainReportDetail.getEvaluate().split(",").length>=5){
                        if (tStrainReportDetail.getEvaluate().split(",")[4].equals("2")){
                        if (tStrainReportDetail.getEvaluate().split(",")[4].equals("-3")){
                            temp++;
                            break;
                        }
                    }
                }
@@ -126,11 +131,13 @@
                    if (tStrainReportDetail.getExperimentId()!=null){
                        SysUser sysUser = sysUserMapper.selectUserById(Long.valueOf(tStrainReportDetail.getExperimentId()));
                        tStrainReportVO.setExperimentName(sysUser.getNickName());
                        break;
                    }
                }else if (tStrainReportDetail.getEvaluateHumanType()==2){
                    if (tStrainReportDetail.getExperimentId()!=null){
                        SysUser sysUser = sysUserMapper.selectUserById(Long.valueOf(tStrainReportDetail.getExperimentId()));
                        tStrainReportVO.setExperimentName(sysUser.getNickName());
                        break;
                    }
                }
            }