From 093f3d39a5c58fe88f7880899ff00fb6b92c35b8 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期二, 29 八月 2023 15:14:43 +0800
Subject: [PATCH] 修改设备，检验新增
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RawMaterialServiceImpl.java | 33 +++++----------------------------
1 files changed, 5 insertions(+), 28 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RawMaterialServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RawMaterialServiceImpl.java
index 2722a1a..b72eba2 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RawMaterialServiceImpl.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RawMaterialServiceImpl.java
@@ -1,22 +1,14 @@
package com.yuanchu.limslaboratory.service.impl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yuanchu.limslaboratory.pojo.Instrument;
import com.yuanchu.limslaboratory.pojo.RawMaterial;
import com.yuanchu.limslaboratory.mapper.RawMaterialMapper;
-import com.yuanchu.limslaboratory.pojo.vo.InspectionVo;
import com.yuanchu.limslaboratory.service.RawMaterialService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
-
import javax.annotation.Resource;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -37,7 +29,6 @@
/**
* 鍒嗛〉鏌ヨ
- *
* @param materialCoding
* @param materialName
* @param condition
@@ -46,8 +37,8 @@
* @return
*/
@Override
- public IPage<RawMaterial> selectRawMaterial(String materialCoding, String materialName, Integer condition, String createTime, Page<Objects> page) {
- return rawMaterialMapper.selectRawMaterial(materialCoding, materialName, condition, createTime, page);
+ public IPage<RawMaterial> selectRawMaterial(String materialCoding, String materialName, Integer type, String createTime, Page<Objects> page) {
+ return rawMaterialMapper.selectRawMaterial(materialCoding, materialName, type, createTime, page);
}
/**
@@ -56,23 +47,9 @@
* @return
*/
@Override
- public List<RawMaterial> selectRawmaAll() {
+ public List<Map<String, Object>> selectRawmaAll() {
return rawMaterialMapper.selectRawmaAll();
}
- /**
- * 閫夋嫨鍘熸潗鏂欐姤妫�
- *
- * @param id
- * @return
- */
- @Override
- public InspectionVo selectRawmaById(Integer id, String startTime, String endTime) throws ParseException {
- InspectionVo inspectionVo = rawMaterialMapper.selectRawmaById(id);
- SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
- inspectionVo.setStartTime(formatter.parse(startTime));
- inspectionVo.setEndTime(formatter.parse(endTime));
- inspectionVo.setType(0);
- return inspectionVo;
- }
+
}
--
Gitblit v1.9.3