From b3b566ebdfed4005aaa513da3d5d2fd3924903cc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 31 Jan 2024 16:17:54 +0800
Subject: [PATCH] 拿不到地址总表数据，不设置网格信息
---
src/main/java/org/springblade/modules/task/controller/TaskReportForRepairsController.java | 74 ++++++++++++++++++++++++++++++++-----
1 files changed, 64 insertions(+), 10 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 4f1cebb..efd402c 100644
--- a/src/main/java/org/springblade/modules/task/controller/TaskReportForRepairsController.java
+++ b/src/main/java/org/springblade/modules/task/controller/TaskReportForRepairsController.java
@@ -16,25 +16,27 @@
*/
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.secure.utils.AuthUtil;
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.grid.entity.GridmanEntity;
import org.springblade.modules.task.entity.TaskReportForRepairsEntity;
+import org.springblade.modules.task.service.ITaskReportForRepairsService;
import org.springblade.modules.task.vo.TaskReportForRepairsVO;
import org.springblade.modules.task.wrapper.TaskReportForRepairsWrapper;
-import org.springblade.modules.task.service.ITaskReportForRepairsService;
-import org.springblade.core.boot.ctrl.BladeController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.Date;
/**
* 报事报修任务表 控制器
@@ -99,7 +101,27 @@
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入taskReportForRepairs")
public R update(@Valid @RequestBody TaskReportForRepairsEntity taskReportForRepairs) {
+ taskReportForRepairs.setConfirmTime(new Date());
return R.status(taskReportForRepairsService.updateById(taskReportForRepairs));
+ }
+
+ /**
+ * 报事报修任务表 自定义修改
+ */
+ @PostMapping("/updateTaskReportForRepairs")
+ @ApiOperation(value = "修改", notes = "传入taskReportForRepairs")
+ public R updateTaskReportForRepairs(@RequestBody TaskReportForRepairsEntity taskReportForRepairs) {
+ return R.status(taskReportForRepairsService.updateTaskReportForRepairs(taskReportForRepairs));
+ }
+
+ /**
+ * 报事报修任务表 审核
+ */
+ @PostMapping("/checkReportForRepairs")
+ @ApiOperationSupport(order = 5)
+ @ApiOperation(value = "修改", notes = "传入taskReportForRepairs")
+ public R checkReportForRepairs(@RequestBody TaskReportForRepairsEntity taskReportForRepairs) {
+ return R.status(taskReportForRepairsService.checkReportForRepairs(taskReportForRepairs));
}
/**
@@ -124,12 +146,44 @@
/**
* 查询报事报修统计
+ *
* @return
*/
@GetMapping("/getStatisticsCount")
- public R statisticsCount(){
- return R.data(taskReportForRepairsService.getStatisticsCount());
+ public R statisticsCount(@RequestParam("houseCode") String houseCode) {
+ return R.data(taskReportForRepairsService.getStatisticsCount(houseCode));
}
+ /**
+ * w网格员查询报事报修统计
+ *
+ * @return
+ */
+ @GetMapping("/getStatistics")
+ @ApiOperation(value = "w网格员查询报事报修统计" )
+ public R getStatistics() {
+ 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));
+ }
+
+ /**
+ * 更新状态--临时接口
+ * @param gridman
+ * @return
+ */
+ @PostMapping("/updateView")
+ public R updateView(@Valid @RequestBody GridmanEntity gridman) {
+ return R.status(taskReportForRepairsService.updateView(gridman));
+ }
}
--
Gitblit v1.9.3