From f6fcea400ef3e1ae23607c1cb4da776a70fc4240 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 30 八月 2023 15:11:51 +0800
Subject: [PATCH] 合格率统计修改
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/QualificationRateStatisticsServiceImpl.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/QualificationRateStatisticsServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/QualificationRateStatisticsServiceImpl.java
index 8dd7601..a6b3e78 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/QualificationRateStatisticsServiceImpl.java
+++ b/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()));
--
Gitblit v1.9.3