From 3b4728dc82848818ac1212cb6435fa0fc13c57cc Mon Sep 17 00:00:00 2001
From: zhangjinli <zhangjinli_808@163.com>
Date: Thu, 14 Jul 2022 10:25:59 +0800
Subject: [PATCH] zh

---
 .../controller/wxApp/VideoUController.java    |  2 +-
 .../com/zh/project0512/mapper/TaskMapper.java | 21 +++++++++++--------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/zh/project0512/controller/wxApp/VideoUController.java b/src/main/java/com/zh/project0512/controller/wxApp/VideoUController.java
index fe8d733..ff2eb39 100644
--- a/src/main/java/com/zh/project0512/controller/wxApp/VideoUController.java
+++ b/src/main/java/com/zh/project0512/controller/wxApp/VideoUController.java
@@ -105,7 +105,7 @@ public class VideoUController {
         }else if(param.getType() == 2&&0==StringUtils.countOccurrencesOf(s,"https://v.kuaishou")){
             return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION, "请确认平台是否选择正确");
         }
-        Map<String, Object> urlRepeat = videoService.getMap(new QueryWrapper<Video>().eq("url", s));
+        Map<String, Object> urlRepeat = videoService.getMap(new QueryWrapper<Video>().eq("url", s).ne("status",3));
         if(null !=urlRepeat){
             return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION, "视频链接已被提交过");
         }
diff --git a/src/main/java/com/zh/project0512/mapper/TaskMapper.java b/src/main/java/com/zh/project0512/mapper/TaskMapper.java
index e41daa2..46fa80f 100644
--- a/src/main/java/com/zh/project0512/mapper/TaskMapper.java
+++ b/src/main/java/com/zh/project0512/mapper/TaskMapper.java
@@ -79,27 +79,30 @@ public interface TaskMapper extends BaseMapper<Task> {
         "GROUP BY userId) as taskUser")
     Integer taskUserNum(Integer taskId);
 
-    @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" +
+    @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 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}")
     JSONObject taskEffect(@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" +
+    @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}")
     List<Map> taskEffectData(@Param("ew") Wrapper<Task> queryWrapper);
 
-    @Select("SELECT IFNULL(SUM(t1.playNum),0) 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" +
+    @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 " +