From 70a29ae28b85643e00a4b7fbf111a95646a24dc2 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 20 Mar 2024 17:20:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/task/controller/TaskBailReportingEventController.java | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/controller/TaskBailReportingEventController.java b/src/main/java/org/springblade/modules/task/controller/TaskBailReportingEventController.java
index 08c70b9..d633538 100644
--- a/src/main/java/org/springblade/modules/task/controller/TaskBailReportingEventController.java
+++ b/src/main/java/org/springblade/modules/task/controller/TaskBailReportingEventController.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.apache.commons.beanutils.BeanUtils;
+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.BeanUtil;
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.TaskBailReportingEventDTO;
import org.springblade.modules.task.entity.TaskBailReportingEventEntity;
+import org.springblade.modules.task.service.ITaskBailReportingEventService;
import org.springblade.modules.task.vo.TaskBailReportingEventVO;
import org.springblade.modules.task.wrapper.TaskBailReportingEventWrapper;
-import org.springblade.modules.task.service.ITaskBailReportingEventService;
-import org.springblade.core.boot.ctrl.BladeController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
/**
* 取保候审任务 控制器
@@ -58,7 +60,8 @@
@ApiOperation(value = "详情", notes = "传入taskBailReportingEvent")
public R<TaskBailReportingEventVO> detail(TaskBailReportingEventEntity taskBailReportingEvent) {
TaskBailReportingEventEntity detail = taskBailReportingEventService.getOne(Condition.getQueryWrapper(taskBailReportingEvent));
- return R.data(TaskBailReportingEventWrapper.build().entityVO(detail));
+ TaskBailReportingEventVO copy = BeanUtil.copy(detail, TaskBailReportingEventVO.class);
+ return R.data(copy);
}
/**
* 取保候审任务 分页
@@ -88,7 +91,7 @@
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入taskBailReportingEvent")
- public R save(@Valid @RequestBody TaskBailReportingEventEntity taskBailReportingEvent) {
+ public R save(@Valid @RequestBody TaskBailReportingEventDTO taskBailReportingEvent) {
return R.status(taskBailReportingEventService.saveBailReporting(taskBailReportingEvent));
}
@@ -98,7 +101,7 @@
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入taskBailReportingEvent")
- public R update(@Valid @RequestBody TaskBailReportingEventEntity taskBailReportingEvent) {
+ public R update(@Valid @RequestBody TaskBailReportingEventEntity taskBailReportingEvent) throws Exception {
return R.status(taskBailReportingEventService.updateBailReporting(taskBailReportingEvent));
}
--
Gitblit v1.9.3