From ed28663eebdcc20325474e70be42e10e91fad930 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 12 Jan 2024 11:54:31 +0800
Subject: [PATCH] 住户删除，场所删除，三色任务执行修改
---
src/main/java/org/springblade/modules/task/controller/TaskController.java | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 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 3ca0f16..8658546 100644
--- a/src/main/java/org/springblade/modules/task/controller/TaskController.java
+++ b/src/main/java/org/springblade/modules/task/controller/TaskController.java
@@ -82,6 +82,17 @@
}
/**
+ * 任务表 自定义分页
+ */
+ @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);
+ }
+
+ /**
* 任务表 新增
*/
@PostMapping("/save")
@@ -94,11 +105,11 @@
/**
* 任务表 修改
*/
- @PostMapping("/update")
+ @PostMapping("/removeTask")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入task")
public R update(@Valid @RequestBody TaskEntity task) {
- return R.status(taskService.updateById(task));
+ return R.status(taskService.removeTask(task));
}
/**
@@ -121,10 +132,10 @@
return R.status(taskService.deleteLogic(Func.toLongList(ids)));
}
- @PostMapping("/countNumber")
+ @GetMapping("/countNumber")
@ApiOperationSupport(order = 8)
@ApiOperation(value = "统计用户标签报事数量")
- public R countNumber(@RequestParam(value = "houseCode",required = false) String houseCode, @RequestParam(value = "status",required = false) Integer status) {
+ public R countNumber(@RequestParam(value = "houseCode", required = false) String houseCode, @RequestParam(value = "status", required = false) Integer status) {
return R.data(taskService.countNumber(houseCode, status));
}
@@ -132,16 +143,8 @@
@GetMapping("/countTypeNumber")
@ApiOperationSupport(order = 9)
@ApiOperation(value = "统计类型数量")
- public R countTypeNumber() {
- return R.data(taskService.countTypeNumber());
- }
-
-
- @GetMapping("/countFrequencyNumber")
- @ApiOperationSupport(order = 10)
- @ApiOperation(value = "统计周期类型数量")
- public R countFrequencyNumber() {
- return R.data(taskService.countFrequencyNumber());
+ public R countTypeNumber(@RequestParam(value = "neiCode", required = false) String neiCode, @RequestParam(value = "roleType", defaultValue = "0") Integer roleType) {
+ return R.data(taskService.countTypeNumber(roleType, neiCode));
}
--
Gitblit v1.9.3