From 01d8de48c76467ff3b99b204e66d3ef86506fa52 Mon Sep 17 00:00:00 2001 From: zhibing.pu <393733352@qq.com> Date: 星期四, 25 七月 2024 18:23:40 +0800 Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0 --- ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSystemPriceMapper.xml | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSystemPriceMapper.xml b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSystemPriceMapper.xml index 42e2f0e..6e92c48 100644 --- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSystemPriceMapper.xml +++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSystemPriceMapper.xml @@ -23,6 +23,21 @@ 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 = 1 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> + <!--查询小件物流价格设置--> + <select id="getSpecialPriceList1" resultType="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 = 4 and o.state != 3 and o.companyId = #{companyId} <if test="name != null and name != ''"> and o.name LIKE CONCAT('%',#{name},'%') @@ -34,4 +49,17 @@ order by o.id desc </select> + <select id="query" resultType="map"> + select + id as id, + content as content + from t_system_price where companyId = #{companyId} + <if test="null != type"> + and `type` = #{type} + </if> + <if test="null != serverCarModelId"> + and serverCarModelId = #{serverCarModelId} + </if> + </select> + </mapper> -- Gitblit v1.7.1