From 093f3d39a5c58fe88f7880899ff00fb6b92c35b8 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期二, 29 八月 2023 15:14:43 +0800
Subject: [PATCH] 修改设备，检验新增
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/QualificationRateStatisticsServiceImpl.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 4daef1c..8dd7601 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
@@ -70,7 +70,6 @@
int finalI = i;
mapList.stream().filter(m->Objects.equals(String.valueOf(m.get("type")),String.valueOf(TYPE_INT_LIST.get(finalI))))
.forEach(m->{
- System.out.println(m.get("type"));
if(Objects.equals(m.get("inspectionStatus"),0)){
integerNoPass.incrementAndGet();
}
@@ -89,7 +88,6 @@
list.add(mapNoPass);
mapResult.put("series",list);
mapResult.put("noData",true);
- System.out.println("鎵ц缁撴潫getTestSampleStatistics________________>"+mapResult);
//System.out.println(mapResult);
return mapResult;
}
@@ -153,7 +151,6 @@
seriesDtoList.add(seriesDto2);
allMap.put("series", seriesDtoList);
allMap.put("noData",true);
- System.out.println("getSupplierNoPassStatistics缁撴灉++++++++++++++++>"+allMap);
return allMap;
}
@@ -168,8 +165,8 @@
return allMap;
}
imInfos.forEach(l->{
- NameList.add(l.getICode()+"-"+l.getImName());
- projectByCodeAndNameDtos.add(new SelectProjectByCodeAndNameDto(l.getICode(),l.getImName()));
+ NameList.add(l.getImCode()+"-"+l.getImName());
+ projectByCodeAndNameDtos.add(new SelectProjectByCodeAndNameDto(l.getImCode(),l.getImName()));
});
List<ImInfo> imInfosAll = qualificationRateStatisticsMapper.selectProjection(projectByCodeAndNameDtos,dto);
int total = imInfosAll.size();
@@ -177,7 +174,7 @@
AtomicInteger i=new AtomicInteger(0);
NameList.forEach(n->{
imInfos.stream()
- .filter(im-> Objects.equals(n,im.getICode()+"-"+im.getImName()))
+ .filter(im-> Objects.equals(n,im.getImCode()+"-"+im.getImName()))
.forEach(im->{
i.set(im.getIprInfos().size());
});
@@ -194,13 +191,16 @@
allMap.put("legend",NameList);
allMap.put("series",doubleList);
allMap.put("noData",true);
- System.out.println("getNoPassProjectStatistics缁撴灉==========================>"+allMap);
return allMap;
}
@Override
public List<Map<String, Object>> getSampleOptions() {
- return qualificationRateStatisticsMapper.getSampleOptions();
+ List<Map<String, Object>> sampleOptions = qualificationRateStatisticsMapper.getSampleOptions();
+ //鍘婚噸鏍峰搧
+ List<Map<String, Object>> sampleOptionsDistinct = ArrayListUtil.oneObjectsDistinctByProperty(MapHandlerDto::comparingByCode, sampleOptions);
+ sampleOptionsDistinct.forEach(System.out::println);
+ return sampleOptionsDistinct;
}
public static String getPercent(long x, long y) {
--
Gitblit v1.9.3