From c71055635df3d75e5dc838a9b66036c591913a13 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期六, 08 七月 2023 18:37:12 +0800
Subject: [PATCH] 管理台bug和用户端
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/AgencyTaskRecordServiceImpl.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 51 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/AgencyTaskRecordServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/AgencyTaskRecordServiceImpl.java
index a91505a..e189c4a 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/AgencyTaskRecordServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/AgencyTaskRecordServiceImpl.java
@@ -4,20 +4,21 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.shop.domain.dto.MerAgencyTaskPageDto;
+import com.ruoyi.shop.domain.dto.MgtShopTaskPageDto;
import com.ruoyi.shop.domain.pojo.task.AgencyTaskRecord;
import com.ruoyi.shop.domain.pojo.task.TaskFile;
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.mapper.task.AgencyTaskRecordMapper;
import com.ruoyi.shop.service.task.AgencyTaskRecordService;
import com.ruoyi.shop.service.task.TaskFileService;
-import com.ruoyi.shop.util.FileConvertUtils;
+import com.ruoyi.system.api.domain.poji.sys.SysUser;
+import com.ruoyi.system.api.service.RemoteUserService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
-import java.util.StringJoiner;
import java.util.stream.Collectors;
/**
@@ -36,6 +37,9 @@
@Resource
private TaskFileService taskFileService;
+
+ @Resource
+ private RemoteUserService remoteUserService;
/**
*
* @param page
@@ -51,6 +55,7 @@
List<String> picture = new ArrayList<>();
List<String> video = new ArrayList<>();
List<String> audio = new ArrayList<>();
+ //获取跟进详情文件
for(MerAgencyTaskRecordPageVo merAgencyTaskRecordPageVo : merAgencyTaskRecordPageVoList){
followId = merAgencyTaskRecordPageVo.getFollowId();
taskFileList = taskFileService.listByFollowIdAndFollowType(followId,1);
@@ -73,4 +78,47 @@
return merAgencyTaskRecordPageVoList;
}
+
+ /**
+ * 平台分页获取代理商跟进任务
+ * @return
+ */
+ @Override
+ public List<MgtAgencyTaskRecordPageVo> pageMgtAgencyFollow(MgtShopTaskPageDto mgtShopTaskPageDto){
+ List<MgtAgencyTaskRecordPageVo> mgtAgencyTaskRecordPageVoList = agencyTaskRecordMapper.pageMgtAgencyFollow(mgtShopTaskPageDto);
+ if(mgtAgencyTaskRecordPageVoList!=null&&!mgtAgencyTaskRecordPageVoList.isEmpty()){
+ Long followId;
+ List<TaskFile> taskFileList;
+ List<String> picture = new ArrayList<>();
+ List<String> video = new ArrayList<>();
+ List<String> audio = new ArrayList<>();
+ Long userId;
+ SysUser sysUser;
+ for(MgtAgencyTaskRecordPageVo mgtAgencyTaskRecordPageVo : mgtAgencyTaskRecordPageVoList){
+ //获取任务用户信息
+ userId = mgtAgencyTaskRecordPageVo.getUserId();
+ sysUser = remoteUserService.getSysUser(userId).getData();
+ mgtAgencyTaskRecordPageVo.setUserName(sysUser.getNickName());
+ mgtAgencyTaskRecordPageVo.setUserPicture(sysUser.getAvatar());
+ //获取任务详情文件
+ followId = mgtAgencyTaskRecordPageVo.getFollowId();
+ taskFileList = taskFileService.listByFollowIdAndFollowType(followId,1);
+ if(taskFileList!=null&&!taskFileList.isEmpty()){
+ picture = taskFileList.stream().map(k->k.getFileUrl()).collect(Collectors.toList());
+ }
+ taskFileList = taskFileService.listByFollowIdAndFollowType(followId,2);
+ if(taskFileList!=null&&!taskFileList.isEmpty()){
+ video = taskFileList.stream().map(k->k.getFileUrl()).collect(Collectors.toList());
+ }
+ taskFileList = taskFileService.listByFollowIdAndFollowType(followId,3);
+ if(taskFileList!=null&&!taskFileList.isEmpty()){
+ audio = taskFileList.stream().map(k->k.getFileUrl()).collect(Collectors.toList());
+ }
+ mgtAgencyTaskRecordPageVo.setPicture(picture);
+ mgtAgencyTaskRecordPageVo.setVideo(video);
+ mgtAgencyTaskRecordPageVo.setAudio(audio);
+ }
+ }
+ return mgtAgencyTaskRecordPageVoList;
+ }
}
--
Gitblit v1.7.1