From 1b8ac0dfda85b7e4130f45ca8459ab50bb20d1e5 Mon Sep 17 00:00:00 2001
From: zhangjinli <zhangjinli_808@163.com>
Date: Fri, 17 Jun 2022 15:46:42 +0800
Subject: [PATCH] zh

---
 .../com/zh/project0512/controller/manage/TaskController.java  | 4 ++--
 src/main/java/com/zh/project0512/mapper/TaskMapper.java       | 4 ++--
 2 files changed, 4 insertions(+), 4 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 b3666c4..4873ef7 100644
--- a/src/main/java/com/zh/project0512/controller/manage/TaskController.java
+++ b/src/main/java/com/zh/project0512/controller/manage/TaskController.java
@@ -382,7 +382,7 @@ public class TaskController {
     @PostMapping("taskEffect")
     @AdminTokenValid
     public Result taskEffect(@Validated @RequestBody DetTaskParam param) {
-        List<Map> maps = taskService.taskEffectData(new QueryWrapper<>());
+        List<Map> maps = taskService.taskEffectData(new QueryWrapper<Task>().eq("t2.id",param.getId()));
         JSONObject obj = new JSONObject();
         obj.put("taskEffect",maps.get(0));
         if(maps!=null) {
@@ -409,7 +409,7 @@ public class TaskController {
     @AdminTokenValid
     public Result taskUserEffect(@Validated @RequestBody TaskUserParam param) {
         QueryWrapper<Task> qw = new QueryWrapper<>();
-        qw.eq("t1.userId",param.getUserId()).groupBy("t1.userId");
+        qw.eq("t2.id",param.getId()).eq("t1.userId",param.getUserId()).groupBy("t1.userId");
         JSONObject taskEffect = taskService.taskEffect(qw);
         if(taskEffect!=null) {
             QueryWrapper<Video> qw2 = new QueryWrapper<>();
diff --git a/src/main/java/com/zh/project0512/mapper/TaskMapper.java b/src/main/java/com/zh/project0512/mapper/TaskMapper.java
index 357ee33..add8232 100644
--- a/src/main/java/com/zh/project0512/mapper/TaskMapper.java
+++ b/src/main/java/com/zh/project0512/mapper/TaskMapper.java
@@ -65,7 +65,7 @@ public interface TaskMapper extends BaseMapper<Task> {
     @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 from video as t1 INNER JOIN task as t2 on t2.id = 31 and t2.id = t1.taskId\n" +
+        "t2.title as taskTitle 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}")
@@ -74,7 +74,7 @@ public interface TaskMapper extends BaseMapper<Task> {
     @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 = 31 and t2.id = t1.taskId\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}")