From 72b5d23ab48368c9a8da28b91d0da1e6d7d1c4f0 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 22 十一月 2024 16:24:44 +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 | 24 +++++++++++++++++++++---
1 files changed, 21 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 c5c2f24..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
@@ -113,19 +113,36 @@
List<Map<String, Object>> getNoBindingIntakes();
/**
- * 鑾峰彇鍙栨按鍙ｆ暟閲忥紙鍦ㄧ嚎鍜屼笉鍦ㄧ嚎锛夊簾寮�
+ * 鑾峰彇鍙栨按鍙ｆ暟閲忥紙鍦ㄧ嚎鍜屼笉鍦ㄧ嚎锛�
* @param params
* @return
*/
Long getOnLineIntakesCount(Map<?, ?> params);
/**
- * 鑾峰彇鍙栨按鍙ｅ垪琛紙鍦ㄧ嚎鍜屼笉鍦ㄧ嚎锛夊簾寮�
+ * 鑾峰彇鍙栨按鍙ｅ垪琛紙鍦ㄧ嚎鍜屼笉鍦ㄧ嚎锛�
* @param params
* @return
*/
//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);
+
+
/**
* 鏍规嵁鍙栨按鍙ｇ紪鍙疯幏鍙栧彇姘村彛瀵硅薄
@@ -139,7 +156,7 @@
* 鏍规嵁鎿嶄綔鍛樿幏鍙栧父鐢ㄥ彇姘村彛
* @return
*/
- List<VoOnLineIntake> getUsedIntakes(@Param("onLineMap") String onLineMap, @Param("operator") Long operator);
+ List<VoOnLineIntake> getUsedIntakes(@Param("onLineMap") String onLineMap, @Param("operatorId") Long operatorId);
/**
* 鍙栨按鍙ｅ悕绉版崲鍙栨按鍙D锛屾壂鐮佸紑闃�浣跨敤
@@ -162,4 +179,5 @@
* @return
*/
List<Long> getIntakeIdByNameExcludeId(@Param("id")Long id, @Param("intakeName")String intakeName);
+
}
--
Gitblit v1.8.0