From f6fcea400ef3e1ae23607c1cb4da776a70fc4240 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 30 八月 2023 15:11:51 +0800
Subject: [PATCH] 合格率统计修改
---
laboratory-server/src/main/resources/mapper/InstrumentMapper.xml | 4 ++--
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/QualificationRateStatisticsController.java | 3 ---
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/QualificationRateStatisticsServiceImpl.java | 9 +++++----
laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/InstrumentMapper.java | 2 +-
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/RawMaterialController.java | 4 ++++
5 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/QualificationRateStatisticsController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/QualificationRateStatisticsController.java
index 6bdf287..9f78f60 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/QualificationRateStatisticsController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/QualificationRateStatisticsController.java
@@ -35,7 +35,6 @@
@GetMapping("/getTestSampleStatistics")
@AuthHandler
public Result<?> getTestSampleStatistics(SelectQualificationRateDto dto){
- System.out.println("getTestSampleStatistics______________>"+dto);
return Result.success(service.getTestSampleStatistics(dto));
}
@@ -43,7 +42,6 @@
@GetMapping("/getSupplierNoPassStatistics")
@AuthHandler
public Result<?> getSupplierNoPassStatistics(SelectQualificationRateDto dto){
- System.out.println("getSupplierNoPassStatistics++++++++++++++++>"+dto);
return Result.success(service.getSupplierNoPassStatistics(dto));
}
@@ -51,7 +49,6 @@
@GetMapping("/getNoPassProjectStatistics")
@AuthHandler
public Result<?> getNoPassProjectStatistics(SelectQualificationRateDto dto){
- System.out.println("getNoPassProjectStatistics===============>"+dto);
return Result.success(service.getNoPassProjectStatistics(dto));
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/RawMaterialController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/RawMaterialController.java
index 99d8572..aa08081 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/RawMaterialController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/RawMaterialController.java
@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.annotation.AuthHandler;
+import com.yuanchu.limslaboratory.enums.InterfaceType;
+import com.yuanchu.limslaboratory.enums.MenuEnums;
import com.yuanchu.limslaboratory.pojo.RawMaterial;
import com.yuanchu.limslaboratory.service.RawMaterialService;
import com.yuanchu.limslaboratory.vo.Result;
@@ -56,6 +58,7 @@
@ApiOperation("鍘熸潗鏂欐姤妫�娣诲姞")
@PostMapping("/add")
+ @AuthHandler(type = InterfaceType.ADD,menuId = MenuEnums.reportForInspection,isAdd = true)
public Result<?> insertRawMaterial(@Validated @RequestBody RawMaterial rawMaterial) {
Integer integer = rawMaterialService.insertRawMaterial(rawMaterial);
if (integer >= 1) {
@@ -66,6 +69,7 @@
@ApiOperation("鍘熸潗鏂欐姤妫�鍒犻櫎")
@PostMapping("/delete")
+ @AuthHandler(type = InterfaceType.DELETE,menuId = MenuEnums.reportForInspection,isAdd = true)
public Result<?> deleteRawMaterial(String deleteId) {
Integer integer = rawMaterialService.deleteRawMaterial(deleteId);
if (integer >= 1) {
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()));
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/InstrumentMapper.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/InstrumentMapper.java
index affbdc7..a0dcfed 100644
--- a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/InstrumentMapper.java
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/InstrumentMapper.java
@@ -26,5 +26,5 @@
//鍒嗛厤-->閫夋嫨璁惧
List<Map<String, Object>> chooseinstum();
- List<Instrument> getInstrument();
+ List<Map<String, String>> getInstrument();
}
diff --git a/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml b/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml
index 3aa5914..5031258 100644
--- a/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml
+++ b/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml
@@ -46,7 +46,7 @@
left join lims_laboratory.classify c on c.id = instrument.classify_id
where conditions in(1,5)
</select>
- <select id="getInstrument" resultType="com.yuanchu.limslaboratory.pojo.Instrument">
- select id,equipment_name name from instrument where 1=1 and state=1 and conditions=5
+ <select id="getInstrument" resultType="map">
+ select id,equipment_name equipmentName from instrument where 1=1 and state=1 and conditions=5
</select>
</mapper>
--
Gitblit v1.9.3