From baff68fa55ed3212f618330e18cc5735b1caf57f Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期六, 12 十月 2024 10:06:37 +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 | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 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..f67fb00 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 @@ -128,6 +128,14 @@ List<VoOnLineIntake> getOnLineIntakes(Map<?, ?> params); /** + * 鏍规嵁鍙栨按鍙g紪鍙疯幏鍙栧彇姘村彛瀵硅薄 + * @param params + * @return + */ + VoOnLineIntake getIntakeByName(Map<?, ?> params); + + + /** * 鏍规嵁鎿嶄綔鍛樿幏鍙栧父鐢ㄥ彇姘村彛 * @return */ @@ -141,8 +149,18 @@ Long getIntakeIdByName(String intakeName); /** - * 寰楀埌鎵�鏈夌殑鍙栨按鍙e悕绉� + * 鍙栨按鍙e悕绉版崲鍙栨按鍙D锛岄獙璇佹槸鍚﹂噸澶嶅悕绉颁娇鐢� + * @param intakeName * @return */ - List<String> getIntakeName(); + List<Long> getIntakeIdsByName(String intakeName); + + /** + * 鍙栨按鍙e悕绉版崲鍙栨按鍙D锛岄獙璇佹槸鍚﹂噸澶嶅悕绉颁娇鐢� + * @param id + * @param intakeName + * @return + */ + List<Long> getIntakeIdByNameExcludeId(@Param("id")Long id, @Param("intakeName")String intakeName); + } -- Gitblit v1.8.0