From 093f3d39a5c58fe88f7880899ff00fb6b92c35b8 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期二, 29 八月 2023 15:14:43 +0800
Subject: [PATCH] 修改设备,检验新增

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

diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MetricalInformationServiceImpl.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MetricalInformationServiceImpl.java
index a2ad0d9..ae2dc00 100644
--- a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MetricalInformationServiceImpl.java
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MetricalInformationServiceImpl.java
@@ -1,9 +1,11 @@
 package com.yuanchu.limslaboratory.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.yuanchu.limslaboratory.pojo.MetricalInformation;
 import com.yuanchu.limslaboratory.mapper.MetricalInformationMapper;
+import com.yuanchu.limslaboratory.pojo.dto.UpdatedMetricalInformationDto;
 import com.yuanchu.limslaboratory.service.MetricalInformationService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yuanchu.limslaboratory.utils.FileSaveUtil;
@@ -36,12 +38,13 @@
             String fileName = FileSaveUtil.StoreFile(file);
             metricalInformation.setFilePath(fileName);
         }
+        metricalInformation.setCode(MyUtil.getTimeSixNumberCode("METRICALCODE","METRICALCODE"));
         return metricalInformationMapper.insert(metricalInformation);
     }
 
     @Override
-    public List<Map<String, Object>> getListEquipmentPointInformation() {
-        return metricalInformationMapper.getListEquipmentPointInformation();
+    public List<Map<String, Object>> getListEquipmentPointInformation(String InstrumentId) {
+        return metricalInformationMapper.getListEquipmentPointInformation(InstrumentId);
     }
 
     @Override
@@ -67,4 +70,20 @@
         }
         return metricalInformationMapper.updateById(metricalInformation);
     }
+
+    @Override
+    public boolean updateMetricalInformationInfo(UpdatedMetricalInformationDto dto) {
+        System.out.println(dto);
+        MetricalInformation info = new MetricalInformation();
+        info.setId(dto.getId());
+        info.setRemarks(dto.getRemarks());
+        info.setPerformanceIndex(dto.getPerformanceIndex());
+        info.setResult(dto.getResult());
+        info.setUncertainty(dto.getUncertainty());
+        info.setEndDate(dto.getDate());
+        info.setUpdateTime(DateUtil.date());
+        System.out.println(info);
+        //鏂囦欢婊よ繃
+        return metricalInformationMapper.updateById(info)>0;
+    }
 }

--
Gitblit v1.9.3