From b7df6735bcb2d447cae7fcfba2d12accf3dd2fcc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Sat, 03 Feb 2024 17:27:21 +0800
Subject: [PATCH] 消防检查优化
---
src/main/java/org/springblade/modules/task/controller/TaskReportForRepairsController.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/controller/TaskReportForRepairsController.java b/src/main/java/org/springblade/modules/task/controller/TaskReportForRepairsController.java
index 3057800..efd402c 100644
--- a/src/main/java/org/springblade/modules/task/controller/TaskReportForRepairsController.java
+++ b/src/main/java/org/springblade/modules/task/controller/TaskReportForRepairsController.java
@@ -36,6 +36,7 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import java.util.Date;
/**
* 报事报修任务表 控制器
@@ -100,6 +101,7 @@
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入taskReportForRepairs")
public R update(@Valid @RequestBody TaskReportForRepairsEntity taskReportForRepairs) {
+ taskReportForRepairs.setConfirmTime(new Date());
return R.status(taskReportForRepairsService.updateById(taskReportForRepairs));
}
@@ -148,8 +150,8 @@
* @return
*/
@GetMapping("/getStatisticsCount")
- public R statisticsCount() {
- return R.data(taskReportForRepairsService.getStatisticsCount());
+ public R statisticsCount(@RequestParam("houseCode") String houseCode) {
+ return R.data(taskReportForRepairsService.getStatisticsCount(houseCode));
}
/**
@@ -160,7 +162,18 @@
@GetMapping("/getStatistics")
@ApiOperation(value = "w网格员查询报事报修统计" )
public R getStatistics() {
- return R.data(taskReportForRepairsService.getStatistics(AuthUtil.getUserId()));
+ return R.data(taskReportForRepairsService.getStatistics(AuthUtil.getUserId(),""));
+ }
+
+ /**
+ * w网格员查询报事报修统计
+ *
+ * @return
+ */
+ @GetMapping("/getReportForStatistics")
+ @ApiOperation(value = "查询报事报修统计" )
+ public R getReportForStatistics(@RequestParam("code") String code, @RequestParam("roleType") String roleType) {
+ return R.data(taskReportForRepairsService.getReportForStatistics(code, roleType));
}
/**
@@ -172,6 +185,5 @@
public R updateView(@Valid @RequestBody GridmanEntity gridman) {
return R.status(taskReportForRepairsService.updateView(gridman));
}
-
}
--
Gitblit v1.9.3