From 924d018e6e6f15effbd272cead5dff67cd3b93a5 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 23 八月 2023 16:22:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MetricalInformationServiceImpl.java | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 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 74ed4a4..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,6 +38,7 @@
String fileName = FileSaveUtil.StoreFile(file);
metricalInformation.setFilePath(fileName);
}
+ metricalInformation.setCode(MyUtil.getTimeSixNumberCode("METRICALCODE","METRICALCODE"));
return metricalInformationMapper.insert(metricalInformation);
}
@@ -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