From 8b7258c9427882bb1798f1502eaa35184c6e374e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 09 Aug 2024 14:29:18 +0800
Subject: [PATCH] 短信指定楼栋发送
---
src/main/java/org/springblade/modules/task/controller/TaskController.java | 56 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 30 insertions(+), 26 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 8399b73..b6c8f98 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;
@@ -82,6 +64,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 +87,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));
}
/**
@@ -118,13 +111,13 @@
@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)));
}
- @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,9 +125,20 @@
@GetMapping("/countTypeNumber")
@ApiOperationSupport(order = 9)
@ApiOperation(value = "统计类型数量")
- public R countTypeNumber() {
- 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));
}
+ /**
+ * 任务表 新增或修改
+ */
+ @PostMapping("/examine")
+ @ApiOperationSupport(order = 6)
+ @ApiOperation(value = "任务审核", notes = "传入task")
+ public R examine(@Valid @RequestBody TaskEntity task) {
+ return R.status(taskService.examine(task));
+ }
+
+
}
--
Gitblit v1.9.3