From b7586ba9b38136c7af8ca9b31f92f570a0b039c2 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期一, 21 八月 2023 18:02:35 +0800
Subject: [PATCH] 计量管理-》计量修改                                  试验管理-》合格率统计

---
 laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/EquipmentPointServiceImpl.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/EquipmentPointServiceImpl.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/EquipmentPointServiceImpl.java
index c0ba3ff..94dc21a 100644
--- a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/EquipmentPointServiceImpl.java
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/EquipmentPointServiceImpl.java
@@ -36,6 +36,7 @@
         LambdaQueryWrapper<EquipmentPoint> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(EquipmentPoint::getEquipmentPoint, equipmentPoint.getEquipmentPoint());
         wrapper.eq(EquipmentPoint::getState, 1);
+        wrapper.eq(EquipmentPoint::getInstrumentId, equipmentPoint.getInstrumentId());
         wrapper.select(EquipmentPoint::getEquipmentPoint);
         EquipmentPoint equipmentPoint1 = equipmentPointMapper.selectOne(wrapper);
         if (ObjectUtils.isEmpty(equipmentPoint1)){
@@ -45,8 +46,8 @@
     }
 
     @Override
-    public List<Map<String, Object>> getListEquipmentPointInformation() {
-        return equipmentPointMapper.getListEquipmentPointInformation();
+    public List<Map<String, Object>> getListEquipmentPointInformation(String InstrumentId) {
+        return equipmentPointMapper.getListEquipmentPointInformation(InstrumentId);
     }
 
     @Override

--
Gitblit v1.9.3