From 22cc779aff6d1ff2174e2cd4cfcb64ebe22f698f Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期二, 28 十一月 2023 13:28:41 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
hd/pipe/secure/src/main/resources/mapping/IntegralDetailMapper.xml | 47 +++++++++++++++++++++++++++++++++++------------
1 files changed, 35 insertions(+), 12 deletions(-)
diff --git a/hd/pipe/secure/src/main/resources/mapping/IntegralDetailMapper.xml b/hd/pipe/secure/src/main/resources/mapping/IntegralDetailMapper.xml
index fb51580..49fd4d7 100644
--- a/hd/pipe/secure/src/main/resources/mapping/IntegralDetailMapper.xml
+++ b/hd/pipe/secure/src/main/resources/mapping/IntegralDetailMapper.xml
@@ -210,22 +210,44 @@
update t_integral_detail set isUse = 0 where id = #{id,jdbcType=VARCHAR}
</delete>
+
+ <!-- 积分超市 -->
+ <select id="selectPageInfoList" resultType="com.thhy.secure.modules.biz.integralAccount.entity.IntegralDetailDto">
+ SELECT
+ t.*,
+ spu.real_name realName,
+ spu.user_type userTypeName
+ FROM t_integral_detail t
+ LEFT JOIN sys_plat_user spu on spu.user_id = t.userId
+ WHERE t.isUse = 1 and t.type = 2 and t.companyId = #{companyId}
+ <if test="userId != null and userId !=''">
+ AND spu.user_id =#{userId}
+ </if>
+ <if test="startTime != null and startTime != '' and endTime !=null and endTime !=''">
+ AND t.createTime BETWEEN #{startTime} and #{endTime}
+ </if>
+ <if test="userType != null and userType != ''">
+ AND t.userType = #{userType}
+ </if>
+ order by t.createTime desc
+ </select>
<!-- 积分超市 -->
<select id="selectPageList" resultType="com.thhy.secure.modules.biz.integralAccount.entity.IntegralDetailEntity">
SELECT
- t.id,
- t.createTime,
+ t.*,
spu.real_name realName,
- t.integralWater,
- t.remark
+ spu.user_type userTypeName
FROM t_integral_detail t
LEFT JOIN sys_plat_user spu on spu.user_id = t.userId
WHERE t.isUse = 1 and t.type = 2 and t.companyId = #{companyId}
- <if test="realName != null and realName !=''">
- AND spu.real_name LIKE CONCAT('%',#{realName},'%')
+ <if test="userId != null and userId !=''">
+ AND spu.user_id =#{userId}
</if>
<if test="startTime != null and startTime != '' and endTime !=null and endTime !=''">
AND t.createTime BETWEEN #{startTime} and #{endTime}
+ </if>
+ <if test="userType != null and userType != ''">
+ AND t.userType = #{userType}
</if>
order by t.createTime desc
</select>
@@ -246,18 +268,19 @@
<if test="userType != null and userType !=''">
and t.userType = #{userType}
</if>
- <if test="realName != null and realName !=''">
- AND spu.real_name LIKE CONCAT('%',#{realName},'%')
+ <if test="userId != null and userId !=''">
+ AND spu.user_id =#{userId}
</if>
- <if test="startIntegral != null and startIntegral != '' and endIntegral !=null and endIntegral !=''">
- AND t.accumulateIntegral BETWEEN #{startIntegral} and #{endIntegral}
+ <if test="startIntegral != null and startIntegral != '' and endIntegra !=null and endIntegra !=''">
+ AND t.accumulateIntegral BETWEEN #{startIntegral} and #{endIntegra}
</if>
order by t.accumulateIntegral desc
</select>
- <select id="selectSafeIntegralInfo" resultType="com.thhy.secure.modules.biz.integralAccount.entity.IntegralDetailEntity">
+ <select id="selectSafeIntegralInfo" resultType="com.thhy.secure.modules.biz.integralAccount.entity.IntegralDetailDto">
SELECT
- t.*
+ t.*,
+ DATE_FORMAT(t.createTime, '%Y-%m-%d') createDate
FROM t_integral_detail t
WHERE t.isUse = 1
<if test="companyId != null and companyId !=''">
--
Gitblit v1.9.3