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/java/com/yuanchu/limslaboratory/service/impl/MetricalInformationServiceImpl.java | 71 +++++++++++++++++++++++++++++++++++
1 files changed, 70 insertions(+), 1 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 267662c..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,10 +1,22 @@
package com.yuanchu.limslaboratory.service.impl;
-import com.yuanchu.limslaboratory.entity.MetricalInformation;
+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;
+import com.yuanchu.limslaboratory.utils.MyUtil;
import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -17,4 +29,61 @@
@Service
public class MetricalInformationServiceImpl extends ServiceImpl<MetricalInformationMapper, MetricalInformation> implements MetricalInformationService {
+ @Resource
+ private MetricalInformationMapper metricalInformationMapper;
+
+ @Override
+ public Integer addEquipmentPointInformation(MetricalInformation metricalInformation, MultipartFile file) {
+ if (!ObjectUtils.isEmpty(file)){
+ 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(String InstrumentId) {
+ return metricalInformationMapper.getListEquipmentPointInformation(InstrumentId);
+ }
+
+ @Override
+ public Integer deleteMetricalInformation(Integer metricalInformationId) {
+ LambdaUpdateWrapper<MetricalInformation> updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.eq(MetricalInformation::getId, metricalInformationId);
+ updateWrapper.set(MetricalInformation::getState, 0);
+ return metricalInformationMapper.update(new MetricalInformation(), updateWrapper);
+ }
+
+ @Override
+ public Integer updateMetricalInformation(MetricalInformation metricalInformation, MultipartFile file) {
+ if (!ObjectUtils.isEmpty(file)){
+ String fileName = FileSaveUtil.StoreFile(file);
+ metricalInformation.setFilePath(fileName);
+ LambdaQueryWrapper<MetricalInformation> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(MetricalInformation::getId, metricalInformation.getId());
+ wrapper.select(MetricalInformation::getFilePath);
+ MetricalInformation metricalInformation1 = metricalInformationMapper.selectOne(wrapper);
+ if (!ObjectUtils.isEmpty(metricalInformation1.getFilePath())){
+ FileSaveUtil.DeleteFile(metricalInformation1.getFilePath());
+ }
+ }
+ 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