From f9c5f3e02cd32d201428ef0700411f7c421b25fa Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 27 一月 2026 09:53:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/inspectiontask/controller/InspectionTaskController.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/inspectiontask/controller/InspectionTaskController.java b/src/main/java/com/ruoyi/inspectiontask/controller/InspectionTaskController.java
index a32dd4b..f08eb0e 100644
--- a/src/main/java/com/ruoyi/inspectiontask/controller/InspectionTaskController.java
+++ b/src/main/java/com/ruoyi/inspectiontask/controller/InspectionTaskController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.inspectiontask.dto.InspectionTaskDto;
@@ -9,10 +10,12 @@
import com.ruoyi.inspectiontask.service.InspectionTaskService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
/**
* @author :yys
@@ -36,13 +39,27 @@
return R.ok(list);
}
+
+ /**
+ * 瀵煎嚭
+ */
+ @PostMapping("/export")
+ @ApiOperation(value = "瀵煎嚭瀹氭椂浠诲姟璁板綍")
+ public void export(HttpServletResponse response) {
+ Page page = new Page<>(-1,-1);
+ InspectionTaskDto timingTask = new InspectionTaskDto();
+ IPage<InspectionTaskDto> list = inspectionTaskService.selectInspectionTaskList(page,timingTask);
+ ExcelUtil<InspectionTaskDto> util = new ExcelUtil<>(InspectionTaskDto.class);
+ util.exportExcel(response, list.getRecords(), "瀵煎嚭瀹氭椂浠诲姟璁板綍");
+ }
+
/**
* 宸℃浠诲姟琛ㄦ柊澧炰慨鏀�
*/
@PostMapping("/addOrEditInspectionTask")
@ApiOperation("宸℃浠诲姟琛ㄦ柊澧炰慨鏀�")
@Transactional(rollbackFor = Exception.class)
- public R addOrEditInspectionTask(@RequestBody InspectionTaskDto inspectionTaskDto) {
+ public R addOrEditInspectionTask(@RequestBody InspectionTaskDto inspectionTaskDto) throws IOException {
return R.ok(inspectionTaskService.addOrEditInspectionTask(inspectionTaskDto));
}
--
Gitblit v1.9.3