From 8755b96f9433e6eb1b06462e80281bdb2922ce84 Mon Sep 17 00:00:00 2001
From: zhangjinli <zhangjinli_808@163.com>
Date: Sun, 17 Jul 2022 13:50:45 +0800
Subject: [PATCH] zh

---
 .../project0512/controller/manage/TaskController.java  |  9 +++++++--
 .../java/com/zh/project0512/mapper/TaskMapper.java     | 10 +++++++++-
 .../java/com/zh/project0512/service/ITaskService.java  |  3 ++-
 .../zh/project0512/serviceImpl/TaskServiceImpl.java    |  7 +++++--
 4 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zh/project0512/controller/manage/TaskController.java b/src/main/java/com/zh/project0512/controller/manage/TaskController.java
index 2490bd4..9194c42 100644
--- a/src/main/java/com/zh/project0512/controller/manage/TaskController.java
+++ b/src/main/java/com/zh/project0512/controller/manage/TaskController.java
@@ -640,9 +640,14 @@ public class TaskController {
         if(null !=param.getEndTime()){
             qw.le( "date_format(t1.creatAt, '%Y-%m-%d')", param.getEndTime());
         }
-        qw.groupBy("t5.departmentId");
         qw.orderByDesc("effectResultSum");
-        return Result.success( taskService.taskEffectDataPage(MybatisPlusUtil.SetNumPage(param.getPageNum(), param.getPageSize()),qw));
+        IPage iPage = taskService.taskEffectDataUserIdPage(MybatisPlusUtil.SetNumPage(param.getPageNum(), param.getPageSize()),qw);
+        List list = iPage.getRecords();
+        qw.groupBy("t5.departmentId");
+        if (list.size() > 0) {
+            iPage.setRecords(taskService.taskEffectDataPage( qw));
+        }
+        return Result.success(iPage);
     }
 
     @Data
diff --git a/src/main/java/com/zh/project0512/mapper/TaskMapper.java b/src/main/java/com/zh/project0512/mapper/TaskMapper.java
index db5254f..2f261bb 100644
--- a/src/main/java/com/zh/project0512/mapper/TaskMapper.java
+++ b/src/main/java/com/zh/project0512/mapper/TaskMapper.java
@@ -102,6 +102,14 @@ public interface TaskMapper extends BaseMapper<Task> {
         "${ew.customSqlSegment}")
     List<Map> taskEffectData(@Param("ew") Wrapper<Task> queryWrapper);
 
+
+    @Select("SELECT t1.userId\n" +
+        "        from video as t1 INNER JOIN task as t2 on t2.id = t1.taskId\n" +
+        "        LEFT JOIN user as t3 on t1.userId = t3.id\n" +
+        "        LEFT JOIN qywxDepartment as t4 on t3.main_department = t4.departmentId\n" +
+        "        LEFT JOIN (SELECT t.*,d.name as department from qywxDepartmentUserLink t left join qywxDepartment d on t.departmentId = d.departmentId) as t5 on t3.openid = t5.openid\n" +
+        "        ${ew.customSqlSegment}")
+    IPage<Map> taskEffectDataUserIdPage(IPage page,@Param("ew") Wrapper<Task> queryWrapper);
 //    @Select("SELECT IFNULL(SUM(t1.playNum),0) as playNumSum,IFNULL(SUM(t1.commendNum),0) as commendNumSum,\n" +
 //        "IFNULL(SUM(t1.collectionNum),0) as collectionNumSum,IFNULL(SUM(t1.commentNum),0) as commentNumSum,\n" +
 //        "IFNULL(SUM(t1.reSendNum),0) as reSendNumSum,IFNULL(SUM(t1.recommendNum),0) as recommendNumSum,\n" +
@@ -110,7 +118,7 @@ public interface TaskMapper extends BaseMapper<Task> {
 //        "LEFT JOIN user as t3 on t1.userId = t3.id\n" +
 //        "LEFT JOIN qywxDepartment as t4 on t3.main_department = t4.departmentId " +
 //        "${ew.customSqlSegment}")
-    IPage<Map> taskEffectDataPage(IPage page,@Param("ew") Wrapper<Task> queryWrapper);
+    List<Map> taskEffectDataPage(@Param("ew") Wrapper<Task> queryWrapper);
 
     @Select("select t1.departmentId,t2.name as departmentName from taskDepartment t1 " +
         "inner join qywxDepartment t2 on t1.departmentId = t2.departmentId and t1.taskId =#{taskId}")
diff --git a/src/main/java/com/zh/project0512/service/ITaskService.java b/src/main/java/com/zh/project0512/service/ITaskService.java
index 18a583d..431f2eb 100644
--- a/src/main/java/com/zh/project0512/service/ITaskService.java
+++ b/src/main/java/com/zh/project0512/service/ITaskService.java
@@ -30,7 +30,8 @@ public interface ITaskService extends IService<Task> {
     Integer taskUserNum(Integer taskId);
     JSONObject taskEffect(@Param("ew") Wrapper<Task> queryWrapper);
     List<Map> taskEffectData(@Param("ew") Wrapper<Task> queryWrapper);
-    IPage<Map> taskEffectDataPage(IPage page,@Param("ew") Wrapper<Task> queryWrapper);
+    IPage<Map> taskEffectDataUserIdPage(IPage page,@Param("ew") Wrapper<Task> queryWrapper);
+    List<Map> taskEffectDataPage(@Param("ew") Wrapper<Task> queryWrapper);
     List<Map> taskDepartment(int taskId);
 
     // 上传任务时同时上传素材
diff --git a/src/main/java/com/zh/project0512/serviceImpl/TaskServiceImpl.java b/src/main/java/com/zh/project0512/serviceImpl/TaskServiceImpl.java
index 58e16c6..2d7446d 100644
--- a/src/main/java/com/zh/project0512/serviceImpl/TaskServiceImpl.java
+++ b/src/main/java/com/zh/project0512/serviceImpl/TaskServiceImpl.java
@@ -72,8 +72,11 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements IT
     public List<Map> taskEffectData(@Param("ew") Wrapper<Task> queryWrapper) {
         return taskMapper.taskEffectData(queryWrapper);
     }
-    public IPage<Map> taskEffectDataPage(IPage page,@Param("ew") Wrapper<Task> queryWrapper){
-        return taskMapper.taskEffectDataPage(page,queryWrapper);
+    public IPage<Map> taskEffectDataUserIdPage(IPage page,@Param("ew") Wrapper<Task> queryWrapper){
+        return taskMapper.taskEffectDataUserIdPage(page,queryWrapper);
+    }
+    public List<Map> taskEffectDataPage(@Param("ew") Wrapper<Task> queryWrapper){
+        return taskMapper.taskEffectDataPage(queryWrapper);
     }
     public List<Map> taskDepartment(int taskId) {
         return taskMapper.taskDepartment(taskId);