From aa6ffcaae173e0ba6372c90261b8a7d4b1fd6052 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 26 一月 2024 11:07:17 +0800
Subject: [PATCH] Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 1.1
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java
index f376d09..3449772 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java
@@ -1,6 +1,7 @@
package com.ruoyi.shop.service.impl.task;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.utils.DateUtils;
@@ -12,13 +13,16 @@
import com.ruoyi.shop.domain.pojo.task.TaskFile;
import com.ruoyi.shop.domain.vo.StaffShopTaskPageVo;
import com.ruoyi.shop.mapper.task.ShopTaskMapper;
+import com.ruoyi.shop.service.shop.ShopService;
import com.ruoyi.shop.service.task.ShopTaskRecordService;
import com.ruoyi.shop.service.task.ShopTaskService;
import com.ruoyi.shop.service.task.TaskFileService;
+import com.ruoyi.system.api.domain.poji.shop.Shop;
import com.ruoyi.system.api.domain.poji.sys.SysStaff;
import com.ruoyi.system.api.domain.vo.MgtBulletinBoardVo;
import com.ruoyi.system.api.service.RemoteConfigService;
import com.ruoyi.system.api.service.RemoteUserService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -51,6 +55,12 @@
@Resource
private RemoteConfigService remoteConfigService;
+
+ @Autowired
+ private ShopService shopService;
+
+
+
/**
* 平台跟进商户
@@ -127,12 +137,18 @@
* @date 2023/6/18 17:08
*/
@Override
- public MgtBulletinBoardVo boardTaskTotal(){
+ public MgtBulletinBoardVo boardTaskTotal(List<Long> userIds){
MgtBulletinBoardVo mgtBulletinBoardVo = new MgtBulletinBoardVo();
LambdaQueryWrapper<ShopTask> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ShopTask::getDelFlag,0);
queryWrapper.eq(ShopTask::getTaskStatus,1);
queryWrapper.eq(ShopTask::getTaskDate,DateUtils.getDate());
+ if(null != userIds && userIds.size() > 0){
+ List<Shop> list = shopService.list(new QueryWrapper<Shop>().eq("del_flag", 0)
+ .in("belong_user_id", userIds));
+ List<Long> collect = list.stream().map(Shop::getShopId).collect(Collectors.toList());
+ queryWrapper.in(ShopTask::getShopId, collect);
+ }
Integer followShopToday = this.count(queryWrapper);
mgtBulletinBoardVo.setFollowShopToday(followShopToday);
return mgtBulletinBoardVo;
--
Gitblit v1.7.1