From 15e31c6e6550f9e8bf6fb1df5ca5ad4cc726b64f Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 26 八月 2023 13:30:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductService.java | 47 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 37 insertions(+), 10 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductService.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductService.java
index 8fbb6af..a81e74a 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductService.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductService.java
@@ -1,13 +1,10 @@
package com.yuanchu.limslaboratory.service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.Product;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
import java.util.Map;
-import java.util.Objects;
/**
@@ -21,14 +18,44 @@
public interface ProductService extends IService<Product> {
void deleteProductInformation(List<Integer> SpecificationsId);
- IPage<Map<String, Object>> pageProductInformation(String productCodeOrName, Integer specificationsId, Page<Objects> page);
-
- List<Map<String, Object>> pageFatherNameProductInformation(String fatherName);
-
/**
- * 閫氳繃椤圭洰鍚嶆煡璇㈤」鐩殑璇曢獙鏂规硶
- * @param name
+ * 灞曠ず璇ュ瀷鍙蜂笅鐨勬楠岄」鐩姹�-->閫夋嫨鐗堟湰
+ * @param specificationsId
* @return
*/
- List<Map> selectInstrumentByProname(String name);
+ List<Integer> chooseVersion(Integer specificationsId);
+
+
+ /**
+ * 灞曠ず璇ュ瀷鍙蜂笅鐨勬楠岄」鐩姹�
+ * @param specificationsId
+ * @return
+ */
+ List<Map<String,Object>> pageProductInformation(Integer specificationsId,Integer version);
+
+ /**
+ * 濉啓鏍囧噯鍊间笌鍐呮帶鍊�,榧犳爣绉诲紑淇濆瓨
+ * @param id
+ * @param required
+ * @param internal
+ * @return
+ */
+ Integer write(Integer id, String required, String internal);
+
+ void deleteList(String ids);
+
+ /**
+ * 娣诲姞鍚屼竴涓瀷鍙风殑鍏朵粬鐗堟湰
+ * @param specificationsId
+ * @return
+ */
+ Integer addVersion(Integer specificationsId);
+
+
+ /**
+ * 鏌ヨ璇ュ瀷鍙蜂笅鐨勬墍鏈夎瘯楠岄」鐩�(鐖剁被)
+ * @param modelId
+ * @return
+ */
+ List<Map<String,Object>> chooseProject(Integer modelId);
}
--
Gitblit v1.9.3