From af21084fa4d1e5f8432f61fbd26a3e4e99495616 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 11 Jan 2024 18:03:49 +0800
Subject: [PATCH] 三色任务完善
---
src/main/java/org/springblade/modules/task/controller/TaskHotelReportingController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/controller/TaskHotelReportingController.java b/src/main/java/org/springblade/modules/task/controller/TaskHotelReportingController.java
index 93d7ccc..8b107ed 100644
--- a/src/main/java/org/springblade/modules/task/controller/TaskHotelReportingController.java
+++ b/src/main/java/org/springblade/modules/task/controller/TaskHotelReportingController.java
@@ -46,7 +46,7 @@
@AllArgsConstructor
@RequestMapping("blade-taskHotelReporting/taskHotelReporting")
@Api(value = "旅馆安全自查任务", tags = "旅馆安全自查任务接口")
-public class TaskHotelReportingController extends BladeController {
+public class TaskHotelReportingController{
private final ITaskHotelReportingService taskHotelReportingService;
@@ -56,9 +56,9 @@
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入taskHotelReporting")
- public R<TaskHotelReportingVO> detail(TaskHotelReportingEntity taskHotelReporting) {
+ public R<TaskHotelReportingEntity> detail(TaskHotelReportingEntity taskHotelReporting) {
TaskHotelReportingEntity detail = taskHotelReportingService.getOne(Condition.getQueryWrapper(taskHotelReporting));
- return R.data(TaskHotelReportingWrapper.build().entityVO(detail));
+ return R.data(detail);
}
/**
* 旅馆安全自查任务 分页
@@ -98,7 +98,7 @@
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入taskHotelReporting")
- public R update(@Valid @RequestBody TaskHotelReportingEntity taskHotelReporting) throws Exception {
+ public R update(@Valid @RequestBody TaskHotelReportingVO taskHotelReporting) throws Exception {
return R.status(taskHotelReportingService.updateHotelReporting(taskHotelReporting));
}
@@ -119,7 +119,7 @@
@ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
- return R.status(taskHotelReportingService.deleteLogic(Func.toLongList(ids)));
+ return R.status(taskHotelReportingService.removeByIds(Func.toLongList(ids)));
}
--
Gitblit v1.9.3