From d24942ee210bcc108fe9218c3a6c448afa613d00 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 21 四月 2026 14:10:33 +0800
Subject: [PATCH] feat(inspectiontask): 新增巡检结果字段并支持批量操作
---
src/main/java/com/ruoyi/inspectiontask/controller/TimingTaskController.java | 43 ++++++++++++++++++++++++-------------------
1 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/ruoyi/inspectiontask/controller/TimingTaskController.java b/src/main/java/com/ruoyi/inspectiontask/controller/TimingTaskController.java
index ee13756..3f371be 100644
--- a/src/main/java/com/ruoyi/inspectiontask/controller/TimingTaskController.java
+++ b/src/main/java/com/ruoyi/inspectiontask/controller/TimingTaskController.java
@@ -7,56 +7,65 @@
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.dto.TimingTaskDto;
+import com.ruoyi.inspectiontask.pojo.InspectionTask;
import com.ruoyi.inspectiontask.pojo.TimingTask;
+import com.ruoyi.inspectiontask.service.InspectionTaskService;
import com.ruoyi.inspectiontask.service.TimingTaskService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.quartz.SchedulerException;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletResponse;
+import java.util.List;
/**
* @author :yys
* @date : 2025/9/19 10:53
*/
@RestController
-@Api(tags = "瀹氭椂浠诲姟绠＄悊")
+@Api(tags = "宸℃绠＄悊")
@RequestMapping("/timingTask")
public class TimingTaskController extends BaseController {
-
@Autowired
private TimingTaskService timingTaskService;
- /**
- * 瀹氭椂宸℃浠诲姟琛ㄦ煡璇�
- */
+ @Autowired
+ private InspectionTaskService inspectionTaskService;
+
@GetMapping("/list")
@ApiOperation(value = "瀹氭椂浠诲姟鍒楄〃")
public R<IPage<TimingTaskDto>> list(Page<TimingTask> page, TimingTask timingTask) {
- IPage<TimingTaskDto> list = timingTaskService.selectTimingTaskList(page,timingTask);
+ IPage<TimingTaskDto> list = timingTaskService.selectTimingTaskList(page, timingTask);
return R.ok(list);
}
- /**
- * 瀵煎嚭
- */
+ @GetMapping("/recordList/{timingId}")
+ @ApiOperation(value = "鏍规嵁瀹氭椂浠诲姟ID鏌ヨ宸℃璁板綍鍒楄〃")
+ public R<List<InspectionTaskDto>> recordList(@PathVariable Long timingId) {
+ return R.ok(inspectionTaskService.selectInspectionTaskRecordListByTimingId(timingId));
+ }
+
@PostMapping("/export")
@ApiOperation(value = "瀵煎嚭瀹氭椂浠诲姟")
public void export(HttpServletResponse response) {
- Page page = new Page<>(-1,-1);
+ Page page = new Page<>(-1, -1);
TimingTaskDto timingTask = new TimingTaskDto();
- IPage<TimingTaskDto> list = timingTaskService.selectTimingTaskList(page,timingTask);
+ IPage<TimingTaskDto> list = timingTaskService.selectTimingTaskList(page, timingTask);
ExcelUtil<TimingTaskDto> util = new ExcelUtil<>(TimingTaskDto.class);
util.exportExcel(response, list.getRecords(), "瀵煎嚭瀹氭椂浠诲姟");
}
- /**
- * 瀹氭椂宸℃浠诲姟琛ㄦ柊澧炰慨鏀�
- */
@PostMapping("/addOrEditTimingTask")
@ApiOperation(value = "鏂板淇敼瀹氭椂浠诲姟")
@Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.INSERT)
@@ -64,14 +73,10 @@
return R.ok(timingTaskService.addOrEditTimingTask(timingTaskDto));
}
- /**
- * 瀹氭椂宸℃浠诲姟琛ㄥ垹闄�
- */
@DeleteMapping("/delTimingTask")
@ApiOperation(value = "鍒犻櫎瀹氭椂浠诲姟")
@Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.DELETE)
public R remove(@RequestBody Long[] ids) {
return R.ok(timingTaskService.delByIds(ids));
}
-
}
--
Gitblit v1.9.3