From 07648f0083e80cc590ba8bc77a9e72be5ad66748 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 03 十二月 2024 16:59:45 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeMapper.java | 41 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 38 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeMapper.java
index c90161c..7f1a229 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeMapper.java
@@ -127,11 +127,36 @@
//List<VoOnLineIntake> getOnLineIntakes(@Param("onLineMap") String onLineMap, @Param("isOnLine") Boolean isOnLine);
List<VoOnLineIntake> getOnLineIntakes(Map<?, ?> params);
+
+ /**
+ * 鑾峰彇鍙栨按鍙ｆ暟閲忥紙鍦ㄧ嚎鎴栦笉鍦ㄧ嚎锛�
+ * @param params
+ * @return
+ */
+ Long selectIntakesCountForOnLine(Map<?, ?> params);
+
+ /**
+ * 鑾峰彇鍙栨按鍙ｅ垪琛ㄥ湪绾挎垨涓嶅湪绾匡級
+ * @param params
+ * @return
+ */
+ List<VoOnLineIntake> selectIntakesForOnLine(Map<?, ?> params);
+
+
+
+ /**
+ * 鏍规嵁鍙栨按鍙ｇ紪鍙疯幏鍙栧彇姘村彛瀵硅薄
+ * @param params
+ * @return
+ */
+ VoOnLineIntake getIntakeByName(Map<?, ?> params);
+
+
/**
* 鏍规嵁鎿嶄綔鍛樿幏鍙栧父鐢ㄥ彇姘村彛
* @return
*/
- List<VoOnLineIntake> getUsedIntakes(@Param("onLineMap") String onLineMap, @Param("operator") Long operator);
+ List<VoOnLineIntake> getUsedIntakes(@Param("onLineMap") String onLineMap, @Param("operatorId") Long operatorId);
/**
* 鍙栨按鍙ｅ悕绉版崲鍙栨按鍙D锛屾壂鐮佸紑闃�浣跨敤
@@ -141,8 +166,18 @@
Long getIntakeIdByName(String intakeName);
/**
- * 寰楀埌鎵�鏈夌殑鍙栨按鍙ｅ悕绉�
+ * 鍙栨按鍙ｅ悕绉版崲鍙栨按鍙D锛岄獙璇佹槸鍚﹂噸澶嶅悕绉颁娇鐢�
+ * @param intakeName
* @return
*/
- List<String> getIntakeName();
+ List<Long> getIntakeIdsByName(String intakeName);
+
+ /**
+ * 鍙栨按鍙ｅ悕绉版崲鍙栨按鍙D锛岄獙璇佹槸鍚﹂噸澶嶅悕绉颁娇鐢�
+ * @param id
+ * @param intakeName
+ * @return
+ */
+ List<Long> getIntakeIdByNameExcludeId(@Param("id")Long id, @Param("intakeName")String intakeName);
+
}
--
Gitblit v1.8.0