From 4eb47c68be19a5a4f5f3f37f90086bdcf07f2d89 Mon Sep 17 00:00:00 2001 From: zhangjinli Date: Fri, 15 Jul 2022 17:39:28 +0800 Subject: [PATCH] zh --- .../controller/manage/TaskController.java | 1 + .../com/zh/project0512/mapper/TaskMapper.java | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 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 4fd82fe..2490bd4 100644 --- a/src/main/java/com/zh/project0512/controller/manage/TaskController.java +++ b/src/main/java/com/zh/project0512/controller/manage/TaskController.java @@ -640,6 +640,7 @@ 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)); } diff --git a/src/main/java/com/zh/project0512/mapper/TaskMapper.java b/src/main/java/com/zh/project0512/mapper/TaskMapper.java index 2107e21..db5254f 100644 --- a/src/main/java/com/zh/project0512/mapper/TaskMapper.java +++ b/src/main/java/com/zh/project0512/mapper/TaskMapper.java @@ -102,14 +102,14 @@ public interface TaskMapper extends BaseMapper { "${ew.customSqlSegment}") List taskEffectData(@Param("ew") Wrapper 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" + - "IFNULL(SUM(t1.effectResult),0) 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}") +// @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" + +// "IFNULL(SUM(t1.effectResult),0) 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 taskEffectDataPage(IPage page,@Param("ew") Wrapper queryWrapper); @Select("select t1.departmentId,t2.name as departmentName from taskDepartment t1 " +