From 22106718c5845ccd8fa2328d39b28f88e9761e91 Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期二, 21 五月 2024 14:49:54 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSystemPriceMapper.xml | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSystemPriceMapper.xml b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSystemPriceMapper.xml index 08d30cb..2ec887d 100644 --- a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSystemPriceMapper.xml +++ b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSystemPriceMapper.xml @@ -33,5 +33,19 @@ </where> order by o.id desc </select> + <select id="getTransferPriceList" resultType="java.util.Map" parameterType="com.baomidou.mybatisplus.plugins.Page"> + SELECT * FROM (SELECT sp.id,sp.type,sp.companyId,sc.`name`,sc.img,sp.state from t_system_price as sp + LEFT JOIN t_server_carmodel as sc on sc.id = sp.serverCarModelId) as o + <where> + o.type = 7 and o.state != 3 and o.companyId = #{companyId} + <if test="name != null and name != ''"> + and o.name LIKE CONCAT('%',#{name},'%') + </if> + <if test="state != null and state != ''"> + and o.state = #{state} + </if> + </where> + order by o.id desc + </select> </mapper> -- Gitblit v1.7.1