zh

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

@@ -139,7 +139,7 @@ public class TaskController {
                 }
             }
             if (l.size() > 0) {
-                referenceService.saveBatch(l);
+//                referenceService.saveBatch(l);
 //                topicActivityService.saveBatch(ta);
                 List<Integer> reference = new ArrayList<>();
                 for (Reference r : l) {
@@ -535,10 +535,10 @@ public class TaskController {
         if (null != param.getMonth()) {
             qw.between("t1.start", LocalDateTime.now().minusMonths(param.getMonth()), LocalDateTime.now());
         } else {
-            qw.ge(param.getBeginTime1() != null, "t1.start", param.getBeginTime1());
-            qw.le(param.getBeginTime2() != null, "t1.start", param.getBeginTime2());
-            qw.ge(param.getEndTime1() != null, "t1.end", param.getEndTime1());
-            qw.le(param.getEndTime2() != null, "t1.end", param.getEndTime2());
+            qw.ge(param.getBeginTime1() != null, "date_format(t1.start, '%Y-%m-%d')", param.getBeginTime1().toLocalDate());
+            qw.le(param.getBeginTime2() != null, "date_format(t1.start, '%Y-%m-%d')", param.getBeginTime2().toLocalDate());
+            qw.ge(param.getEndTime1() != null, "date_format(t1.end, '%Y-%m-%d')", param.getEndTime1().toLocalDate());
+            qw.le(param.getEndTime2() != null, "date_format(t1.end, '%Y-%m-%d')", param.getEndTime2().toLocalDate());
         }
         if (null != param.getKeyword()) {
             qw.like("t1.title", param.getKeyword());
@@ -618,6 +618,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());
+        qw.orderByDesc("effectResultSum");
         return Result.success( taskService.taskEffectDataPage(MybatisPlusUtil.SetNumPage(param.getPageNum(), param.getPageSize()),qw));
     }
 

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

@@ -215,6 +215,9 @@ public class VideoController {
         if (null == video) {
             return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION, "未找到该视频");
         }
+        if(video.getStatus()!= 1){
+            return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION, "不在审核状态下");
+        }
         Integer originEffectResult = video.getEffectResult() == null ? 0 : video.getEffectResult();
         String touser = userService.getById(video.getUserId()).getUserid();
         AppMessage appMessage = new AppMessage().setTitle("传播效果审核结果")

src/main/java/com/zh/project0512/controller/wxApp/UserTaskUController.java

@@ -3,6 +3,7 @@ package com.zh.project0512.controller.wxApp;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.zh.project0512.annotation.TokenValid;
+import com.zh.project0512.model.Task;
 import com.zh.project0512.model.UserTask;
 import com.zh.project0512.service.ITaskService;
 import com.zh.project0512.service.IUserService;
@@ -59,9 +60,13 @@ public class UserTaskUController {
             return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION,"用户不存在");
         }
         QueryWrapper<UserTask> queryWrapper = new QueryWrapper<>();
-        if(null == taskService.getById(taskId)){
+        Task task = taskService.getById(taskId);
+        if(null == task){
             return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION,"任务不存在");
         }
+        if(task.getStatus()!=1){
+            return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION,"任务不在接受时间内");
+        }
         if (null != userTaskService.getMap(new QueryWrapper<UserTask>().eq("userId", userId).eq("taskId", taskId))) {
             return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION,"已接受该任务");
         }

src/main/java/com/zh/project0512/controller/wxApp/VideoUController.java

@@ -30,6 +30,7 @@ import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
+import java.util.Map;
 
 /**
  * <p>
@@ -86,10 +87,8 @@ public class VideoUController {
         Integer taskStatus = userTaskService.userTaskStatus(useId, taskId);
         if (taskStatus == null) {
             return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION, "用户未接受任务");
-        } else if (taskStatus == 0) {
-            return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION, "任务未开始");
-        } else if (taskStatus == 2) {
-            return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION, "任务已结束");
+        } else if (taskStatus != 1) {
+            return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION, "任务不在上传时间内");
         }
         // 不支持重复提交
         QueryWrapper<Video> queryWrapper = new QueryWrapper<>();
@@ -106,6 +105,10 @@ 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));
+        if(null !=urlRepeat){
+            return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION, "视频链接已被提交过");
+        }
         videoService.save(new Video().setUserId(useId).setTaskId(taskId).setType(param.getType()).setUrl(s).setCreatAt(LocalDateTime.now()).setUpdateAt(LocalDateTime.now()));
         return Result.success("添加完成！");
     }

src/main/java/com/zh/project0512/serviceImpl/TaskServiceImpl.java

@@ -101,7 +101,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements IT
                 }
             }
             if (l.size() > 0) {
-                referenceService.saveBatch(l);
+//                referenceService.saveBatch(l);
 //                topicActivityService.saveBatch(ta);
                 for (Reference r : l) {
                     referenceList.add(r.getId());