From 8a881a2c54673d4223425f17bc5cae8eef4e5649 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 22 Mar 2024 17:26:43 +0800
Subject: [PATCH] 反诈宣传和反诈预警查询调整

---
 src/main/java/org/springblade/modules/task/controller/TaskReportForRepairsController.java |   29 +++++++----------------------
 1 files changed, 7 insertions(+), 22 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 cdc2714..d07ce9a 100644
--- a/src/main/java/org/springblade/modules/task/controller/TaskReportForRepairsController.java
+++ b/src/main/java/org/springblade/modules/task/controller/TaskReportForRepairsController.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;
@@ -36,6 +20,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.Date;
 
 /**
  * 报事报修任务表 控制器
@@ -57,9 +42,9 @@
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入taskReportForRepairs")
-	public R<TaskReportForRepairsVO> detail(TaskReportForRepairsEntity taskReportForRepairs) {
+	public R detail(TaskReportForRepairsEntity taskReportForRepairs) {
 		TaskReportForRepairsEntity detail = taskReportForRepairsService.getOne(Condition.getQueryWrapper(taskReportForRepairs));
-		return R.data(TaskReportForRepairsWrapper.build().entityVO(detail));
+		return R.data(detail);
 	}
 	/**
 	 * 报事报修任务表 分页
@@ -100,6 +85,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 +134,8 @@
 	 * @return
 	 */
 	@GetMapping("/getStatisticsCount")
-	public R statisticsCount() {
-		return R.data(taskReportForRepairsService.getStatisticsCount());
+	public R statisticsCount(@RequestParam(value = "houseCode",required = false) String houseCode) {
+		return R.data(taskReportForRepairsService.getStatisticsCount(houseCode));
 	}
 
 	/**
@@ -160,7 +146,7 @@
 	@GetMapping("/getStatistics")
 	@ApiOperation(value = "w网格员查询报事报修统计" )
 	public R getStatistics() {
-		return R.data(taskReportForRepairsService.getStatistics(AuthUtil.getUserId()));
+		return R.data(taskReportForRepairsService.getStatistics(AuthUtil.getUserId(),""));
 	}
 
 	/**
@@ -183,6 +169,5 @@
 	public R updateView(@Valid @RequestBody GridmanEntity gridman) {
 		return R.status(taskReportForRepairsService.updateView(gridman));
 	}
-
 
 }

--
Gitblit v1.9.3