From b83a7d0a9249e74ee337cc5ef2a97d1a100e08fe Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 25 七月 2025 20:11:46 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/task/AgencyTaskRecordService.java |   23 ++++++++++++++++++++++-
 1 files changed, 22 insertions(+), 1 deletions(-)

diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/task/AgencyTaskRecordService.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/task/AgencyTaskRecordService.java
index b692436..3b1b81f 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/task/AgencyTaskRecordService.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/task/AgencyTaskRecordService.java
@@ -4,9 +4,12 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.shop.domain.dto.MerAgencyTaskPageDto;
+import com.ruoyi.shop.domain.dto.MgtShopTaskPageDto;
+import com.ruoyi.shop.domain.dto.StaffAgencyPageDto;
 import com.ruoyi.shop.domain.pojo.task.AgencyTaskRecord;
 import com.ruoyi.shop.domain.vo.MerAgencyTaskRecordPageVo;
-import com.ruoyi.shop.domain.vo.MerMemberTaskRecordPageVo;
+import com.ruoyi.shop.domain.vo.MgtAgencyTaskRecordPageVo;
+import com.ruoyi.shop.domain.vo.StaffAgencyTaskRecordPageVo;
 
 import java.util.List;
 
@@ -27,4 +30,22 @@
      * @return
      */
     List<MerAgencyTaskRecordPageVo> pageMerAgencyTaskRecord (Page page, MerAgencyTaskPageDto merAgencyTaskPageDto);
+
+
+    /**
+     * 平台分页获取代理商跟进任务
+     * @return
+     */
+    List<MgtAgencyTaskRecordPageVo> pageMgtAgencyFollow(MgtShopTaskPageDto mgtShopTaskPageDto);
+
+    /**
+     * @description  员工端分页获取经销商跟进任务记录列表
+     * @author  jqs
+     * @date    2023/7/14 19:24
+     * @param page
+     * @param staffAgencyPageDto
+     * @return  List<StaffAgencyTaskRecordPageVo>
+     */
+    List<StaffAgencyTaskRecordPageVo> pageStaffAgencyTaskRecord(Page page, StaffAgencyPageDto staffAgencyPageDto);
+
 }

--
Gitblit v1.7.1