From 4b55cf8d21443e366f83acf20c4333abef8f54ae Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 21 八月 2023 13:40:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/PlanService.java | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/PlanService.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/PlanService.java
index 205e0c8..65c7ba6 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/PlanService.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/PlanService.java
@@ -1,12 +1,7 @@
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.vo.PlanVo;
-
-import java.util.Date;
import java.util.List;
-import java.util.Objects;
+import java.util.Map;
/**
* <p>
@@ -21,6 +16,23 @@
* 鏌ヨ妫�楠岃鍒�
* @return
*/
- List<PlanVo> selectAllPlan(Integer deviceId, Date beginTime, Date endTime, Integer userId);
+ List<Map<String,Object>> selectAllPlan(String code , String beginTime, String endTime,Integer status);
+ /**
+ * 鍒嗛厤-->閫夋嫨妫�楠屼汉
+ * @return
+ */
+ List<Map<String,Object>> choosecheck();
+
+ /**
+ * 鍒嗛厤-->閫夋嫨璁惧
+ * @return
+ */
+ List<Map<String,Object>> chooseinstum();
+
+ /**
+ * 鍒嗛厤
+ * @return
+ */
+ String distribution(Integer id, Integer userId, Integer instrumentId);
}
--
Gitblit v1.9.3