From eecf88b84cbc8813cdc7a8b4a441b482c0eec320 Mon Sep 17 00:00:00 2001
From: wuchunlei <mailcauchy@gmail.com>
Date: Fri, 23 May 2025 14:48:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AF=E5=B0=8F=E7=8F=AD?=
 =?UTF-8?q?=E8=80=83=E8=AF=95=E5=91=A8=E6=97=B6=E9=97=B4=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/peanut/modules/common/entity/ClassEntity.java   | 4 ++++
 .../peanut/modules/common/entity/UserCertificateLabel.java   | 2 ++
 .../modules/common/service/impl/ClassEntityServiceImpl.java  | 5 ++++-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/peanut/modules/common/entity/ClassEntity.java b/src/main/java/com/peanut/modules/common/entity/ClassEntity.java
index 2911e404..8af66045 100644
--- a/src/main/java/com/peanut/modules/common/entity/ClassEntity.java
+++ b/src/main/java/com/peanut/modules/common/entity/ClassEntity.java
@@ -49,6 +49,10 @@ public class ClassEntity {
     private ClassModel classModel;
     @TableField(exist = false)
     private List<Map<String,Object>> classUsers;
+    @TableField(exist = false)
+    private Date examStartTime;
+    @TableField(exist = false)
+    private Date examEndTime;
 
 
 }
diff --git a/src/main/java/com/peanut/modules/common/entity/UserCertificateLabel.java b/src/main/java/com/peanut/modules/common/entity/UserCertificateLabel.java
index d8c596a0..b44eed80 100644
--- a/src/main/java/com/peanut/modules/common/entity/UserCertificateLabel.java
+++ b/src/main/java/com/peanut/modules/common/entity/UserCertificateLabel.java
@@ -27,5 +27,7 @@ public class UserCertificateLabel {
 
     @TableField(exist = false)
     private List<UserCertificateLabel> children;
+    @TableField(exist = false)
+    private List<UserCertificate> userCertificates;
 
 }
diff --git a/src/main/java/com/peanut/modules/common/service/impl/ClassEntityServiceImpl.java b/src/main/java/com/peanut/modules/common/service/impl/ClassEntityServiceImpl.java
index 1610fdd2..e53f2aa0 100644
--- a/src/main/java/com/peanut/modules/common/service/impl/ClassEntityServiceImpl.java
+++ b/src/main/java/com/peanut/modules/common/service/impl/ClassEntityServiceImpl.java
@@ -215,7 +215,10 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
             }else {
                 classEntity.setCreateUser(user);
             }
-            classEntity.setClassModel(classModelDao.selectById(classEntity.getModelId()));
+            ClassModel classModel = classModelDao.selectById(classEntity.getModelId());
+            classEntity.setClassModel(classModel);
+            classEntity.setExamStartTime(classEntity.getStartTime()==null?null:DateUtils.addDateDays(classEntity.getStartTime(),classModel.getDays()));
+            classEntity.setExamEndTime(classEntity.getStartTime()==null?null:DateUtils.addDateDays(classEntity.getStartTime(),classModel.getDays()+classModel.getExamDays()));
             MPJLambdaWrapper<ClassUser> userWrapper = new MPJLambdaWrapper<>();
             userWrapper.leftJoin(MyUserEntity.class,MyUserEntity::getId,ClassUser::getUserId);
             userWrapper.select("t.role,t.user_id as userId,t1.tel,t1.name,t1.nickname");