From 156e141e55a8abf486157d1fa89d25e23f4a06a3 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 25 八月 2023 19:32:30 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtTaskController.java | 33 ++++++++++++++-------------------
1 files changed, 14 insertions(+), 19 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 ef5c37d..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,7 +1,8 @@
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.MgtFollowShopTaskDto;
import com.ruoyi.shop.domain.dto.MgtMemberTaskPageDto;
@@ -48,6 +49,7 @@
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();
@@ -58,37 +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<Page<MgtMemberFollowPageVo>> pageMgtMemberFollow(@RequestBody MgtMemberTaskPageDto mgtMemberTaskPageDto) {
+ public R<List<MgtMemberFollowPageVo>> pageMgtMemberFollow(@RequestBody MgtMemberTaskPageDto mgtMemberTaskPageDto) {
Long userId = SecurityUtils.getUserId();
mgtMemberTaskPageDto.setUserId(userId);
- Page<MgtMemberFollowPageVo> page = new Page<>();
- page.setSize(mgtMemberTaskPageDto.getPageSize());
- page.setCurrent(mgtMemberTaskPageDto.getPageNum());
- List<MgtMemberFollowPageVo> mgtMemberFollowPageVoList = memberTaskRecordService.pageMgtMemberFollow(page, mgtMemberTaskPageDto);
- return R.ok(page.setRecords(mgtMemberFollowPageVoList));
+ List<MgtMemberFollowPageVo> mgtMemberFollowPageVoList = memberTaskRecordService.pageMgtMemberFollow(mgtMemberTaskPageDto);
+ return R.ok(mgtMemberFollowPageVoList);
}
+
+
}
--
Gitblit v1.7.1