From 3a12bbdaab43d249887683223191e57f1092d377 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 23 一月 2024 10:56:16 +0800
Subject: [PATCH] 新增加管理后台数据权限
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskRecordServiceImpl.java | 105 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 94 insertions(+), 11 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskRecordServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskRecordServiceImpl.java
index d628dce..bdb772a 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskRecordServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskRecordServiceImpl.java
@@ -1,21 +1,23 @@
package com.ruoyi.shop.service.impl.task;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.utils.DateUtils;
+import com.ruoyi.shop.domain.dto.FileDto;
import com.ruoyi.shop.domain.dto.MerMemberTaskPageDto;
+import com.ruoyi.shop.domain.dto.MgtMemberTaskPageDto;
import com.ruoyi.shop.domain.pojo.task.MemberTaskRecord;
import com.ruoyi.shop.domain.pojo.task.TaskFile;
import com.ruoyi.shop.domain.vo.MerMemberTaskRecordPageVo;
+import com.ruoyi.shop.domain.vo.MgtMemberFollowPageVo;
import com.ruoyi.shop.mapper.task.MemberTaskRecordMapper;
import com.ruoyi.shop.service.task.MemberTaskRecordService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.shop.service.task.TaskFileService;
-import com.ruoyi.shop.util.FileConvertUtils;
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;
/**
@@ -35,9 +37,8 @@
@Resource
private TaskFileService taskFileService;
-
/**
- *
+ * 商户分页获取会员跟进任务
* @param page
* @param merMemberTaskPageDto
* @return
@@ -48,22 +49,43 @@
if(merMemberTaskRecordPageVoList!=null&&!merMemberTaskRecordPageVoList.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(MerMemberTaskRecordPageVo merMemberTaskRecordPageVo : merMemberTaskRecordPageVoList){
followId = merMemberTaskRecordPageVo.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());
}
merMemberTaskRecordPageVo.setPicture(picture);
merMemberTaskRecordPageVo.setVideo(video);
@@ -73,4 +95,65 @@
return merMemberTaskRecordPageVoList;
}
+ /**
+ * @description 平台分页获取会员跟进任务
+ * @author jqs
+ * @date 2023/6/16 15:48
+ * @param mgtMemberTaskPageDto
+ * @return List<MgtMemberFollowPageVo>
+ */
+ @Override
+ public List<MgtMemberFollowPageVo> pageMgtMemberFollow( MgtMemberTaskPageDto mgtMemberTaskPageDto){
+ if(mgtMemberTaskPageDto.getTaskDate()==null){
+ mgtMemberTaskPageDto.setTaskDate(DateUtils.getDate());
+ }
+ List<MgtMemberFollowPageVo> mgtMemberFollowPageVoList = memberTaskRecordMapper.pageMgtMemberFollow( mgtMemberTaskPageDto);
+ if(mgtMemberFollowPageVoList!=null&&!mgtMemberFollowPageVoList.isEmpty()){
+ Long followId;
+ List<TaskFile> taskFileList;
+ List<FileDto> picture = new ArrayList<>();
+ List<FileDto> video = new ArrayList<>();
+ List<FileDto> audio = new ArrayList<>();
+ for(MgtMemberFollowPageVo mgtMemberFollowPageVo : mgtMemberFollowPageVoList){
+ followId = mgtMemberFollowPageVo.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());
+ }
+ mgtMemberFollowPageVo.setPicture(picture);
+ mgtMemberFollowPageVo.setVideo(video);
+ mgtMemberFollowPageVo.setAudio(audio);
+ }
+ }
+ return mgtMemberFollowPageVoList;
+ }
}
--
Gitblit v1.7.1