From 257ce232897d0e4a232e827ba61516b747389078 Mon Sep 17 00:00:00 2001
From: zhanglin <852614290@qq.com>
Date: 星期日, 23 七月 2023 16:04:35 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtTaskController.java |   49 ++++++++++++++++++++++++++++---------------------
 1 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtTaskController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtTaskController.java
index ab4a81d..e99018c 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtTaskController.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtTaskController.java
@@ -1,28 +1,27 @@
 package com.ruoyi.shop.controller.management;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.shop.domain.dto.MerFollowMemberTaskDto;
 import com.ruoyi.shop.domain.dto.MgtFollowShopTaskDto;
+import com.ruoyi.shop.domain.dto.MgtMemberTaskPageDto;
 import com.ruoyi.shop.domain.dto.MgtShopTaskPageDto;
 import com.ruoyi.shop.domain.vo.MgtAgencyTaskRecordPageVo;
 import com.ruoyi.shop.domain.vo.MgtMemberFollowPageVo;
-import com.ruoyi.shop.domain.vo.MgtShopTagVo;
 import com.ruoyi.shop.domain.vo.MgtShopTaskRecordPageVo;
 import com.ruoyi.shop.service.task.AgencyTaskRecordService;
+import com.ruoyi.shop.service.task.MemberTaskRecordService;
 import com.ruoyi.shop.service.task.ShopTaskRecordService;
 import com.ruoyi.shop.service.task.ShopTaskService;
-import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
-import com.ruoyi.system.api.domain.dto.MgtPageDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -37,16 +36,20 @@
 @RequestMapping("/mgt/task")
 public class MgtTaskController {
 
-    @Autowired
+    @Resource
     private ShopTaskService shopTaskService;
 
-    @Autowired
+    @Resource
     private AgencyTaskRecordService agencyTaskRecordService;
 
-    @Autowired
+    @Resource
     private ShopTaskRecordService shopTaskRecordService;
 
+    @Resource
+    private MemberTaskRecordService memberTaskRecordService;
+
     @RequestMapping(value = "/followShopTask", method = RequestMethod.POST)
+    @Log(title = "跟进管理", businessType = BusinessType.UPDATE,operContent = "商户跟进")
     @ApiOperation(value = "商户跟进")
     public R followShopTask(@RequestBody MgtFollowShopTaskDto mgtFollowShopTaskDto) {
         Long userId = SecurityUtils.getUserId();
@@ -57,26 +60,30 @@
 
     @RequestMapping(value = "/pageMgtShopFollow", method = RequestMethod.POST)
     @ApiOperation(value = "平台获取平台跟进列表")
-    public R<Page<MgtShopTaskRecordPageVo>> pageMgtShopFollow(@RequestBody MgtShopTaskPageDto mgtShopTaskPageDto) {
+    public R<List<MgtShopTaskRecordPageVo>> pageMgtShopFollow(@RequestBody MgtShopTaskPageDto mgtShopTaskPageDto) {
         Long userId = SecurityUtils.getUserId();
         mgtShopTaskPageDto.setUserId(userId);
-        Page<MgtShopTaskRecordPageVo> page = new Page<>();
-        page.setSize(mgtShopTaskPageDto.getPageSize());
-        page.setCurrent(mgtShopTaskPageDto.getPageNum());
-        List<MgtShopTaskRecordPageVo> mgtShopTaskRecordPageVoList = shopTaskRecordService.pageMgtShopFollow(page,mgtShopTaskPageDto);
-        return R.ok(page.setRecords(mgtShopTaskRecordPageVoList));
+        List<MgtShopTaskRecordPageVo> mgtShopTaskRecordPageVoList = shopTaskRecordService.pageMgtShopFollow(mgtShopTaskPageDto);
+        return R.ok(mgtShopTaskRecordPageVoList);
     }
 
     @RequestMapping(value = "/pageMgtAgencyFollow", method = RequestMethod.POST)
     @ApiOperation(value = "平台获取代理商跟进列表")
-    public R<Page<MgtAgencyTaskRecordPageVo>> pageMgtAgencyFollow(@RequestBody MgtShopTaskPageDto mgtShopTaskPageDto) {
+    public R<List<MgtAgencyTaskRecordPageVo>> pageMgtAgencyFollow(@RequestBody MgtShopTaskPageDto mgtShopTaskPageDto) {
         Long userId = SecurityUtils.getUserId();
         mgtShopTaskPageDto.setUserId(userId);
-        Page<MgtAgencyTaskRecordPageVo> page = new Page<>();
-        page.setSize(mgtShopTaskPageDto.getPageSize());
-        page.setCurrent(mgtShopTaskPageDto.getPageNum());
-        List<MgtAgencyTaskRecordPageVo> mgtMemberFollowPageVoList = agencyTaskRecordService.pageMgtAgencyFollow(page,mgtShopTaskPageDto);
-        return R.ok(page.setRecords(mgtMemberFollowPageVoList));
+        List<MgtAgencyTaskRecordPageVo> mgtMemberFollowPageVoList = agencyTaskRecordService.pageMgtAgencyFollow(mgtShopTaskPageDto);
+        return R.ok(mgtMemberFollowPageVoList);
     }
 
+    @RequestMapping(value = "/pageMgtMemberFollow", method = RequestMethod.POST)
+    @ApiOperation(value = "平台获取用户跟进列表")
+    public R<List<MgtMemberFollowPageVo>> pageMgtMemberFollow(@RequestBody MgtMemberTaskPageDto mgtMemberTaskPageDto) {
+        Long userId = SecurityUtils.getUserId();
+        mgtMemberTaskPageDto.setUserId(userId);
+        List<MgtMemberFollowPageVo> mgtMemberFollowPageVoList = memberTaskRecordService.pageMgtMemberFollow(mgtMemberTaskPageDto);
+        return R.ok(mgtMemberFollowPageVoList);
+    }
+
+
 }

--
Gitblit v1.7.1