From f9a3f18dc49f4d1317b8cb4f04d53d268bd90bbf Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 09 Nov 2023 17:46:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/task/controller/TaskReportForRepairsController.java |   25 ++++++++++++++++++++++++-
 1 files changed, 24 insertions(+), 1 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 8869a2e..ce3f23f 100644
--- a/src/main/java/org/springblade/modules/task/controller/TaskReportForRepairsController.java
+++ b/src/main/java/org/springblade/modules/task/controller/TaskReportForRepairsController.java
@@ -89,7 +89,7 @@
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入taskReportForRepairs")
 	public R save(@Valid @RequestBody TaskReportForRepairsEntity taskReportForRepairs) {
-		return R.status(taskReportForRepairsService.save(taskReportForRepairs));
+		return R.status(taskReportForRepairsService.saveTaskReportForRepairs(taskReportForRepairs));
 	}
 
 	/**
@@ -100,6 +100,25 @@
 	@ApiOperation(value = "修改", notes = "传入taskReportForRepairs")
 	public R update(@Valid @RequestBody TaskReportForRepairsEntity taskReportForRepairs) {
 		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));
 	}
 
 	/**
@@ -122,6 +141,10 @@
 		return R.status(taskReportForRepairsService.deleteLogic(Func.toLongList(ids)));
 	}
 
+	/**
+	 * 查询报事报修统计
+	 * @return
+	 */
 	@GetMapping("/getStatisticsCount")
 	public R statisticsCount(){
 		return R.data(taskReportForRepairsService.getStatisticsCount());

--
Gitblit v1.9.3