From 21c22f67b526c446b9f12c2365ec9c0fcab8cec8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 22 八月 2023 17:51:09 +0800
Subject: [PATCH] 改动7.0

---
 inspection-server/src/main/java/com/yuanchu/limslaboratory/service/RawMaterialService.java |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/RawMaterialService.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/RawMaterialService.java
index 8ba5217..fbe9206 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/RawMaterialService.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/RawMaterialService.java
@@ -4,13 +4,17 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yuanchu.limslaboratory.pojo.RawMaterial;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yuanchu.limslaboratory.pojo.vo.InspectionVo;
 
+import java.text.ParseException;
+import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
 /**
  * <p>
- *  鏈嶅姟绫�
+ * 鏈嶅姟绫�
  * </p>
  *
  * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
@@ -18,5 +22,14 @@
  */
 public interface RawMaterialService extends IService<RawMaterial> {
 
-    IPage<RawMaterial> selectRawMaterial(String materialCoding, String materialName, String condition, String createTime, Page<Objects> page);
+    IPage<RawMaterial> selectRawMaterial(String materialCoding, String materialName, Integer condition, String createTime, Page<Objects> page);
+
+    /**
+     * 鏌ヨ鍘熸潗鏂欐楠�
+     *
+     * @return
+     */
+    List<RawMaterial> selectRawmaAll();
+
+
 }

--
Gitblit v1.9.3