From ae3dd677f3bbbc26d7c41aebc0e6048e2d20593c Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期六, 21 十二月 2024 14:58:43 +0800
Subject: [PATCH] 1.花材统计报表：增加父类名称
---
src/main/resources/mapper/wallet/WalletWithdrawRecordMapper.xml | 25 +++++++++++--------------
1 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/src/main/resources/mapper/wallet/WalletWithdrawRecordMapper.xml b/src/main/resources/mapper/wallet/WalletWithdrawRecordMapper.xml
index 439d0eb..fa6c5d8 100644
--- a/src/main/resources/mapper/wallet/WalletWithdrawRecordMapper.xml
+++ b/src/main/resources/mapper/wallet/WalletWithdrawRecordMapper.xml
@@ -21,8 +21,9 @@
<result column="reject_reason" property="rejectReason" />
</resultMap>
<select id="queryPage" resultType="com.mzl.flower.dto.response.wallet.WalletWithdrawRecordVO">
- select t.* ,s.name supplierName from t_wallet_withdraw_record t
+ select t.* ,s.name supplierName , u.nick_name AS approveName from t_wallet_withdraw_record t
left join t_supplier_info s on t.supplier_id = s.id
+ LEFT JOIN t_user u ON t.approve_by = u.id
where t.deleted= 0
<if test="dto.supplierName != null and dto.supplierName != ''">
and s.name like concat('%', #{dto.supplierName}, '%')
@@ -30,31 +31,27 @@
<if test="dto.supplierId != null and dto.supplierId != ''">
and t.supplier_id = #{dto.supplierId}
</if>
+ <if test="dto.approveState != null and dto.approveState != ''">
+ and t.approve_state = #{dto.approveState}
+ </if>
<if test="dto.withdrawState != null and dto.withdrawState != ''">
and t.withdraw_state = #{dto.withdrawState}
</if>
+
<if test="dto.createStartDate!=null ">
- <![CDATA[
- AND t.create_time >= #{dto.createStartDate}
- ]]>
+ AND DATE_FORMAT(t.create_time, '%Y-%m-%d') >= #{dto.createStartDate}
</if>
<if test="dto.endEndDate!=null ">
- <![CDATA[
- AND t.create_time <= #{dto.endEndDate}
- ]]>
+ AND DATE_FORMAT(t.create_time, '%Y-%m-%d') <= #{dto.endEndDate}
</if>
<if test="dto.approveStartDate!=null ">
- <![CDATA[
- AND t.approve_time >= #{dto.approveStartDate}
- ]]>
+ AND DATE_FORMAT(t.approve_time, '%Y-%m-%d') >= #{dto.approveStartDate}
</if>
<if test="dto.approveEndDate!=null ">
- <![CDATA[
- AND t.approve_time <= #{dto.approveStartDate}
- ]]>
+ AND DATE_FORMAT(t.approve_time, '%Y-%m-%d') <= #{dto.approveEndDate}
</if>
- order by t.create_time
+ order by t.create_time desc
</select>
</mapper>
--
Gitblit v1.9.3