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/TaskLabelReportingEventController.java |   60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 55 insertions(+), 5 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..7302bcc 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,28 @@
 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.log.annotation.ApiLog;
+import org.springblade.core.log.logger.BladeLogger;
 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.jackson.JsonUtil;
+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;
 
 /**
  * 打金店报事 控制器
@@ -49,16 +59,19 @@
 public class TaskLabelReportingEventController extends BladeController {
 
 	private final ITaskLabelReportingEventService taskLabelReportingEventService;
+	private final BladeLogger bladeLogger;
 
 	/**
-	 * 打金店报事 详情
+	 * 二手交易报事 详情
 	 */
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 1)
+	@ApiLog("二手交易报事 详情")
 	@ApiOperation(value = "详情", notes = "传入taskLabelReportingEvent")
-	public R<TaskLabelReportingEventVO> detail(TaskLabelReportingEventEntity taskLabelReportingEvent) {
+	public R detail(TaskLabelReportingEventEntity taskLabelReportingEvent) {
+		bladeLogger.info("二手交易报事 详情", JsonUtil.toJson(taskLabelReportingEvent));
 		TaskLabelReportingEventEntity detail = taskLabelReportingEventService.getOne(Condition.getQueryWrapper(taskLabelReportingEvent));
-		return R.data(TaskLabelReportingEventWrapper.build(). entityVO(detail));
+		return R.data(detail);
 	}
 	/**
 	 * 打金店报事 分页
@@ -76,8 +89,10 @@
 	 */
 	@GetMapping("/page")
 	@ApiOperationSupport(order = 3)
+	@ApiLog("二手交易报事 自定义分页")
 	@ApiOperation(value = "分页", notes = "传入taskLabelReportingEvent")
 	public R<IPage<TaskLabelReportingEventVO>> page(TaskLabelReportingEventVO taskLabelReportingEvent, Query query) {
+		bladeLogger.info("二手交易报事 自定义分页", JsonUtil.toJson(taskLabelReportingEvent));
 		IPage<TaskLabelReportingEventVO> pages = taskLabelReportingEventService.selectTaskLabelReportingEventPage(Condition.getPage(query), taskLabelReportingEvent);
 		return R.data(pages);
 	}
@@ -87,8 +102,10 @@
 	 */
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
+	@ApiLog("二手交易报事 新增")
 	@ApiOperation(value = "新增", notes = "传入taskLabelReportingEvent")
 	public R save(@Valid @RequestBody TaskLabelReportingEventDTO taskLabelReportingEvent) {
+		bladeLogger.info("二手交易报事 新增", JsonUtil.toJson(taskLabelReportingEvent));
 		return R.status(taskLabelReportingEventService.saveReportingEven(taskLabelReportingEvent));
 	}
 
@@ -97,8 +114,10 @@
 	 */
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
+	@ApiLog("二手交易报事 修改")
 	@ApiOperation(value = "修改", notes = "传入taskLabelReportingEvent")
-	public R update(@Valid @RequestBody TaskLabelReportingEventEntity taskLabelReportingEvent) throws Exception {
+	public R update(@Valid @RequestBody TaskLabelReportingEventVO taskLabelReportingEvent) throws Exception {
+		bladeLogger.info("二手交易报事 修改", JsonUtil.toJson(taskLabelReportingEvent));
 		return R.status(taskLabelReportingEventService.updateLabelReporting(taskLabelReportingEvent));
 	}
 
@@ -107,8 +126,10 @@
 	 */
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
+	@ApiLog("二手交易报事 新增或修改")
 	@ApiOperation(value = "新增或修改", notes = "传入taskLabelReportingEvent")
 	public R submit(@Valid @RequestBody TaskLabelReportingEventEntity taskLabelReportingEvent) {
+		bladeLogger.info("二手交易报事 新增或修改", JsonUtil.toJson(taskLabelReportingEvent));
 		return R.status(taskLabelReportingEventService.saveOrUpdate(taskLabelReportingEvent));
 	}
 
@@ -117,10 +138,39 @@
 	 */
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 7)
+	@ApiLog("二手交易报事 删除")
 	@ApiOperation(value = "逻辑删除", notes = "传入ids")
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		return R.status(taskLabelReportingEventService.deleteLogic(Func.toLongList(ids)));
+		bladeLogger.info("二手交易报事 删除", JsonUtil.toJson(ids));
+		return R.status(taskLabelReportingEventService.removeTaskByIds(Func.toLongList(ids)));
 	}
 
+	/**
+	 * 导出二手交易信息
+	 * @param taskLabelReportingEvent
+	 */
+	@GetMapping("export-taskLabelReportingEvent")
+	@ApiLog("导出二手交易信息")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "导出交易登记信息", notes = "传入taskLabelReportingEvent")
+	public void exportTaskLabelReportingEvent(TaskLabelReportingEventVO taskLabelReportingEvent, HttpServletResponse response) {
+		bladeLogger.info("导出二手交易信息", JsonUtil.toJson(taskLabelReportingEvent));
+		List<TaskLabelReportingEventExcel> list = taskLabelReportingEventService.exportTaskLabelReportingEvent(taskLabelReportingEvent);
+		ExcelUtil.export(response, "交易登记" + DateUtil.time(), "交易登记表", list, TaskLabelReportingEventExcel.class);
+	}
+
+
+	/**
+	 * 二手交易报事 详情
+	 */
+	@GetMapping("/getDetail")
+	@ApiLog("二手交易报事 详情")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "详情", notes = "传入taskLabelReportingEvent")
+	public R getDetail(TaskLabelReportingEventVO taskLabelReportingEvent) {
+		bladeLogger.info("二手交易报事 详情", JsonUtil.toJson(taskLabelReportingEvent));
+		TaskLabelReportingEventVO detail = taskLabelReportingEventService.getDetail(taskLabelReportingEvent);
+		return R.data(detail);
+	}
 
 }

--
Gitblit v1.9.3