From c10d6358b9f014375a13821465bc978d0c0da22e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 29 May 2024 17:17:08 +0800
Subject: [PATCH] 通过E呼即办数据统计
---
src/main/java/org/springblade/modules/task/controller/TaskHotelReportingController.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 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 379eb2e..8b107ed 100644
--- a/src/main/java/org/springblade/modules/task/controller/TaskHotelReportingController.java
+++ b/src/main/java/org/springblade/modules/task/controller/TaskHotelReportingController.java
@@ -16,25 +16,25 @@
*/
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.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.task.dto.TaskHotelReportingDTO;
import org.springblade.modules.task.entity.TaskHotelReportingEntity;
+import org.springblade.modules.task.service.ITaskHotelReportingService;
import org.springblade.modules.task.vo.TaskHotelReportingVO;
import org.springblade.modules.task.wrapper.TaskHotelReportingWrapper;
-import org.springblade.modules.task.service.ITaskHotelReportingService;
-import org.springblade.core.boot.ctrl.BladeController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
/**
* 旅馆安全自查任务 控制器
@@ -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);
}
/**
* 旅馆安全自查任务 分页
@@ -88,7 +88,7 @@
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入taskHotelReporting")
- public R save(@Valid @RequestBody TaskHotelReportingEntity taskHotelReporting) {
+ public R save(@Valid @RequestBody TaskHotelReportingDTO taskHotelReporting) {
return R.status(taskHotelReportingService.saveHotelReporting(taskHotelReporting));
}
@@ -98,7 +98,7 @@
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入taskHotelReporting")
- public R update(@Valid @RequestBody TaskHotelReportingEntity taskHotelReporting) {
+ 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