From 6da289fff756eaecc600422d77c4afff1ddebab0 Mon Sep 17 00:00:00 2001 From: zhanghl <253316343@qq.com> Date: 星期五, 23 五月 2025 15:23:50 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsShopMapper.java | 35 ++++++++++++++++++++++++++++++++++- 1 files changed, 34 insertions(+), 1 deletions(-) diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsShopMapper.java b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsShopMapper.java index 491ee60..7de4790 100644 --- a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsShopMapper.java +++ b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsShopMapper.java @@ -1,8 +1,13 @@ package com.aps.core.mapper; import java.util.List; +import java.util.Set; + import com.aps.core.domain.ApsShop; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; +import org.jetbrains.annotations.NotNull; /** * 杞﹂棿Mapper鎺ュ彛 @@ -11,7 +16,7 @@ * @date 2025-04-14 */ @Mapper -public interface ApsShopMapper +public interface ApsShopMapper extends BaseMapper<ApsShop> { /** * 鏌ヨ杞﹂棿 @@ -60,4 +65,32 @@ * @return 缁撴灉 */ public int deleteApsShopByIds(String[] ids); + + + @Select(""" + <script> + select * from aps_shop where 1 = 0 + <if test="!codes.isEmpty()"> or shop_name in + <foreach collection="names" item="item" open="(" separator="," close=")"> + #{item} + </foreach> + </if> + </script> + """) + List<ApsShop> selectApsByName(@NotNull Set<String> names); + + @Select("select * from aps_shop where plant_code = #{orgCode}") + List<ApsShop> selectApsByFactory(String orgCode); + + @Select(""" + <script> + select * from aps_shop where 1 = 0 + <if test="!codes.isEmpty()"> or shop_code in + <foreach collection="codes" item="item" open="(" separator="," close=")"> + #{item} + </foreach> + </if> + </script> + """) + List<ApsShop> selectByCodes(Set<String> codes); } -- Gitblit v1.9.3