autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-20 02:55:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	jsowell-pile/src/main/java/com/jsowell/pile/domain/PileStationInfo.java
This commit is contained in:
YAS\29473
2025-05-20 15:36:38 +08:00
parent 31e194a879 ad38a4a81b
commit e197ce083f
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml
View File

@@ -54,20 +54,21 @@
<result property="printerFlag" column="printer_flag" />
<result property="barrierFlag" column="barrier_flag" />
<result property="parkingLockFlag" column="parking_lock_flag" />
<result property="serviceRate" column="service_rate" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="delFlag" column="del_flag" />
</resultMap>
<sql id="Base_Column_List">
id,merchant_id, station_name, dept_id, parking_id, qrcode_prefix, alone_apply, account_number, capacity, public_parking, parking_number,
park_fee_describe, country_code, area_code, address, station_tel, service_tel, station_type, station_status, station_admin_name, park_nums,
station_lng, station_lat, site_guide, operator_name, amap_station_name, construction, pictures, match_cars, park_info, park_owner,
park_manager, open_all_day, business_hours, park_free, payment, support_order, remark, public_flag, amap_flag,
open_flag, toilet_flag, store_flag, restaurant_flag, lounge_flag, canopy_flag, printer_flag, barrier_flag,
parking_lock_flag, create_by, create_time, update_by, update_time, del_flag
parking_lock_flag, service_rate, create_by, create_time, update_by, update_time, del_flag
</sql>
<sql id="selectPileStationInfoVo">
@@ -109,8 +110,7 @@
<if test="parkOwner != null and parkOwner != ''"> and park_owner = #{parkOwner}</if>
<if test="parkManager != null and parkManager != ''"> and park_manager = #{parkManager}</if>
<if test="openAllDay != null and openAllDay != ''"> and open_all_day = #{openAllDay}</if>
<if test="businessHours != null and businessHours != ''">
and business_hours = #{businessHours}</if>
<if test="businessHours != null and businessHours != ''"> and business_hours = #{businessHours}</if>
<if test="parkFree != null and parkFree != ''"> and park_free = #{parkFree}</if>
<if test="payment != null and payment != ''"> and payment = #{payment}</if>
<if test="supportOrder != null and supportOrder != ''"> and support_order = #{supportOrder}</if>
@@ -125,6 +125,7 @@
<if test="printerFlag != null and printerFlag != ''"> and printer_flag = #{printerFlag}</if>
<if test="barrierFlag != null and barrierFlag != ''"> and barrier_flag = #{barrierFlag}</if>
<if test="parkingLockFlag != null and parkingLockFlag != ''"> and parking_lock_flag = #{parkingLockFlag}</if>
<if test="serviceRate != null and serviceRate != ''"> and service_rate = #{serviceRate}</if>
</where>
</select>
@@ -185,6 +186,7 @@
<if test="printerFlag != null">printer_flag,</if>
<if test="barrierFlag != null">barrier_flag,</if>
<if test="parkingLockFlag != null">parking_lock_flag,</if>
<if test="serviceRate != null">servicee_rate,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
@@ -241,6 +243,7 @@
<if test="printerFlag != null">#{printerFlag},</if>
<if test="barrierFlag != null">#{barrierFlag},</if>
<if test="parkingLockFlag != null">#{parkingLockFlag},</if>
<if test="serviceRate != null">#{serviceRate},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
@@ -300,6 +303,7 @@
<if test="printerFlag != null">printer_flag = #{printerFlag},</if>
<if test="barrierFlag != null">barrier_flag = #{barrierFlag},</if>
<if test="parkingLockFlag != null">parking_lock_flag = #{parkingLockFlag},</if>
<if test="serviceRate != null">service_rate = #{serviceRate},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
@@ -724,4 +728,4 @@
ORDER BY
chargeNum DESC;
</select>
</mapper>
</mapper>