From c93e76c57a98e35abbf62d2f514d9ba51efd3243 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期一, 21 八月 2023 19:03:55 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskRecordServiceImpl.java | 102 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 96 insertions(+), 6 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskRecordServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskRecordServiceImpl.java
index 435f9b1..2917a4c 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskRecordServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskRecordServiceImpl.java
@@ -3,11 +3,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.shop.domain.dto.MgtShopTaskPageDto;
+import com.ruoyi.shop.domain.dto.StaffShopTaskPageDto;
import com.ruoyi.shop.domain.pojo.task.ShopTaskRecord;
import com.ruoyi.shop.domain.pojo.task.TaskFile;
-import com.ruoyi.shop.domain.vo.MgtAgencyTaskRecordPageVo;
import com.ruoyi.shop.domain.vo.MgtShopTaskRecordPageVo;
-import com.ruoyi.shop.mapper.task.ShopTaskMapper;
+import com.ruoyi.shop.domain.vo.StaffMyShopTaskRecordPageVo;
import com.ruoyi.shop.mapper.task.ShopTaskRecordMapper;
import com.ruoyi.shop.service.task.ShopTaskRecordService;
import com.ruoyi.shop.service.task.TaskFileService;
@@ -42,12 +42,11 @@
/**
* 平台分页获取平台跟进任务
- * @param page
* @return
*/
@Override
- public List<MgtShopTaskRecordPageVo> pageMgtShopFollow(Page page, MgtShopTaskPageDto mgtShopTaskPageDto){
- List<MgtShopTaskRecordPageVo> mgtShopTaskRecordPageVoList = shopTaskRecordMapper.pageMgtShopFollow(page, mgtShopTaskPageDto);
+ public List<MgtShopTaskRecordPageVo> pageMgtShopFollow(MgtShopTaskPageDto mgtShopTaskPageDto){
+ List<MgtShopTaskRecordPageVo> mgtShopTaskRecordPageVoList = shopTaskRecordMapper.pageMgtShopFollow(mgtShopTaskPageDto);
if(mgtShopTaskRecordPageVoList!=null&&!mgtShopTaskRecordPageVoList.isEmpty()){
Long followId;
List<TaskFile> taskFileList;
@@ -84,6 +83,97 @@
return mgtShopTaskRecordPageVoList;
}
+ /**
+ * @description 员工端分页获取我的跟进任务记录列表
+ * @author jqs
+ * @date 2023/7/14 19:40
+ * @param page
+ * @param staffShopTaskPageDto
+ * @return List<StaffMyShopTaskRecordPageVo>
+ */
+ @Override
+ public List<StaffMyShopTaskRecordPageVo> pageStaffMyShopTaskRecord(Page page, StaffShopTaskPageDto staffShopTaskPageDto){
+ List<StaffMyShopTaskRecordPageVo> myShopTaskRecordPageVoList = shopTaskRecordMapper.pageStaffMyShopTaskRecord(page, staffShopTaskPageDto);
+ if(myShopTaskRecordPageVoList!=null&&!myShopTaskRecordPageVoList.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(StaffMyShopTaskRecordPageVo staffMyShopTaskRecordPageVo : myShopTaskRecordPageVoList){
+ //获取任务用户信息
+ userId = staffMyShopTaskRecordPageVo.getUserId();
+ sysUser = remoteUserService.getSysUser(userId).getData();
+ staffMyShopTaskRecordPageVo.setUserName(sysUser.getNickName());
+ staffMyShopTaskRecordPageVo.setUserPicture(sysUser.getAvatar());
+ //获取任务详情文件
+ followId = staffMyShopTaskRecordPageVo.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());
+ }
+ staffMyShopTaskRecordPageVo.setPicture(picture);
+ staffMyShopTaskRecordPageVo.setVideo(video);
+ staffMyShopTaskRecordPageVo.setAudio(audio);
+ }
+ }
+ return myShopTaskRecordPageVoList;
+ }
-
+ /**
+ * @description 员工端分页获取商户跟进任务记录列表
+ * @author jqs
+ * @date 2023/7/15 17:05
+ * @param page
+ * @param staffShopTaskPageDto
+ * @return List<StaffMyShopTaskRecordPageVo>
+ */
+ @Override
+ public List<StaffMyShopTaskRecordPageVo> pageStaffShopTaskRecord(Page page, StaffShopTaskPageDto staffShopTaskPageDto){
+ List<StaffMyShopTaskRecordPageVo> myShopTaskRecordPageVoList = shopTaskRecordMapper.pageStaffShopTaskRecord(page, staffShopTaskPageDto);
+ if(myShopTaskRecordPageVoList!=null&&!myShopTaskRecordPageVoList.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(StaffMyShopTaskRecordPageVo staffMyShopTaskRecordPageVo : myShopTaskRecordPageVoList){
+ //获取任务用户信息
+ userId = staffMyShopTaskRecordPageVo.getUserId();
+ sysUser = remoteUserService.getSysUser(userId).getData();
+ staffMyShopTaskRecordPageVo.setUserName(sysUser.getNickName());
+ staffMyShopTaskRecordPageVo.setUserPicture(sysUser.getAvatar());
+ //获取任务详情文件
+ followId = staffMyShopTaskRecordPageVo.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());
+ }
+ staffMyShopTaskRecordPageVo.setPicture(picture);
+ staffMyShopTaskRecordPageVo.setVideo(video);
+ staffMyShopTaskRecordPageVo.setAudio(audio);
+ }
+ }
+ return myShopTaskRecordPageVoList;
+ }
}
--
Gitblit v1.7.1