zh

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

@@ -18,6 +18,7 @@ import com.zh.project0512.utils.CustomUtil;
 import com.zh.project0512.utils.ExcelUtil;
 import com.zh.project0512.utils.FileTypeUtil;
 import com.zh.project0512.utils.MybatisPlusUtil;
+import com.zh.project0512.utils.result.HttpStatusEnum;
 import com.zh.project0512.utils.result.Result;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -400,12 +401,16 @@ public class TaskController {
         return Result.success(null, "修改完成");
     }
 
-//    @Operation(summary = "删除")
+    @Operation(summary = "删除")
-//    @PostMapping("/del")
+    @PostMapping("/del")
-//    @AdminTokenValid
+    @AdminTokenValid
-//    public Result del(@Validated @RequestBody DelTaskParam param) {
+    public Result del(@Validated @RequestBody DelTaskParam param) {
-//        return MybatisPlusUtil.sqlResult(taskService.removeById(param.getId()), "删除");
+        Task task = taskService.getById(param.getId());
-//    }
+        if (task.getStatus() !=0){
+            return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION,"只支持未上线的任务删除");
+        }
+        return MybatisPlusUtil.sqlResult(taskService.removeById(param.getId()), "删除");
+    }
 
     @Operation(summary = "终止任务")
     @PostMapping("/del")

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

@@ -120,7 +120,7 @@ public class VideoController {
         qw.like(param.getTaskTitle() != null, "t4.title", param.getTaskTitle());
         qw.ge(param.getBeginTime() != null, "t1.creatAt", param.getBeginTime());
         qw.le(param.getEndTime() != null, "t1.creatAt", param.getEndTime());
-        IPage<Map> iPage = videoService.pageList(MybatisPlusUtil.SetNumPage(param.getPageNum(), param.getPageSize()), qw);
+        IPage<Map> iPage = videoService.pageList(MybatisPlusUtil.SetNumPage(1,10000), qw);
         List<Map> records = iPage.getRecords();
         for (Map m : records) {
             //平台：1抖音；2快手；3朋友圈；4视频号

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

@@ -75,7 +75,7 @@ public class TaskUController {
         private int pageSize;
         @Schema(title = "用户的任务状态", description = "0待领取；1进行中；2已完成；3已结束；4我的任务")
         @Min(value = 0)
-        @Max(value = 2)
+        @Max(value = 4)
         private Integer status;
         @Schema(title = "月份区间")
         private Integer month;

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

@@ -36,7 +36,7 @@ public class TeachingRefeUController {
     @AdminTokenValid
     public Result list(@Validated @RequestBody listTCRParam param) {
         QueryWrapper<TeachingRefe> qw = new QueryWrapper<>();
-        qw.eq("isDeleted",0).orderByDesc("updateAt", "creatAt").like(param.getTitle() != null, "title", param.getTitle());
+        qw.eq("isDeleted",0).orderByAsc("sortWeight").orderByDesc("updateAt", "creatAt").like(param.getTitle() != null, "title", param.getTitle());
         return Result.success(teachingRefeService.pageMaps(MybatisPlusUtil.SetNumPage(param.getPageNum(), param.getPageSize()), qw));
     }
 }