From 2b68e72affbe1db3f88201f6a5d94b30e572ed33 Mon Sep 17 00:00:00 2001
From: zhangjinli <zhangjinli_808@163.com>
Date: Tue, 12 Jul 2022 14:29:36 +0800
Subject: [PATCH] zh

---
 .../controller/manage/TaskController.java     | 29 ++++++++++---------
 .../com/zh/project0512/mapper/TaskMapper.java |  9 ++++++
 .../zh/project0512/service/ITaskService.java  |  1 +
 .../serviceImpl/TaskServiceImpl.java          |  4 ++-
 4 files changed, 28 insertions(+), 15 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 e162572..5566ef0 100644
--- a/src/main/java/com/zh/project0512/controller/manage/TaskController.java
+++ b/src/main/java/com/zh/project0512/controller/manage/TaskController.java
@@ -560,19 +560,6 @@ public class TaskController {
         return Result.success(res);
     }
 
-    @Data
-    static class TaskDataParam {
-        @NotNull(message = "id不能为空")
-        @Min(value = 1, message = "id最小值为1")
-        @Schema(title = "任务id")
-        private Integer id;
-        @Schema(title = "用户名称")
-        private String userName;
-        @Schema(title = "部门名称")
-        private String departmentName;
-    }
-
-
     @Operation(summary = "任务传播数据")
     @PostMapping("taskEffect")
     @AdminTokenValid
@@ -595,6 +582,20 @@ public class TaskController {
         return Result.success(map);
     }
 
+    @Data
+    static class TaskDataParam {
+        private Integer pageNum;
+        private Integer pageSize;
+        @NotNull(message = "id不能为空")
+        @Min(value = 1, message = "id最小值为1")
+        @Schema(title = "任务id")
+        private Integer id;
+        @Schema(title = "用户名称")
+        private String userName;
+        @Schema(title = "部门名称")
+        private String departmentName;
+    }
+
     @Operation(summary = "任务传播数据")
     @PostMapping("taskEffectData")
     @AdminTokenValid
@@ -603,7 +604,7 @@ public class TaskController {
         qw.eq("t2.id", param.getId()).groupBy("t1.userId");
         qw.like(param.getUserName() != null, "t3.name", param.getUserName());
         qw.like(param.getDepartmentName() != null, "t4.name", param.getDepartmentName());
-        return Result.success( taskService.taskEffectData(qw));
+        return Result.success( taskService.taskEffectDataPage(MybatisPlusUtil.SetNumPage(param.getPageNum(), param.getPageSize()),qw));
     }
 
     @Data
diff --git a/src/main/java/com/zh/project0512/mapper/TaskMapper.java b/src/main/java/com/zh/project0512/mapper/TaskMapper.java
index 55d2b62..2795a42 100644
--- a/src/main/java/com/zh/project0512/mapper/TaskMapper.java
+++ b/src/main/java/com/zh/project0512/mapper/TaskMapper.java
@@ -90,6 +90,15 @@ public interface TaskMapper extends BaseMapper<Task> {
         "${ew.customSqlSegment}")
     List<Map> taskEffectData(@Param("ew") Wrapper<Task> queryWrapper);
 
+    @Select("SELECT SUM(t1.playNum) as playNumSum,SUM(t1.commendNum) as commendNumSum,\n" +
+        "SUM(t1.collectionNum) as collectionNumSum,SUM(t1.commentNum) as commentNumSum,\n" +
+        "SUM(t1.reSendNum) as reSendNumSum,SUM(t1.recommendNum) as recommendNumSum,SUM(t1.effectResult) as effectResultSum,t1.userId,\n" +
+        "t2.title as taskTitle,t3.name as userName,t4.name as departmentName 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 " +
+        "${ew.customSqlSegment}")
+    IPage<Map> taskEffectDataPage(IPage page,@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}")
     List<Map> taskDepartment(int taskId);
diff --git a/src/main/java/com/zh/project0512/service/ITaskService.java b/src/main/java/com/zh/project0512/service/ITaskService.java
index 133e3b3..18a583d 100644
--- a/src/main/java/com/zh/project0512/service/ITaskService.java
+++ b/src/main/java/com/zh/project0512/service/ITaskService.java
@@ -30,6 +30,7 @@ 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);
     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 d7285ee..1ef67d5 100644
--- a/src/main/java/com/zh/project0512/serviceImpl/TaskServiceImpl.java
+++ b/src/main/java/com/zh/project0512/serviceImpl/TaskServiceImpl.java
@@ -72,7 +72,9 @@ 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 List<Map> taskDepartment(int taskId) {
         return taskMapper.taskDepartment(taskId);
     }