From b3b566ebdfed4005aaa513da3d5d2fd3924903cc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 31 Jan 2024 16:17:54 +0800
Subject: [PATCH] 拿不到地址总表数据，不设置网格信息
---
src/main/java/org/springblade/modules/task/controller/TaskController.java | 33 +++++++++++++--------------------
1 files changed, 13 insertions(+), 20 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/controller/TaskController.java b/src/main/java/org/springblade/modules/task/controller/TaskController.java
index fa0465b..7460189 100644
--- a/src/main/java/org/springblade/modules/task/controller/TaskController.java
+++ b/src/main/java/org/springblade/modules/task/controller/TaskController.java
@@ -1,19 +1,3 @@
-/*
- * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the dreamlu.net developer nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * Author: Chill 庄骞 (smallchill@163.com)
- */
package org.springblade.modules.task.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -22,7 +6,6 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
-import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
@@ -32,7 +15,6 @@
import org.springblade.modules.task.vo.TaskVO;
import org.springblade.modules.task.wrapper.TaskWrapper;
import org.springframework.web.bind.annotation.*;
-
import javax.validation.Valid;
/**
@@ -45,7 +27,7 @@
@AllArgsConstructor
@RequestMapping("blade-task/task")
@Api(value = "任务表", tags = "任务表接口")
-public class TaskController extends BladeController {
+public class TaskController{
private final ITaskService taskService;
@@ -78,6 +60,17 @@
@ApiOperation(value = "分页", notes = "传入task")
public R<IPage<TaskVO>> page(TaskVO task, Query query) {
IPage<TaskVO> pages = taskService.selectTaskPage(Condition.getPage(query), task);
+ return R.data(pages);
+ }
+
+ /**
+ * 任务表 自定义分页
+ */
+ @GetMapping("/getBailReportingPage")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "分页", notes = "传入task")
+ public R<IPage<TaskVO>> getBailReportingPage(TaskVO task, Query query) {
+ IPage<TaskVO> pages = taskService.getBailReportingPage(Condition.getPage(query), task);
return R.data(pages);
}
@@ -118,7 +111,7 @@
@ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
- return R.status(taskService.deleteLogic(Func.toLongList(ids)));
+ return R.status(taskService.removeByIds(Func.toLongList(ids)));
}
@GetMapping("/countNumber")
--
Gitblit v1.9.3