From 963ec1b990fc094de3234250c4888b5ca94ac5bc Mon Sep 17 00:00:00 2001
From: kongdeqiang <kongdeqiang960204@163.com>
Date: 星期二, 15 四月 2025 16:46:25 +0800
Subject: [PATCH] fix:白名单新增bug
---
src/main/resources/mapper/OutParkMapper.xml | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/OutParkMapper.xml b/src/main/resources/mapper/OutParkMapper.xml
index c3a8551..f4292b9 100644
--- a/src/main/resources/mapper/OutParkMapper.xml
+++ b/src/main/resources/mapper/OutParkMapper.xml
@@ -21,6 +21,10 @@
<result property="status3" column="status3"/>
<result property="time" column="time"/>
<result property="code2" column="code2"/>
+ <result property="txnOrderId" column="txn_order_id"/>
+ <result property="txnOrderTime" column="txn_order_time"/>
+ <result property="respTxnTime" column="resp_txn_time"/>
+ <result property="qrCode" column="qr_code"/>
</resultMap>
<select id="getList" resultType="com.boying.entity.OutPark">
select * from out_park
@@ -34,6 +38,9 @@
</if>
<if test="parkId != null and parkId != ''">
and park_id = #{parkId}
+ </if>
+ <if test="status != null and status != ''">
+ and status = #{status}
</if>
<if test="date != null and date != ''">
and DATE_FORMAT(create_time,'%Y-%m-%d') >= DATE_FORMAT(#{date},'%Y-%m-%d')
@@ -56,6 +63,9 @@
<if test="parkId != null and parkId != ''">
and park_id = #{parkId}
</if>
+ <if test="status != null and status != ''">
+ and status = #{status}
+ </if>
<if test="date != null and date != ''">
and DATE_FORMAT(create_time,'%Y-%m-%d') >= DATE_FORMAT(#{date},'%Y-%m-%d')
and DATE_FORMAT(create_time,'%Y-%m-%d') <= DATE_FORMAT(#{date},'%Y-%m-%d')
@@ -66,4 +76,15 @@
select id,car_no,status2 from out_park
where barrier_id = #{barrierId} and `status` = 1 and status2 = 0 and del_flag = 0 limit 1;
</select>
+
+ <select id="getVoList" resultType="com.boying.entity.vo.OutParkVo">
+ SELECT SUM(price) price,IFNULL(count( id ),0) num,park_id,DATE_FORMAT(update_time, '%Y-%m-%d') ti FROM out_park
+ WHERE `status` = 1 AND pay_code IS NOT NULL
+ <if test="parkId != null and parkId != ''">
+ and park_id = #{parkId}
+ </if>
+ AND DATE_FORMAT(update_time,'%Y-%m-%d') >= DATE_FORMAT(#{startDate},'%Y-%m-%d')
+ AND DATE_FORMAT(update_time,'%Y-%m-%d') <= DATE_FORMAT(#{endDate},'%Y-%m-%d')
+ GROUP BY ti,park_id
+ </select>
</mapper>
--
Gitblit v1.9.1