From 521efb9bc33d52ef4772f0b30f8a371ba4b0070c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 11 二月 2023 19:09:42 +0800
Subject: [PATCH] 更新最新代码
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOpenCityMapper.xml | 21 +++++++--------------
1 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOpenCityMapper.xml b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOpenCityMapper.xml
index d435fbb..cda0ace 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOpenCityMapper.xml
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOpenCityMapper.xml
@@ -5,7 +5,7 @@
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TOpenCity">
<id column="id" property="id" />
- <result column="code" property="code" />
+ <result column="cityId" property="cityId" />
<result column="lon" property="lon" />
<result column="lat" property="lat" />
<result column="isQualifications" property="isQualifications" />
@@ -21,20 +21,17 @@
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
- id, code, lon, lat, isQualifications, areaName, cityName, provinceName, flag, insertTime, insertUser, updateTime, updateUser
+ id, cityId, lon, lat, isQualifications, areaName, cityName, provinceName, flag, insertTime, insertUser, updateTime, updateUser
</sql>
<!--根据条件查询开通城市列表-->
<select id="getOpenCityList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
- SELECT * FROM (SELECT ocb.str as business,oc.* FROM t_open_city as oc
+ SELECT * FROM (SELECT ocb.str as business,oc.*,b.chineseName FROM t_open_city as oc
+ left join t_city b on (oc.cityId = b.id)
LEFT JOIN (
SELECT GROUP_CONCAT(
CONCAT((case when businessType = 1 then '专车'
- when businessType = 2 then '出租车'
- when businessType = 3 then '跨城出行'
- when businessType = 4 then '同城小件物流'
- when businessType = 5 then '跨城小件物流'
- when businessType = 6 then '包车'
+ when businessType = 4 then '市内小件物流'
else '' end),' ：',sort)) as str,openCityId from t_open_city_business where flag != 3 GROUP BY openCityId
) as ocb on ocb.openCityId = oc.id) as o
<where>
@@ -43,7 +40,7 @@
AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
</if>
<if test="condition != null and condition != ''">
- and (o.areaName LIKE CONCAT('%',#{condition},'%') or o.cityName LIKE CONCAT('%',#{condition},'%') or o.provinceName LIKE CONCAT('%',#{condition},'%'))
+ and (b.chineseName LIKE CONCAT('%',#{condition},'%') or b.englishName LIKE CONCAT('%',#{condition},'%') or b.frenchName LIKE CONCAT('%',#{condition},'%'))
</if>
</where>
order by o.id desc
@@ -53,11 +50,7 @@
<select id="getBusinessByCityId" resultType="map">
SELECT DATE_FORMAT(bb.insertTime,'%Y-%m-%d') as insertTimeStr,
case when bb.businessType = 1 then '专车'
- when bb.businessType = 2 then '出租车'
- when bb.businessType = 3 then '跨城出行'
- when bb.businessType = 4 then '同城小件物流'
- when bb.businessType = 5 then '跨城小件物流'
- when bb.businessType = 6 then '包车'
+ when bb.businessType = 4 then '市内小件物流'
else '' end as businessTypeStr,bb.*
FROM t_open_city_business as bb where bb.openCityId = #{openCityId} and bb.flag != 3
</select>
--
Gitblit v1.7.1