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

Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2024-01-08 15:04:56 +08:00
parent 797971fdc9 406d5a1d5f
commit ecbb04e853
2 changed files with 45 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml
View File

@@ -9,6 +9,7 @@
<result column="status" jdbcType="CHAR" property="status"/>
<result column="member_id" jdbcType="VARCHAR" property="memberId"/>
<result column="station_id" jdbcType="VARCHAR" property="stationId"/>
<result column="plate_number" jdbcType="VARCHAR" property="plateNumber"/>
<result column="order_code" jdbcType="VARCHAR" property="orderCode"/>
<result column="transaction_code" jdbcType="VARCHAR" property="transactionCode"/>
<result column="start_time" jdbcType="TIMESTAMP" property="startTime"/>
@@ -31,6 +32,7 @@
`status`,
member_id,
station_id,
plate_number,
order_code,
transaction_code,
start_time,
@@ -63,13 +65,13 @@
useGeneratedKeys="true">
<!--@mbg.generated-->
insert into order_pile_occupy (occupy_code, `status`, member_id,
station_id, order_code, transaction_code,
station_id, plate_number, order_code, transaction_code,
start_time, end_time, pay_status,
order_amount, pile_sn, connector_code,
pile_connector_code, create_time, create_by,
update_time, update_by, del_flag)
values (#{occupyCode,jdbcType=VARCHAR}, #{status,jdbcType=CHAR}, #{memberId,jdbcType=VARCHAR},
#{stationId,jdbcType=VARCHAR}, #{orderCode,jdbcType=VARCHAR}, #{transactionCode,jdbcType=VARCHAR},
#{stationId,jdbcType=VARCHAR}, #{plateNumber,jdbcType=VARCHAR}, #{orderCode,jdbcType=VARCHAR}, #{transactionCode,jdbcType=VARCHAR},
#{startTime,jdbcType=TIMESTAMP}, #{endTime,jdbcType=TIMESTAMP}, #{payStatus,jdbcType=VARCHAR},
#{orderAmount,jdbcType=DECIMAL}, #{pileSn,jdbcType=VARCHAR}, #{connectorCode,jdbcType=VARCHAR},
#{pileConnectorCode,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{createBy,jdbcType=VARCHAR},
@@ -92,6 +94,9 @@
<if test="stationId != null">
station_id,
</if>
<if test="plateNumber != null">
plate_number,
</if>
<if test="orderCode != null">
order_code,
</if>
@@ -148,6 +153,9 @@
<if test="stationId != null">
#{stationId,jdbcType=VARCHAR},
</if>
<if test="plateNumber != null">
#{plateNumber,jdbcType=VARCHAR},
</if>
<if test="orderCode != null">
#{orderCode,jdbcType=VARCHAR},
</if>
@@ -208,6 +216,9 @@
<if test="stationId != null">
station_id = #{stationId,jdbcType=VARCHAR},
</if>
<if test="plateNumber != null">
plate_number = #{plateNumber,jdbcType=VARCHAR},
</if>
<if test="orderCode != null">
order_code = #{orderCode,jdbcType=VARCHAR},
</if>
@@ -260,6 +271,7 @@
`status` = #{status,jdbcType=CHAR},
member_id = #{memberId,jdbcType=VARCHAR},
station_id = #{stationId,jdbcType=VARCHAR},
plate_number = #{plateNumber,jdbcType=VARCHAR},
order_code = #{orderCode,jdbcType=VARCHAR},
transaction_code = #{transactionCode,jdbcType=VARCHAR},
start_time = #{startTime,jdbcType=TIMESTAMP},
@@ -300,6 +312,11 @@
when id = #{item.id,jdbcType=INTEGER} then #{item.stationId,jdbcType=VARCHAR}
</foreach>
</trim>
<trim prefix="plate_number = case" suffix="end,">
<foreach collection="list" index="index" item="item">
when id = #{item.id,jdbcType=INTEGER} then #{item.plateNumber,jdbcType=VARCHAR}
</foreach>
</trim>
<trim prefix="order_code = case" suffix="end,">
<foreach collection="list" index="index" item="item">
when id = #{item.id,jdbcType=INTEGER} then #{item.orderCode,jdbcType=VARCHAR}
@@ -408,6 +425,13 @@
</if>
</foreach>
</trim>
<trim prefix="plate_number = case" suffix="end,">
<foreach collection="list" index="index" item="item">
<if test="item.plateNumber != null">
when id = #{item.id,jdbcType=INTEGER} then #{item.plateNumber,jdbcType=VARCHAR}
</if>
</foreach>
</trim>
<trim prefix="order_code = case" suffix="end,">
<foreach collection="list" index="index" item="item">
<if test="item.orderCode != null">
@@ -515,13 +539,13 @@
<insert id="batchInsert" keyColumn="id" keyProperty="id" parameterType="map" useGeneratedKeys="true">
<!--@mbg.generated-->
insert into order_pile_occupy
(occupy_code, `status`, member_id, station_id, order_code, transaction_code, start_time,
(occupy_code, `status`, member_id, station_id, plate_number, order_code, transaction_code, start_time,
end_time, pay_status, order_amount, pile_sn, connector_code, pile_connector_code,
create_time, create_by, update_time, update_by, del_flag)
values
<foreach collection="list" item="item" separator=",">
(#{item.occupyCode,jdbcType=VARCHAR}, #{item.status,jdbcType=CHAR}, #{item.memberId,jdbcType=VARCHAR},
#{item.stationId,jdbcType=VARCHAR}, #{item.orderCode,jdbcType=VARCHAR},
#{item.stationId,jdbcType=VARCHAR}, #{item.plateNumber,jdbcType=VARCHAR}, #{item.orderCode,jdbcType=VARCHAR},
#{item.transactionCode,jdbcType=VARCHAR},
#{item.startTime,jdbcType=TIMESTAMP}, #{item.endTime,jdbcType=TIMESTAMP},
#{item.payStatus,jdbcType=VARCHAR},
@@ -545,6 +569,7 @@
`status`,
member_id,
station_id,
plate_number,
order_code,
transaction_code,
start_time,
@@ -569,6 +594,7 @@
#{status,jdbcType=CHAR},
#{memberId,jdbcType=VARCHAR},
#{stationId,jdbcType=VARCHAR},
#{plateNumber,jdbcType=VARCHAR},
#{orderCode,jdbcType=VARCHAR},
#{transactionCode,jdbcType=VARCHAR},
#{startTime,jdbcType=TIMESTAMP},
@@ -593,6 +619,7 @@
`status` = #{status,jdbcType=CHAR},
member_id = #{memberId,jdbcType=VARCHAR},
station_id = #{stationId,jdbcType=VARCHAR},
plate_number = #{plateNumber,jdbcType=VARCHAR},
order_code = #{orderCode,jdbcType=VARCHAR},
transaction_code = #{transactionCode,jdbcType=VARCHAR},
start_time = #{startTime,jdbcType=TIMESTAMP},
@@ -629,6 +656,9 @@
<if test="stationId != null">
station_id,
</if>
<if test="plateNumber != null">
plate_number,
</if>
<if test="orderCode != null">
order_code,
</if>
@@ -689,6 +719,9 @@
<if test="stationId != null">
#{stationId,jdbcType=VARCHAR},
</if>
<if test="plateNumber != null">
#{plateNumber,jdbcType=VARCHAR},
</if>
<if test="orderCode != null">
#{orderCode,jdbcType=VARCHAR},
</if>
@@ -749,6 +782,9 @@
<if test="stationId != null">
station_id = #{stationId,jdbcType=VARCHAR},
</if>
<if test="plateNumber != null">
plate_number = #{plateNumber,jdbcType=VARCHAR},
</if>
<if test="orderCode != null">
order_code = #{orderCode,jdbcType=VARCHAR},
</if>