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/MemberTaskRecordMapper.xml | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/MemberTaskRecordMapper.xml b/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/MemberTaskRecordMapper.xml
index 3702918..35f2fa7 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/MemberTaskRecordMapper.xml
+++ b/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/MemberTaskRecordMapper.xml
@@ -82,13 +82,36 @@
tmtr.id followId,
tmtr.task_id taskId,
tmt.task_date taskDate,
- tmtr.followType followType,
- tmtr.callTime callTime,
- tmtr.followContent followContent,
- tmtr.callPhone callPhone
+ tmtr.follow_type followType,
+ tmtr.call_time callTime,
+ tmtr.follow_content followContent,
+ tmtr.custome_follow_type customeFollowType,
+ tmtr.call_phone callPhone
FROM t_member_task tmt
INNER JOIN t_member_task_record tmtr ON tmtr.task_id = tmt.task_id
- WHERE del_flag = 0 AND shop_id = #{param.shopId} AND user_id = #{param.memberUserId}
+ WHERE tmt.del_flag = 0 AND tmtr.del_flag = 0 AND tmt.shop_id = #{param.shopId} AND tmt.user_id = #{param.memberUserId}
+ ORDER BY tmtr.create_time DESC
+ </select>
+
+ <select id="pageMgtMemberFollow" resultType="com.ruoyi.shop.domain.vo.MgtMemberFollowPageVo">
+ SELECT
+ tmt.shop_id shopId,
+ ts.shop_name shopName,
+ tsf.file_url shopPicture,
+ tmtr.id followId,
+ tmtr.task_id taskId,
+ tmt.task_date taskDate,
+ tmtr.follow_type followType,
+ tmtr.custome_follow_type customeFollowType,
+ tmtr.call_time callTime,
+ tmtr.follow_content followContent,
+ tmtr.call_phone callPhone
+ FROM t_member_task tmt
+ INNER JOIN t_member_task_record tmtr ON tmtr.task_id = tmt.task_id
+ INNER JOIN t_shop ts ON ts.shop_id = tmt.shop_id
+ INNER JOIN t_shop_file tsf ON tsf.shop_id = ts.shop_id AND tsf.del_flag = 0 AND tsf.file_type = 1
+ WHERE tmt.del_flag = 0 AND tmt.user_id = #{param.memberUserId} AND tmt.task_date = #{param.taskDate}
ORDER BY tmt.task_date DESC
</select>
+
</mapper>
--
Gitblit v1.7.1