From c4e2c196aad8af656d94bc47e9f1a80bc504b5d7 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 14 Mar 2024 18:15:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/task/controller/TaskLabelReportingEventController.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/controller/TaskLabelReportingEventController.java b/src/main/java/org/springblade/modules/task/controller/TaskLabelReportingEventController.java
index 0daf64a..2ee2f57 100644
--- a/src/main/java/org/springblade/modules/task/controller/TaskLabelReportingEventController.java
+++ b/src/main/java/org/springblade/modules/task/controller/TaskLabelReportingEventController.java
@@ -23,18 +23,25 @@
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.excel.util.ExcelUtil;
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.DateUtil;
import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.place.excel.PlaceCheckExcel;
+import org.springblade.modules.place.vo.PlaceCheckVO;
import org.springblade.modules.task.dto.TaskLabelReportingEventDTO;
import org.springblade.modules.task.entity.TaskLabelReportingEventEntity;
+import org.springblade.modules.task.excel.TaskLabelReportingEventExcel;
import org.springblade.modules.task.service.ITaskLabelReportingEventService;
import org.springblade.modules.task.vo.TaskLabelReportingEventVO;
import org.springblade.modules.task.wrapper.TaskLabelReportingEventWrapper;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
+import java.util.List;
/**
* 打金店报事 控制器
@@ -98,7 +105,7 @@
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入taskLabelReportingEvent")
- public R update(@Valid @RequestBody TaskLabelReportingEventEntity taskLabelReportingEvent) throws Exception {
+ public R update(@Valid @RequestBody TaskLabelReportingEventVO taskLabelReportingEvent) throws Exception {
return R.status(taskLabelReportingEventService.updateLabelReporting(taskLabelReportingEvent));
}
@@ -119,8 +126,19 @@
@ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
- return R.status(taskLabelReportingEventService.deleteLogic(Func.toLongList(ids)));
+ return R.status(taskLabelReportingEventService.removeByIds(Func.toLongList(ids)));
}
+ /**
+ * 导出二手交易信息
+ * @param taskLabelReportingEvent
+ */
+ @GetMapping("export-taskLabelReportingEvent")
+ @ApiOperationSupport(order = 8)
+ @ApiOperation(value = "导出交易登记信息", notes = "传入taskLabelReportingEvent")
+ public void exportTaskLabelReportingEvent(TaskLabelReportingEventVO taskLabelReportingEvent, HttpServletResponse response) {
+ List<TaskLabelReportingEventExcel> list = taskLabelReportingEventService.exportTaskLabelReportingEvent(taskLabelReportingEvent);
+ ExcelUtil.export(response, "交易登记" + DateUtil.time(), "交易登记表", list, TaskLabelReportingEventExcel.class);
+ }
}
--
Gitblit v1.9.3