From 11f1dd9e4729bec36c49c0c72c96efa9a2998003 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 02 二月 2026 13:19:11 +0800
Subject: [PATCH] 新增不同日期时间段的培训课程编号都是同一编号

---
 src/main/java/com/ruoyi/safe/service/impl/SafeTrainingServiceImpl.java |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

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 0179898..05f1ae7 100644
--- a/src/main/java/com/ruoyi/safe/service/impl/SafeTrainingServiceImpl.java
+++ b/src/main/java/com/ruoyi/safe/service/impl/SafeTrainingServiceImpl.java
@@ -67,7 +67,7 @@
     @Override
     public int addOrUpdate(SafeTraining safeTraining) {
         if (ObjectUtils.isNull(safeTraining.getId())) {
-            String datePrefix = LocalDate.now().format(DateTimeFormatter.ofPattern("yyMMdd"));
+            String datePrefix ="KC-"+ LocalDate.now().format(DateTimeFormatter.ofPattern("yyMMdd"));
             // 鏌ヨ浠婃棩宸插瓨鍦ㄧ殑鏈�澶ц绋嬬紪鍙�
             QueryWrapper<SafeTraining> queryWrapper = new QueryWrapper<>();
             queryWrapper.likeRight("course_code", datePrefix)
@@ -87,7 +87,7 @@
                 }
             }
             // 鐢熸垚瀹屾暣鐨勮绋嬬紪鍙�
-            String no = "KC-" + String.format("%s%03d", datePrefix, sequenceNumber);
+            String no = String.format("%s%03d", datePrefix, sequenceNumber);
             safeTraining.setCourseCode(no);
         }
         //鏍规嵁鏃堕棿鍒ゆ柇鍩硅鐘舵��
@@ -115,10 +115,14 @@
         SafeTrainingDto safeTrainingDto = safeTrainingMapper.getSafeTraining(id);
         //闄勪欢
         List<SafeTrainingFile> safeTrainingFiles = safeTrainingFileMapper.selectList(Wrappers.<SafeTrainingFile>lambdaQuery().eq(SafeTrainingFile::getSafeTrainingId, id));
-        safeTrainingDto.setSafeTrainingFileList(safeTrainingFiles);
+        if (safeTrainingFiles.size()>0){
+            safeTrainingDto.setSafeTrainingFileList(safeTrainingFiles);
+        }
         //鍩硅璁板綍璇︽儏
         List<SafeTrainingDetailsDto> safeTrainingDetailsDto = safeTrainingDetailsMapper.getSafeTraining(id);
-        safeTrainingDto.setSafeTrainingDetailsDtoList(safeTrainingDetailsDto);
+        if (safeTrainingDetailsDto.size()>0) {
+            safeTrainingDto.setSafeTrainingDetailsDtoList(safeTrainingDetailsDto);
+        }
         return safeTrainingDto;
     }
 

--
Gitblit v1.9.3