From 1b77c2724e38d087f3eab4a2f27b3b165f4265dc Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 25 五月 2026 14:37:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_tide' into dev_tide
---
src/main/java/com/ruoyi/safety/controller/SafetyAssessmentReportController.java | 46 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 46 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/safety/controller/SafetyAssessmentReportController.java b/src/main/java/com/ruoyi/safety/controller/SafetyAssessmentReportController.java
new file mode 100644
index 0000000..e32366b
--- /dev/null
+++ b/src/main/java/com/ruoyi/safety/controller/SafetyAssessmentReportController.java
@@ -0,0 +1,46 @@
+package com.ruoyi.safety.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.safety.pojo.SafetyAssessmentReport;
+import com.ruoyi.safety.service.SafetyAssessmentReportService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 瀹夌幆绠＄悊-鑰冩牳鎶ュ憡鎺ュ彛銆�
+ */
+@RestController
+@Api(tags = "瀹夌幆绠＄悊-鑰冩牳鎶ュ憡")
+@RequestMapping("/safety/learning/report")
+public class SafetyAssessmentReportController extends SafetyControllerSupport {
+
+ @Autowired
+ private SafetyAssessmentReportService reportService;
+
+ /**
+ * 鍒嗛〉鏌ヨ鑰冩牳鎶ュ憡銆�
+ */
+ @Log(title = "瀹夌幆绠＄悊-鑰冩牳鎶ュ憡-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
+ @ApiOperation("鍒嗛〉鏌ヨ鑰冩牳鎶ュ憡")
+ @GetMapping("/list")
+ public AjaxResult list(Page<SafetyAssessmentReport> page, SafetyAssessmentReport query,
+ @RequestParam(value = "pageNum", required = false) Long pageNum,
+ @RequestParam(value = "pageSize", required = false) Long pageSize) {
+ return AjaxResult.success(reportService.queryPage(buildPage(page, pageNum, pageSize), query));
+ }
+
+ /**
+ * 鏌ヨ鑰冩牳鎶ュ憡璇︽儏銆�
+ */
+ @Log(title = "瀹夌幆绠＄悊-鑰冩牳鎶ュ憡-璇︽儏", businessType = BusinessType.OTHER)
+ @ApiOperation("鏌ヨ鑰冩牳鎶ュ憡璇︽儏")
+ @GetMapping("/detail/{id}")
+ public AjaxResult detail(@PathVariable Long id) {
+ return AjaxResult.success(reportService.getById(id));
+ }
+}
--
Gitblit v1.9.3