From ad2ec97fe0c60eee4bb7c8cdacff7c876f280ea7 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 08 Jan 2024 11:30:18 +0800
Subject: [PATCH] 公安安全监管

---
 src/main/java/org/springblade/modules/task/controller/TaskController.java |   34 ++++++++++++++++++++++++----------
 1 files changed, 24 insertions(+), 10 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 5583974..fa0465b 100644
--- a/src/main/java/org/springblade/modules/task/controller/TaskController.java
+++ b/src/main/java/org/springblade/modules/task/controller/TaskController.java
@@ -16,25 +16,24 @@
  */
 package org.springblade.modules.task.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
-import org.springblade.core.secure.BladeUser;
+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;
 import org.springblade.core.tool.utils.Func;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.modules.task.entity.TaskEntity;
+import org.springblade.modules.task.service.ITaskService;
 import org.springblade.modules.task.vo.TaskVO;
 import org.springblade.modules.task.wrapper.TaskWrapper;
-import org.springblade.modules.task.service.ITaskService;
-import org.springblade.core.boot.ctrl.BladeController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
 
 /**
  * 任务表 控制器
@@ -95,11 +94,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));
 	}
 
 	/**
@@ -122,5 +121,20 @@
 		return R.status(taskService.deleteLogic(Func.toLongList(ids)));
 	}
 
+	@GetMapping("/countNumber")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "统计用户标签报事数量")
+	public R countNumber(@RequestParam(value = "houseCode", required = false) String houseCode, @RequestParam(value = "status", required = false) Integer status) {
+		return R.data(taskService.countNumber(houseCode, status));
+	}
+
+
+	@GetMapping("/countTypeNumber")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "统计类型数量")
+	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