From 7af2d33d8fda6af451b0873a8f642c3cf7686136 Mon Sep 17 00:00:00 2001 From: 邱宇豪 <qyh123230312> Date: 星期三, 29 十一月 2023 16:21:49 +0800 Subject: [PATCH] 20231129_qiuyh_解决钢筋笼生产查询问题、新加钢筋笼材料标示牌、调整区域打卡 --- hd/pipe/secure/src/main/resources/mapping/IntegralDetailMapper.xml | 50 +++++++++++++++++++++++++++++++++++++------------- 1 files changed, 37 insertions(+), 13 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..6409c6a 100644 --- a/hd/pipe/secure/src/main/resources/mapping/IntegralDetailMapper.xml +++ b/hd/pipe/secure/src/main/resources/mapping/IntegralDetailMapper.xml @@ -210,22 +210,45 @@ 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 - FROM t_integral_detail t + spu.user_type userTypeName, + DATE_FORMAT(t.createTime, '%Y-%m-%d %H:%m:%s') createDate + 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 +269,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 %H:%m:%s') createDate FROM t_integral_detail t WHERE t.isUse = 1 <if test="companyId != null and companyId !=''"> -- Gitblit v1.9.3