From 6009c2c07cd32a76b32c8d63a5a017be695c5ea5 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期一, 26 八月 2019 15:19:33 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div --- fanli/src/main/java/com/yeshi/fanli/mapping/integral/IntegralTaskRecordMapper.xml | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/integral/IntegralTaskRecordMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/integral/IntegralTaskRecordMapper.xml index 93e8239..f0e0045 100644 --- a/fanli/src/main/java/com/yeshi/fanli/mapping/integral/IntegralTaskRecordMapper.xml +++ b/fanli/src/main/java/com/yeshi/fanli/mapping/integral/IntegralTaskRecordMapper.xml @@ -146,9 +146,16 @@ AND DATE_SUB(CURDATE(), INTERVAL 7 DAY) <![CDATA[<=]]> DATE(d.ir_create_time) - ORDER BY d.ir_create_time desc + ORDER BY d.ir_create_time desc </select> - + + + <select id="listSignRecordByDateTime" resultMap="BaseResultMap"> + SELECT * FROM yeshi_ec_integral_task_record d + WHERE d.`ir_uid` = #{uid} and d.ir_cid=#{cid} + AND d.ir_create_time <![CDATA[<=]]> #{dateTime} + ORDER BY d.ir_create_time desc + </select> <select id="countTotalGoldCoin" resultType="Integer"> SELECT -- Gitblit v1.8.0