From bb1d7eeda426e66393cf4403cb3ef082db696bd9 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 07 八月 2026 15:42:19 +0800
Subject: [PATCH] feat(report): 新增会计报表功能并完善设备维护和首页统计
---
src/main/java/com/ruoyi/inspectiontask/controller/InspectionTaskController.java | 61 ++++++++++++++----------------
1 files changed, 28 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/ruoyi/inspectiontask/controller/InspectionTaskController.java b/src/main/java/com/ruoyi/inspectiontask/controller/InspectionTaskController.java
index 8d60cd5..42d2d4e 100644
--- a/src/main/java/com/ruoyi/inspectiontask/controller/InspectionTaskController.java
+++ b/src/main/java/com/ruoyi/inspectiontask/controller/InspectionTaskController.java
@@ -8,69 +8,64 @@
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 org.springframework.beans.factory.annotation.Autowired;
+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.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import jakarta.servlet.http.HttpServletResponse;
-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);
}
-
- /**
- * 瀵煎嚭
- */
@PostMapping("/export")
- @ApiOperation(value = "瀵煎嚭瀹氭椂浠诲姟璁板綍")
+ @Operation(summary = "瀵煎嚭瀹氭椂浠诲姟璁板綍")
public void export(HttpServletResponse response) {
- Page page = new Page<>(-1,-1);
+ Page page = new Page<>(-1, -1);
InspectionTaskDto timingTask = new InspectionTaskDto();
- IPage<InspectionTaskDto> list = inspectionTaskService.selectInspectionTaskList(page,timingTask);
+ IPage<InspectionTaskDto> list = inspectionTaskService.selectInspectionTaskList(page, timingTask);
ExcelUtil<InspectionTaskDto> util = new ExcelUtil<>(InspectionTaskDto.class);
util.exportExcel(response, list.getRecords(), "瀵煎嚭瀹氭椂浠诲姟璁板綍");
}
- /**
- * 宸℃浠诲姟琛ㄦ柊澧炰慨鏀�
- */
@PostMapping("/addOrEditInspectionTask")
- @ApiOperation("宸℃浠诲姟琛ㄦ柊澧炰慨鏀�")
+ @Operation(summary = "宸℃浠诲姟琛ㄦ柊澧炰慨鏀�")
@Transactional(rollbackFor = Exception.class)
- public R addOrEditInspectionTask(@RequestBody InspectionTaskDto inspectionTaskDto) throws IOException {
+ public R addOrEditInspectionTask(@RequestBody InspectionTaskDto inspectionTaskDto) {
return R.ok(inspectionTaskService.addOrEditInspectionTask(inspectionTaskDto));
}
- /**
- * 宸℃浠诲姟琛ㄥ垹闄�
- */
@DeleteMapping("/delInspectionTask")
- @ApiOperation("宸℃浠诲姟琛ㄥ垹闄�")
+ @Operation(summary = "宸℃浠诲姟琛ㄥ垹闄�")
@Transactional(rollbackFor = Exception.class)
public R remove(@RequestBody Long[] ids) {
return R.ok(inspectionTaskService.delByIds(ids));
}
+ @PutMapping("/complete/{id}")
+ @Operation(summary = "宸℃瀹屾垚")
+ @Transactional(rollbackFor = Exception.class)
+ public R complete(@PathVariable Long id) {
+ return R.ok(inspectionTaskService.complete(id));
+ }
+
+ @PutMapping("/batchComplete")
+ @Operation(summary = "涓�閿贰妫�瀹屾垚")
+ @Transactional(rollbackFor = Exception.class)
+ public R batchComplete(String dateStr) {
+ return R.ok(inspectionTaskService.batchComplete(dateStr));
+ }
+
}
--
Gitblit v1.9.3