From c5d38d650d2ac4101b1293a4f17346e7d5420076 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 04 七月 2025 20:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/task/ShopTaskRecordService.java | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/task/ShopTaskRecordService.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/task/ShopTaskRecordService.java
index 9586a7a..1e1db32 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/task/ShopTaskRecordService.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/task/ShopTaskRecordService.java
@@ -1,10 +1,12 @@
package com.ruoyi.shop.service.task;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.shop.domain.dto.MgtShopTaskPageDto;
-import com.ruoyi.shop.domain.pojo.task.ShopTaskRecord;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.shop.domain.dto.MgtShopTaskPageDto;
+import com.ruoyi.shop.domain.dto.StaffShopTaskPageDto;
+import com.ruoyi.shop.domain.pojo.task.ShopTaskRecord;
import com.ruoyi.shop.domain.vo.MgtShopTaskRecordPageVo;
+import com.ruoyi.shop.domain.vo.StaffMyShopTaskRecordPageVo;
import java.util.List;
@@ -21,8 +23,27 @@
/**
* 平台分页获取平台跟进任务
- * @param page
* @return
*/
- List<MgtShopTaskRecordPageVo> pageMgtShopFollow(Page page, MgtShopTaskPageDto mgtShopTaskPageDto);
+ List<MgtShopTaskRecordPageVo> pageMgtShopFollow(MgtShopTaskPageDto mgtShopTaskPageDto);
+
+ /**
+ * @description 员工端分页获取我的跟进任务记录列表
+ * @author jqs
+ * @date 2023/7/14 19:40
+ * @param page
+ * @param staffShopTaskPageDto
+ * @return List<StaffMyShopTaskRecordPageVo>
+ */
+ List<StaffMyShopTaskRecordPageVo> pageStaffMyShopTaskRecord(Page page, StaffShopTaskPageDto staffShopTaskPageDto);
+
+ /**
+ * @description 员工端分页获取商户跟进任务记录列表
+ * @author jqs
+ * @date 2023/7/15 17:05
+ * @param page
+ * @param staffShopTaskPageDto
+ * @return List<StaffMyShopTaskRecordPageVo>
+ */
+ List<StaffMyShopTaskRecordPageVo> pageStaffShopTaskRecord(Page page, StaffShopTaskPageDto staffShopTaskPageDto);
}
--
Gitblit v1.7.1