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/dto/SafeTrainingDto.java | 7 +++
src/main/java/com/ruoyi/safe/controller/SafeTrainingController.java | 14 +++++++
src/main/java/com/ruoyi/safe/mapper/SafeTrainingMapper.java | 2 +
src/main/java/com/ruoyi/safe/service/impl/SafeTrainingServiceImpl.java | 7 ++-
src/main/resources/mapper/safe/SafeTrainingMapper.xml | 33 +++++++++++++++-
5 files changed, 58 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/safe/controller/SafeTrainingController.java b/src/main/java/com/ruoyi/safe/controller/SafeTrainingController.java
index a1cd796..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,8 @@
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;
@@ -37,6 +39,7 @@
@GetMapping("/page")
@Operation(summary = "鍒嗛〉鏌ヨ")
public R page(Page page, SafeTrainingDto safeTrainingDto) {
+ safeTrainingDto.setCurrentUserId(SecurityUtils.getUserId());
return R.ok(safeTrainingService.pageSafeTraining(page, safeTrainingDto));
}
@@ -51,6 +54,17 @@
@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));
}
diff --git a/src/main/java/com/ruoyi/safe/dto/SafeTrainingDto.java b/src/main/java/com/ruoyi/safe/dto/SafeTrainingDto.java
index fc64f64..4a5875f 100644
--- a/src/main/java/com/ruoyi/safe/dto/SafeTrainingDto.java
+++ b/src/main/java/com/ruoyi/safe/dto/SafeTrainingDto.java
@@ -1,7 +1,6 @@
package com.ruoyi.safe.dto;
import com.ruoyi.safe.pojo.SafeTraining;
-import com.ruoyi.safe.pojo.SafeTrainingDetails;
import com.ruoyi.safe.pojo.SafeTrainingFile;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -17,6 +16,12 @@
@Schema(description = "璇勪环浜�")
private String assessmentUserName;
+ @Schema(description = "褰撳墠鐧诲綍鐢ㄦ埛id")
+ private Long currentUserId;
+
+ @Schema(description = "褰撳墠鐧诲綍鐢ㄦ埛鏄惁宸茬鍒�")
+ private Boolean signed;
+
@Schema(description = "闄勪欢闆嗗悎")
private List<SafeTrainingFile> safeTrainingFileList;
diff --git a/src/main/java/com/ruoyi/safe/mapper/SafeTrainingMapper.java b/src/main/java/com/ruoyi/safe/mapper/SafeTrainingMapper.java
index a1fe28d..b4c7d3e 100644
--- a/src/main/java/com/ruoyi/safe/mapper/SafeTrainingMapper.java
+++ b/src/main/java/com/ruoyi/safe/mapper/SafeTrainingMapper.java
@@ -19,6 +19,8 @@
@Mapper
public interface SafeTrainingMapper extends BaseMapper<SafeTraining> {
+ int refreshTrainingState();
+
IPage<SafeTrainingDto> pageSafeTraining(Page page, @Param("c") SafeTrainingDto safeTrainingDto);
SafeTrainingDto getSafeTraining(@Param("id") Long id);
diff --git a/src/main/java/com/ruoyi/safe/service/impl/SafeTrainingServiceImpl.java b/src/main/java/com/ruoyi/safe/service/impl/SafeTrainingServiceImpl.java
index ee9c814..0dd877f 100644
--- a/src/main/java/com/ruoyi/safe/service/impl/SafeTrainingServiceImpl.java
+++ b/src/main/java/com/ruoyi/safe/service/impl/SafeTrainingServiceImpl.java
@@ -51,6 +51,7 @@
@Override
public IPage<SafeTrainingDto> pageSafeTraining(Page page, SafeTrainingDto safeTrainingDto) {
+ safeTrainingMapper.refreshTrainingState();
return safeTrainingMapper.pageSafeTraining(page, safeTrainingDto);
}
@@ -84,10 +85,11 @@
String trainingDate = safeTraining.getTrainingDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
LocalDateTime openingTime = LocalDateTime.parse((trainingDate + safeTraining.getOpeningTime()), DateTimeFormatter.ofPattern("yyyy-MM-ddHH:mm:ss"));
LocalDateTime endTime = LocalDateTime.parse((trainingDate + safeTraining.getEndTime()), DateTimeFormatter.ofPattern("yyyy-MM-ddHH:mm:ss"));
- if (LocalDateTime.now().isBefore(openingTime)) {
+ LocalDateTime now = LocalDateTime.now();
+ if (now.isBefore(openingTime)) {
//鏈紑濮�
safeTraining.setState(0);
- } else if (LocalDateTime.now().isAfter(endTime)) {
+ } else if (!now.isBefore(endTime)) {
//宸茬粨鏉�
safeTraining.setState(2);
} else {
@@ -101,6 +103,7 @@
@Override
public SafeTrainingDto getSafeTraining(Long id) {
+ safeTrainingMapper.refreshTrainingState();
//涓昏〃鏁版嵁
SafeTrainingDto safeTrainingDto = safeTrainingMapper.getSafeTraining(id);
//闄勪欢
diff --git a/src/main/resources/mapper/safe/SafeTrainingMapper.xml b/src/main/resources/mapper/safe/SafeTrainingMapper.xml
index 30e7552..63b3b01 100644
--- a/src/main/resources/mapper/safe/SafeTrainingMapper.xml
+++ b/src/main/resources/mapper/safe/SafeTrainingMapper.xml
@@ -30,13 +30,42 @@
<result column="update_user" property="updateUser" />
<result column="tenant_id" property="tenantId" />
</resultMap>
+ <sql id="trainingStateExpression">
+ CASE
+ WHEN CURRENT_TIMESTAMP() < STR_TO_DATE(CONCAT(training_date, ' ', opening_time), '%Y-%m-%d %H:%i:%s') THEN 0
+ WHEN CURRENT_TIMESTAMP() >= STR_TO_DATE(CONCAT(training_date, ' ', end_time), '%Y-%m-%d %H:%i:%s') THEN 2
+ ELSE 1
+ END
+ </sql>
+ <update id="refreshTrainingState">
+ UPDATE safe_training
+ SET state = <include refid="trainingStateExpression"/>
+ WHERE training_date IS NOT NULL
+ AND opening_time IS NOT NULL
+ AND end_time IS NOT NULL
+ AND STR_TO_DATE(CONCAT(training_date, ' ', opening_time), '%Y-%m-%d %H:%i:%s') IS NOT NULL
+ AND STR_TO_DATE(CONCAT(training_date, ' ', end_time), '%Y-%m-%d %H:%i:%s') IS NOT NULL
+ AND (
+ state IS NULL
+ OR state != <include refid="trainingStateExpression"/>
+ )
+ </update>
<select id="pageSafeTraining" resultType="com.ruoyi.safe.dto.SafeTrainingDto">
SELECT
st.*,
su.nick_name AS assessmentUserName,
- COUNT(std.id) AS nums
+ EXISTS(
+ SELECT 1
+ FROM safe_training_details signed_std
+ WHERE signed_std.safe_training_id = st.id
+ AND signed_std.user_id = #{c.currentUserId}
+ ) AS signed,
+ (
+ SELECT COUNT(1)
+ FROM safe_training_details nums_std
+ WHERE nums_std.safe_training_id = st.id
+ ) AS nums
FROM safe_training st
- LEFT JOIN safe_training_details std ON std.safe_training_id = st.id
LEFT JOIN sys_user su ON st.assessment_user_id = su.user_id
WHERE st.state = #{c.state}
<if test="c.placeTraining != null and c.placeTraining != ''">
--
Gitblit v1.9.3