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/SafetyAssessmentTaskController.java | 61 ++++++++++++++++++++++++++++++
1 files changed, 61 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/safety/controller/SafetyAssessmentTaskController.java b/src/main/java/com/ruoyi/safety/controller/SafetyAssessmentTaskController.java
new file mode 100644
index 0000000..a26d2c9
--- /dev/null
+++ b/src/main/java/com/ruoyi/safety/controller/SafetyAssessmentTaskController.java
@@ -0,0 +1,61 @@
+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.SafetyAssessmentTask;
+import com.ruoyi.safety.pojo.SafetyAssessmentTaskEmployee;
+import com.ruoyi.safety.service.SafetyAssessmentTaskEmployeeService;
+import com.ruoyi.safety.service.SafetyAssessmentTaskService;
+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/assessment")
+public class SafetyAssessmentTaskController extends SafetyControllerSupport {
+
+ @Autowired
+ private SafetyAssessmentTaskService taskService;
+
+ @Autowired
+ private SafetyAssessmentTaskEmployeeService taskEmployeeService;
+
+ /**
+ * 鍒嗛〉鏌ヨ娴嬭瘎浠诲姟銆�
+ */
+ @Log(title = "瀹夌幆绠＄悊-娴嬭瘎浠诲姟-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
+ @ApiOperation("鍒嗛〉鏌ヨ娴嬭瘎浠诲姟")
+ @GetMapping("/list")
+ public AjaxResult list(Page<SafetyAssessmentTask> page, SafetyAssessmentTask query,
+ @RequestParam(value = "pageNum", required = false) Long pageNum,
+ @RequestParam(value = "pageSize", required = false) Long pageSize) {
+ return AjaxResult.success(taskService.queryPage(buildPage(page, pageNum, pageSize), query));
+ }
+
+ /**
+ * 寮�濮嬫祴璇勶紝鐢熸垚褰撳墠鍛樺伐涓庢祴璇勪换鍔＄殑鍏宠仈璁板綍銆�
+ */
+ @Log(title = "瀹夌幆绠＄悊-娴嬭瘎浠诲姟-寮�濮嬫祴璇�", businessType = BusinessType.INSERT)
+ @ApiOperation("寮�濮嬫祴璇�")
+ @PostMapping("/start")
+ public AjaxResult start(@RequestBody SafetyAssessmentTaskEmployee request) {
+ return toAjax(taskEmployeeService.start(request));
+ }
+
+ /**
+ * 鎻愪氦娴嬭瘎缁撴灉銆�
+ */
+ @Log(title = "瀹夌幆绠＄悊-娴嬭瘎浠诲姟-鎻愪氦娴嬭瘎", businessType = BusinessType.UPDATE)
+ @ApiOperation("鎻愪氦娴嬭瘎")
+ @PostMapping("/submit")
+ public AjaxResult submit(@RequestBody SafetyAssessmentTaskEmployee request) {
+ return toAjax(taskEmployeeService.submit(request));
+ }
+}
--
Gitblit v1.9.3