From d709e8a7117704ac4717db5201e40964b90d4791 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 28 五月 2026 16:17:03 +0800
Subject: [PATCH] Merge dev_pro_河南鹤壁 into dev_山西_晋和园_pro
---
src/main/java/com/ruoyi/inspectiontask/controller/InspectionTaskController.java | 40 +++++++++++++++++++++++++++++++---------
1 files changed, 31 insertions(+), 9 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..8c61126 100644
--- a/src/main/java/com/ruoyi/inspectiontask/controller/InspectionTaskController.java
+++ b/src/main/java/com/ruoyi/inspectiontask/controller/InspectionTaskController.java
@@ -2,45 +2,66 @@
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.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.inspectiontask.dto.InspectionTaskDto;
import com.ruoyi.inspectiontask.pojo.InspectionTask;
import com.ruoyi.inspectiontask.service.InspectionTaskService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
+
+import java.io.IOException;
/**
* @author :yys
* @date : 2025/9/19 10:52
*/
@RestController
-@Api(tags = "宸℃浠诲姟绠＄悊")
+@Tag(name = "宸℃浠诲姟璁板綍")
@RequestMapping("/inspectionTask")
+@AllArgsConstructor
public class InspectionTaskController extends BaseController {
- @Autowired
private InspectionTaskService inspectionTaskService;
/**
* 宸℃浠诲姟琛ㄨ〃鏌ヨ
*/
@GetMapping("/list")
- @ApiOperation("宸℃浠诲姟琛ㄨ〃鏌ヨ")
+ @Operation(summary = "宸℃浠诲姟琛ㄨ〃鏌ヨ")
public R<IPage<InspectionTaskDto>> list(Page<InspectionTask> page, InspectionTaskDto inspectionTaskDto) {
- IPage<InspectionTaskDto> list = inspectionTaskService.selectInspectionTaskList(page,inspectionTaskDto);
+ IPage<InspectionTaskDto> list = inspectionTaskService.selectInspectionTaskList(page, inspectionTaskDto);
return R.ok(list);
+ }
+
+
+ /**
+ * 瀵煎嚭
+ */
+ @Log(title = "妫�楠屼换鍔�", businessType = BusinessType.EXPORT)
+ @Operation(summary = "瀵煎嚭瀹氭椂浠诲姟璁板綍")
+ @PostMapping("/export")
+ 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(), "瀵煎嚭瀹氭椂浠诲姟璁板綍");
}
/**
* 宸℃浠诲姟琛ㄦ柊澧炰慨鏀�
*/
+ @Log(title = "妫�楠屼换鍔�", businessType = BusinessType.INSERT)
+ @Operation(summary = "宸℃浠诲姟琛ㄦ柊澧炰慨鏀�")
@PostMapping("/addOrEditInspectionTask")
- @ApiOperation("宸℃浠诲姟琛ㄦ柊澧炰慨鏀�")
@Transactional(rollbackFor = Exception.class)
public R addOrEditInspectionTask(@RequestBody InspectionTaskDto inspectionTaskDto) {
return R.ok(inspectionTaskService.addOrEditInspectionTask(inspectionTaskDto));
@@ -49,8 +70,9 @@
/**
* 宸℃浠诲姟琛ㄥ垹闄�
*/
+ @Log(title = "妫�楠屼换鍔�", businessType = BusinessType.DELETE)
+ @Operation(summary = "宸℃浠诲姟琛ㄥ垹闄�")
@DeleteMapping("/delInspectionTask")
- @ApiOperation("宸℃浠诲姟琛ㄥ垹闄�")
@Transactional(rollbackFor = Exception.class)
public R remove(@RequestBody Long[] ids) {
return R.ok(inspectionTaskService.delByIds(ids));
--
Gitblit v1.9.3