From cecd7580b5e629173bdb5b258f2676d16d580f72 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 30 七月 2026 15:49:55 +0800
Subject: [PATCH] fix: 安全培训考核签到修改
---
src/main/java/com/ruoyi/safe/controller/SafeTrainingController.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/safe/controller/SafeTrainingController.java b/src/main/java/com/ruoyi/safe/controller/SafeTrainingController.java
index ae8fafa..6251128 100644
--- a/src/main/java/com/ruoyi/safe/controller/SafeTrainingController.java
+++ b/src/main/java/com/ruoyi/safe/controller/SafeTrainingController.java
@@ -1,6 +1,10 @@
package com.ruoyi.safe.controller;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.safe.dto.SafeTrainingDto;
import com.ruoyi.safe.pojo.SafeTraining;
@@ -29,24 +33,38 @@
@RequiredArgsConstructor
public class SafeTrainingController {
- private SafeTrainingService safeTrainingService;
- private SafeTrainingDetailsService safeTrainingDetailsService;
+ private final SafeTrainingService safeTrainingService;
+ private final SafeTrainingDetailsService safeTrainingDetailsService;
@GetMapping("/page")
@Operation(summary = "鍒嗛〉鏌ヨ")
public R page(Page page, SafeTrainingDto safeTrainingDto) {
+ safeTrainingDto.setCurrentUserId(SecurityUtils.getUserId());
return R.ok(safeTrainingService.pageSafeTraining(page, safeTrainingDto));
}
@Operation(summary = "鏂板/缂栬緫瀹夊叏鍩硅鑰冩牳")
+ @Log(title = "瀹夊叏鍩硅", businessType = BusinessType.INSERT)
@PostMapping()
public R addOrUpdate(@RequestBody SafeTraining safeTraining) {
return R.ok(safeTrainingService.addOrUpdate(safeTraining));
}
@Operation(summary = "绛惧埌")
+ @Log(title = "瀹夊叏鍩硅", businessType = BusinessType.INSERT)
@PostMapping ("/sign")
public R sign(@RequestBody SafeTrainingDetails safeTrainingDetails) {
+ if (safeTrainingDetails.getSafeTrainingId() == null || safeTrainingDetails.getUserId() == null) {
+ return R.fail("绛惧埌淇℃伅涓嶅畬鏁�");
+ }
+ long count = safeTrainingDetailsService.count(
+ Wrappers.<SafeTrainingDetails>lambdaQuery()
+ .eq(SafeTrainingDetails::getSafeTrainingId, safeTrainingDetails.getSafeTrainingId())
+ .eq(SafeTrainingDetails::getUserId, safeTrainingDetails.getUserId())
+ );
+ if (count > 0) {
+ return R.fail("宸茬鍒帮紝璇峰嬁閲嶅绛惧埌");
+ }
return R.ok(safeTrainingDetailsService.save(safeTrainingDetails));
}
@@ -57,18 +75,21 @@
}
@Operation(summary = "缁撴灉鏄庣粏淇濆瓨")
+ @Log(title = "瀹夊叏鍩硅", businessType = BusinessType.UPDATE)
@PostMapping ("/saveSafeTraining")
public R saveSafeTraining(@RequestBody SafeTrainingDto safeTrainingDto) {
return R.ok(safeTrainingService.saveSafeTraining(safeTrainingDto));
}
@Operation(summary = "鍒犻櫎瀹夊叏鍩硅鑰冩牳")
+ @Log(title = "瀹夊叏鍩硅", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R delSafeTraining(@RequestBody List<Integer> ids) {
return R.ok(safeTrainingService.delSafeTraining(ids));
}
@Operation(summary = "瀵煎嚭")
+ @Log(title = "瀹夊叏鍩硅", businessType = BusinessType.EXPORT)
@PostMapping ("/export")
public void export(HttpServletResponse response, @RequestBody SafeTraining safeTraining) {
safeTrainingService.export(response,safeTraining.getId());
--
Gitblit v1.9.3