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'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RawMaterialServiceImpl.java | 28 ++--------------------------
1 files changed, 2 insertions(+), 26 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..de3cc31 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,24 +1,15 @@
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 +28,6 @@
/**
* 鍒嗛〉鏌ヨ
- *
* @param materialCoding
* @param materialName
* @param condition
@@ -60,19 +50,5 @@
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