From afa0dbb4f54e7244835dd67ec33c3e545f122f71 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 17 一月 2025 16:40:43 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/MemberTaskMapper.xml | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/MemberTaskMapper.xml b/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/MemberTaskMapper.xml
index 3199c0c..59f092a 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/MemberTaskMapper.xml
+++ b/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/MemberTaskMapper.xml
@@ -10,6 +10,7 @@
<result property="taskDate" column="task_date" />
<result property="taskContent" column="task_content" />
<result property="createTime" column="create_time" />
+ <result property="taskStatus" column="task_status" />
</resultMap>
<sql id="selectMemberTaskVo">
@@ -80,11 +81,35 @@
<select id="pageMerMemberTask" resultType="com.ruoyi.shop.domain.vo.MerMemberTaskPageVo">
SELECT
- task_id taskId,
+ tmt.task_id taskId,
+ tmt.task_date taskDate,
+ tmt.task_content taskContent,
+ tmt.emergency_state emergencyState,
+ CASE tmt.task_status WHEN 1 THEN 1 WHEN 3 THEN 1 ELSE 0 END todayFlag
+ FROM t_member_task tmt
+ WHERE tmt.del_flag = 0 AND tmt.shop_id = #{param.shopId} AND tmt.user_id = #{param.memberUserId}
+ ORDER BY todayFlag,task_date DESC
+ </select>
+
+
+ <select id="getMemberIngTotal" resultType="java.lang.Integer">
+ SELECT COUNT(task_id)
+ FROM t_member_task
+ WHERE del_flag = 0 AND task_status = 1 AND shop_id = #{shopId} AND task_date = CURRENT_DATE()
+ </select>
+
+
+
+ <select id="getLastMemberTask" resultType="com.ruoyi.system.api.domain.vo.MemberTaskSimpleVo">
+ SELECT
task_date taskDate,
task_content taskContent
FROM t_member_task
- WHERE delFlag = 0 AND shop_id = #{param.shopId} AND user_id = #{param.memberUserId}
- ORDER BY tmt.task_date DESC
+ WHERE del_flag = 0 AND task_status = 2 AND user_id = #{userId}
+ ORDER BY task_date DESC LIMIT 1
+ </select>
+
+ <select id="listDealContent" resultType="java.lang.String">
+ SELECT follow_content FROM t_member_task_record WHERE del_flag = 0 AND task_id = #{taskId}
</select>
</mapper>
--
Gitblit v1.7.1