Merge remote-tracking branch 'origin/dev' into dev

hongjli

2025-05-23 a57390bfc4f92178e2adba3a2973ef6df0807656

 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);
}