From 9cc50d2e2c3fcfff3c6b95c09806d3881a97c5ff Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 02 Jan 2024 15:20:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/task/controller/TaskController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 d835c75..3997257 100644
--- a/src/main/java/org/springblade/modules/task/controller/TaskController.java
+++ b/src/main/java/org/springblade/modules/task/controller/TaskController.java
@@ -121,10 +121,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,8 +132,8 @@
@GetMapping("/countTypeNumber")
@ApiOperationSupport(order = 9)
@ApiOperation(value = "统计类型数量")
- public R countTypeNumber(@RequestParam(value = "neiCode", required = false) String neiCode) {
- return R.data(taskService.countTypeNumber());
+ 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