From 10c23bd4369b1657a077a20e57d514632690ab52 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 23 八月 2023 18:04:12 +0800
Subject: [PATCH] 实验室管理=》角色管理
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/QualificationRateStatisticsServiceImpl.java | 12 ++++++++----
1 files changed, 8 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 4daef1c..83e1b27 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
@@ -168,8 +168,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 +177,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());
});
@@ -200,7 +200,11 @@
@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