zh

src/main/java/com/zh/project0512/controller/manage/TaskController.java

@@ -408,14 +408,12 @@ public class TaskController {
         QueryWrapper<Task> qw = new QueryWrapper<>();
         qw.eq("t1.userId",param.getUserId()).groupBy("t1.userId");
         JSONObject taskEffect = taskService.taskEffect(qw);
-        JSONObject obj = new JSONObject();
-        obj.put("userEffect",taskEffect);
         if(taskEffect!=null) {
             QueryWrapper<Video> qw2 = new QueryWrapper<>();
             qw2.eq("taskId",param.getId()).eq("userId",param.getUserId());
-            obj.put("userEffectDetail", videoService.list(qw2));
+            taskEffect.put("userEffectDetail", videoService.list(qw2));
         }
-        return Result.success(obj);
+        return Result.success(taskEffect);
     }
 
     @Data

src/main/java/com/zh/project0512/mapper/VideoMapper.java

@@ -40,11 +40,11 @@ public interface VideoMapper extends BaseMapper<Video> {
         "ORDER BY updateAt DESC,creatAt DESC")
     IPage<Map> pageList(IPage iPage, @Param("ew") Wrapper<Video> queryWrapper);
     @Select("SELECT sum(t1.playNum) as playNumSum,\n" +
-        "sum(t1.commendNum) as commendNum ,\n" +
-        "sum(t1.collectionNum) as collectionNum ,\n" +
-        "sum(t1.commentNum) as commentNum ,\n" +
-        "sum(t1.reSendNum) as reSendNum ,\n" +
-        "sum(t1.recommendNum) as recommendNum \n" +
+        "sum(t1.commendNum) as commendNumSum ,\n" +
+        "sum(t1.collectionNum) as collectionNumSum ,\n" +
+        "sum(t1.commentNum) as commentNumSum ,\n" +
+        "sum(t1.reSendNum) as reSendNumSum ,\n" +
+        "sum(t1.recommendNum) as recommendNumSum \n" +
         " from video as t1" +
         " inner join user on user.openid = #{openid} and user.id = t1.userId\n" +
         "where t1.status = 2")