From 47a0514b07b4be5acc78029ebd4fff91f75e6349 Mon Sep 17 00:00:00 2001
From: zhanglei <xx@cenxi.online>
Date: Mon, 24 Aug 2026 18:30:08 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=95=99=E5=9F=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/qinan/cedu/model/dto/ClassManagementDTO.java | 3 ++-
 .../org/qinan/cedu/model/entity/ClassManagementDO.java    | 1 +
 .../java/org/qinan/cedu/model/vo/ClassManagementVO.java   | 2 ++
 .../cedu/service/impl/ClassManagementServiceImpl.java     | 8 +++++---
 .../cedu/service/impl/CourseManagementServiceImpl.java    | 2 +-
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/ClassManagementDTO.java b/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/ClassManagementDTO.java
index b3617d02..62a5c974 100644
--- a/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/ClassManagementDTO.java
+++ b/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/ClassManagementDTO.java
@@ -2,7 +2,6 @@ package org.qinan.cedu.model.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.qinan.cedu.config.FlexibleLocalDateTimeDeserializer;
@@ -34,6 +33,8 @@ public class ClassManagementDTO {
 
     @ApiModelProperty("参训单位名称")
     private String unitName;
+    @ApiModelProperty("参训单位Id")
+    private String unitId;
 
     @ApiModelProperty("记录人员")
     private String recorder;
diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/ClassManagementDO.java b/safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/ClassManagementDO.java
index 06747e90..00f03124 100644
--- a/safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/ClassManagementDO.java
+++ b/safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/ClassManagementDO.java
@@ -95,4 +95,5 @@ public class ClassManagementDO extends BaseEntity {
      */
     @TableField("paper_id")
     private Long paperId;
+    private String unitId;
 }
diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/ClassManagementVO.java b/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/ClassManagementVO.java
index 4e82978c..798d50e2 100644
--- a/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/ClassManagementVO.java
+++ b/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/ClassManagementVO.java
@@ -30,6 +30,8 @@ public class ClassManagementVO extends BaseVO {
 
     @ApiModelProperty("参训单位名称")
     private String unitName;
+    @ApiModelProperty("参训单位Id")
+    private String unitId;
 
     @ApiModelProperty("记录人员")
     private String recorder;
diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/ClassManagementServiceImpl.java b/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/ClassManagementServiceImpl.java
index 648cee30..cc6a5ecb 100644
--- a/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/ClassManagementServiceImpl.java
+++ b/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/ClassManagementServiceImpl.java
@@ -113,6 +113,7 @@ public class ClassManagementServiceImpl extends ServiceImpl<ClassManagementMappe
         if (entity.getShuffleQuestions() == null) {
             entity.setShuffleQuestions(0);
         }
+        entity.setClassCode("C" + entity.getId());
         this.save(entity);
         return entity.getId();
     }
@@ -131,11 +132,12 @@ public class ClassManagementServiceImpl extends ServiceImpl<ClassManagementMappe
 
     @Override
     public Boolean complete(ClassManagementDTO dto) {
-        LocalDate start = dto.getStartDate().toLocalDate();
-        LocalDate end = dto.getDelayTime().toLocalDate();
+        ClassManagementDO classManagementDO = baseMapper.selectById(dto.getId());
+        LocalDate start = classManagementDO.getStartDate().toLocalDate();
+        LocalDate end = classManagementDO.getDelayTime().toLocalDate();
         ;
         if (Objects.isNull(end)) {
-            end = dto.getEndDate().toLocalDate();
+            end = classManagementDO.getEndDate().toLocalDate();
         }
         LocalDate now = LocalDate.now();
         ClassStatusEnum pendingStart;
diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/CourseManagementServiceImpl.java b/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/CourseManagementServiceImpl.java
index 200a8d4e..95bc1eab 100644
--- a/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/CourseManagementServiceImpl.java
+++ b/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/CourseManagementServiceImpl.java
@@ -61,7 +61,7 @@ public class CourseManagementServiceImpl extends ServiceImpl<CourseManagementMap
                 .page(new Page<>(query.getCurrent(), query.getSize()));
         IPage<CourseManagementVO> convert = page.convert(courseManagementConvertor::convertEToVo);
         Map<Long, Integer> collectMap = classCourseMapper.selectList(new LambdaQueryWrapper<ClassCourseDO>()
-                        .in(ClassCourseDO::getCourseId, convert.getRecords().stream().map(CourseManagementVO::getId)))
+                        .in(ClassCourseDO::getCourseId, convert.getRecords().stream().map(CourseManagementVO::getId).collect(Collectors.toList())))
                 .stream().map(ClassCourseDO::getCourseId).distinct().collect(Collectors.toMap(v -> v, v -> 1));
         convert.getRecords().forEach(vo -> {
             vo.setCourseRelCoursewareVOList(courseRelCoursewareConvertor.convertEListToVoList(