From dbff53150cdc807faa56c0d1a947d24b69f372b9 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 31 八月 2023 18:43:20 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/AgencyTaskRecordServiceImpl.java | 149 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 130 insertions(+), 19 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 b9b5667..69c25ae 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
@@ -3,18 +3,18 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.shop.domain.dto.FileDto;
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.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.domain.vo.MgtMemberFollowPageVo;
+import com.ruoyi.shop.domain.vo.StaffAgencyTaskRecordPageVo;
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;
@@ -22,7 +22,6 @@
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
-import java.util.StringJoiner;
import java.util.stream.Collectors;
/**
@@ -56,23 +55,44 @@
if(merAgencyTaskRecordPageVoList!=null&&!merAgencyTaskRecordPageVoList.isEmpty()){
Long followId;
List<TaskFile> taskFileList;
- List<String> picture = new ArrayList<>();
- List<String> video = new ArrayList<>();
- List<String> audio = new ArrayList<>();
+ List<FileDto> picture = new ArrayList<>();
+ List<FileDto> video = new ArrayList<>();
+ List<FileDto> audio = new ArrayList<>();
//获取跟进详情文件
for(MerAgencyTaskRecordPageVo merAgencyTaskRecordPageVo : merAgencyTaskRecordPageVoList){
followId = merAgencyTaskRecordPageVo.getFollowId();
taskFileList = taskFileService.listByFollowIdAndFollowType(followId,1);
if(taskFileList!=null&&!taskFileList.isEmpty()){
- picture = taskFileList.stream().map(k->k.getFileUrl()).collect(Collectors.toList());
+ picture = taskFileList.stream()
+ .map(taskFile -> {
+ FileDto fileDto = new FileDto();
+ fileDto.setFileName(taskFile.getFileName());
+ fileDto.setFileUrl(taskFile.getFileUrl());
+ return fileDto;
+ })
+ .collect(Collectors.toList());
}
taskFileList = taskFileService.listByFollowIdAndFollowType(followId,2);
if(taskFileList!=null&&!taskFileList.isEmpty()){
- video = taskFileList.stream().map(k->k.getFileUrl()).collect(Collectors.toList());
+ video = taskFileList.stream()
+ .map(taskFile -> {
+ FileDto fileDto = new FileDto();
+ fileDto.setFileName(taskFile.getFileName());
+ fileDto.setFileUrl(taskFile.getFileUrl());
+ return fileDto;
+ })
+ .collect(Collectors.toList());
}
taskFileList = taskFileService.listByFollowIdAndFollowType(followId,3);
if(taskFileList!=null&&!taskFileList.isEmpty()){
- audio = taskFileList.stream().map(k->k.getFileUrl()).collect(Collectors.toList());
+ audio = taskFileList.stream()
+ .map(taskFile -> {
+ FileDto fileDto = new FileDto();
+ fileDto.setFileName(taskFile.getFileName());
+ fileDto.setFileUrl(taskFile.getFileUrl());
+ return fileDto;
+ })
+ .collect(Collectors.toList());
}
merAgencyTaskRecordPageVo.setPicture(picture);
merAgencyTaskRecordPageVo.setVideo(video);
@@ -85,18 +105,17 @@
/**
* 平台分页获取代理商跟进任务
- * @param page
* @return
*/
@Override
- public List<MgtAgencyTaskRecordPageVo> pageMgtAgencyFollow(Page page, MgtShopTaskPageDto mgtShopTaskPageDto){
- List<MgtAgencyTaskRecordPageVo> mgtAgencyTaskRecordPageVoList = agencyTaskRecordMapper.pageMgtAgencyFollow(page, mgtShopTaskPageDto);
+ 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<>();
+ List<FileDto> picture = new ArrayList<>();
+ List<FileDto> video = new ArrayList<>();
+ List<FileDto> audio = new ArrayList<>();
Long userId;
SysUser sysUser;
for(MgtAgencyTaskRecordPageVo mgtAgencyTaskRecordPageVo : mgtAgencyTaskRecordPageVoList){
@@ -109,15 +128,36 @@
followId = mgtAgencyTaskRecordPageVo.getFollowId();
taskFileList = taskFileService.listByFollowIdAndFollowType(followId,1);
if(taskFileList!=null&&!taskFileList.isEmpty()){
- picture = taskFileList.stream().map(k->k.getFileUrl()).collect(Collectors.toList());
+ picture = taskFileList.stream()
+ .map(taskFile -> {
+ FileDto fileDto = new FileDto();
+ fileDto.setFileName(taskFile.getFileName());
+ fileDto.setFileUrl(taskFile.getFileUrl());
+ return fileDto;
+ })
+ .collect(Collectors.toList());
}
taskFileList = taskFileService.listByFollowIdAndFollowType(followId,2);
if(taskFileList!=null&&!taskFileList.isEmpty()){
- video = taskFileList.stream().map(k->k.getFileUrl()).collect(Collectors.toList());
+ video = taskFileList.stream()
+ .map(taskFile -> {
+ FileDto fileDto = new FileDto();
+ fileDto.setFileName(taskFile.getFileName());
+ fileDto.setFileUrl(taskFile.getFileUrl());
+ return fileDto;
+ })
+ .collect(Collectors.toList());
}
taskFileList = taskFileService.listByFollowIdAndFollowType(followId,3);
if(taskFileList!=null&&!taskFileList.isEmpty()){
- audio = taskFileList.stream().map(k->k.getFileUrl()).collect(Collectors.toList());
+ audio = taskFileList.stream()
+ .map(taskFile -> {
+ FileDto fileDto = new FileDto();
+ fileDto.setFileName(taskFile.getFileName());
+ fileDto.setFileUrl(taskFile.getFileUrl());
+ return fileDto;
+ })
+ .collect(Collectors.toList());
}
mgtAgencyTaskRecordPageVo.setPicture(picture);
mgtAgencyTaskRecordPageVo.setVideo(video);
@@ -126,4 +166,75 @@
}
return mgtAgencyTaskRecordPageVoList;
}
+
+ /**
+ * @description 员工端分页获取经销商跟进任务记录列表
+ * @author jqs
+ * @date 2023/7/14 19:24
+ * @param page
+ * @param staffAgencyPageDto
+ * @return List<StaffAgencyTaskRecordPageVo>
+ */
+ @Override
+ public List<StaffAgencyTaskRecordPageVo> pageStaffAgencyTaskRecord(Page page, StaffAgencyPageDto staffAgencyPageDto){
+ List<StaffAgencyTaskRecordPageVo> agencyTaskRecordPageVoList = agencyTaskRecordMapper.pageStaffAgencyTaskRecord(page, staffAgencyPageDto);
+ if(agencyTaskRecordPageVoList!=null&&!agencyTaskRecordPageVoList.isEmpty()){
+ Long followId;
+ List<TaskFile> taskFileList;
+ List<FileDto> picture = new ArrayList<>();
+ List<FileDto> video = new ArrayList<>();
+ List<FileDto> audio = new ArrayList<>();
+ Long userId;
+ SysUser sysUser;
+ for(StaffAgencyTaskRecordPageVo staffAgencyTaskRecordPageVo : agencyTaskRecordPageVoList){
+ //获取任务用户信息
+ userId = staffAgencyTaskRecordPageVo.getUserId();
+ sysUser = remoteUserService.getSysUser(userId).getData();
+ staffAgencyTaskRecordPageVo.setUserName(sysUser.getNickName());
+ staffAgencyTaskRecordPageVo.setUserPicture(sysUser.getAvatar());
+ //获取任务详情文件
+ followId = staffAgencyTaskRecordPageVo.getFollowId();
+ taskFileList = taskFileService.listByFollowIdAndFollowType(followId,1);
+ if(taskFileList!=null&&!taskFileList.isEmpty()){
+ picture = taskFileList.stream()
+ .map(taskFile -> {
+ FileDto fileDto = new FileDto();
+ fileDto.setFileName(taskFile.getFileName());
+ fileDto.setFileUrl(taskFile.getFileUrl());
+ return fileDto;
+ })
+ .collect(Collectors.toList());
+ }
+ taskFileList = taskFileService.listByFollowIdAndFollowType(followId,2);
+ if(taskFileList!=null&&!taskFileList.isEmpty()){
+ video = taskFileList.stream()
+ .map(taskFile -> {
+ FileDto fileDto = new FileDto();
+ fileDto.setFileName(taskFile.getFileName());
+ fileDto.setFileUrl(taskFile.getFileUrl());
+ return fileDto;
+ })
+ .collect(Collectors.toList());
+ }
+ taskFileList = taskFileService.listByFollowIdAndFollowType(followId,3);
+ if(taskFileList!=null&&!taskFileList.isEmpty()){
+ audio = taskFileList.stream()
+ .map(taskFile -> {
+ FileDto fileDto = new FileDto();
+ fileDto.setFileName(taskFile.getFileName());
+ fileDto.setFileUrl(taskFile.getFileUrl());
+ return fileDto;
+ })
+ .collect(Collectors.toList());
+ }
+ staffAgencyTaskRecordPageVo.setPicture(picture);
+ staffAgencyTaskRecordPageVo.setVideo(video);
+ staffAgencyTaskRecordPageVo.setAudio(audio);
+ }
+ }
+
+ return agencyTaskRecordPageVoList;
+ }
+
+
}
--
Gitblit v1.7.1