合格率统计修改

Fixiaobai

2023-08-30 f6fcea400ef3e1ae23607c1cb4da776a70fc4240

 inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/QualificationRateStatisticsServiceImpl.java

@@ -88,7 +88,6 @@
        list.add(mapNoPass);
        mapResult.put("series",list);
        mapResult.put("noData",true);
        //System.out.println(mapResult);
        return mapResult;
    }

@@ -106,8 +105,10 @@
        supplierDistinct.forEach(l -> {
            supplierList.add(String.valueOf(l.get("supplier")));
        });
        //x轴
        allMap.put("xAxis", supplierList);
        List<SeriesDto> seriesDtoList = new ArrayList<SeriesDto>(2);
        //title
        SeriesDto seriesDto = new SeriesDto("合格数量");
        SeriesDto seriesDto2 = new SeriesDto("不合格数量");
        // 取出对应合格数量不合格数量
@@ -121,7 +122,7 @@
                    .forEach(l -> {
                        if (Objects.equals(l.get("inspectionStatus"), 1)) {
                            integerPass.incrementAndGet();
                        } else {
                        } else if(Objects.equals(l.get("inspectionStatus"), 0)) {
                            integerNoPass.incrementAndGet();
                        }
                    });
@@ -158,12 +159,12 @@
    public Map<String, Object> getNoPassProjectStatistics(SelectQualificationRateDto dto) {
        Map<String, Object> allMap = new HashMap<>(16);
        List<ImInfo> imInfos = qualificationRateStatisticsMapper.selectProjectionsByCondition(dto);
        List<String>NameList = new ArrayList<>();
        List<SelectProjectByCodeAndNameDto>projectByCodeAndNameDtos=new ArrayList<>();
        if(imInfos.size()<=0){
            allMap.put("noData",false);
            return allMap;
        }
        List<String>NameList = new ArrayList<>();
        List<SelectProjectByCodeAndNameDto>projectByCodeAndNameDtos=new ArrayList<>();
        imInfos.forEach(l->{
            NameList.add(l.getImCode()+"-"+l.getImName());
            projectByCodeAndNameDtos.add(new SelectProjectByCodeAndNameDto(l.getImCode(),l.getImName()));