ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOpenCityMapper.xml
@@ -24,17 +24,16 @@ id, code, lon, lat, isQualifications, areaName, cityName, provinceName, flag, insertTime, insertUser, updateTime, updateUser </sql> <!--根据条件查询开通城市列表--> <!--根据条件查询开通城市列表 update by yanghb--> <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 LEFT JOIN ( SELECT GROUP_CONCAT( CONCAT((case when businessType = 1 then '快车' 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 = 3 then '机场专线' when businessType = 7 then '景区直通车' when businessType = 8 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> @@ -49,16 +48,14 @@ order by o.id desc </select> <!--根据城市ID获取经营业务--> <!--根据城市ID获取经营业务 update by yanghb--> <select id="getBusinessByCityId" resultType="map"> SELECT DATE_FORMAT(bb.insertTime,'%Y-%m-%d') as insertTimeStr, case when bb.businessType = 1 then '快车' 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 = 7 then '95128电召' when bb.businessType = 3 then '机场专线' when bb.businessType = 7 then '景区直通车' when bb.businessType = 7 then '公务出行' else '' end as businessTypeStr,bb.* FROM t_open_city_business as bb where bb.openCityId = #{openCityId} and bb.flag != 3 </select> ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_add.html
@@ -25,8 +25,9 @@ <label class="col-sm-3 control-label">经营业务:</label> <div class="col-sm-3"> <select class="form-control" id="businessType"> <!-- update by yanghb --> <option value="">选择经营业务</option> <option value="1">快车/专车</option> <option value="1">专车/快车</option> <option value="2">出租车</option> <option value="3">机场专线</option> <option value="7">景区直通车</option> ManagementTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_edit.html
@@ -32,14 +32,13 @@ <label class="col-sm-3 control-label">经营业务:</label> <div class="col-sm-3"> <select class="form-control" id="businessType"> <!-- update by yanghb --> <option value="">选择经营业务</option> <option value="1">快车</option> <option value="1">专车/快车</option> <option value="2">出租车</option> <option value="3">跨城出行</option> <option value="4">跨城小件物流</option> <option value="5">同城小件物流</option> <option value="6">包车</option> <option value="7">95128</option> <option value="3">机场专线</option> <option value="7">景区直通车</option> <option value="8">公务出行</option> </select> </div> <div class="col-sm-3" > ZuulTravel/src/main/resources/application.yml
@@ -8,7 +8,7 @@ eureka: client: service-url: #注册中心地址 defaultZone: http://sinata:sinata@172.17.0.7:8081/eureka #启用身份验证的方式连接 defaultZone: http://sinata:sinata@127.0.0.1:8081/eureka #启用身份验证的方式连接 register-with-eureka: true #在注册中心进行注册 fetch-registry: true #从Eureka中获取注册信息。 instance: