From e0b811f04d067692b6f8f1a026ea94417447c96f Mon Sep 17 00:00:00 2001 From: zhaokai Date: Mon, 9 Mar 2026 14:07:18 +0800 Subject: [PATCH] =?UTF-8?q?feat(study):=20=E6=B7=BB=E5=8A=A0=E5=AD=A6?= =?UTF-8?q?=E7=94=9F=E4=BF=A1=E6=81=AF=E4=B8=AD=E7=9A=84=E5=9F=B9=E8=AE=AD?= =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=92=8C=E8=80=83=E8=AF=95=E5=88=86=E6=95=B0?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../edu/dto/clientobject/study/StudentCO.java | 7 +++++++ .../persistence/dataobject/study/StudentDO.java | 8 ++++++++ .../resources/mapper/study/StudentMapper.xml | 16 +++++++++++++++- 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/web-client/src/main/java/com/zcloud/edu/dto/clientobject/study/StudentCO.java b/web-client/src/main/java/com/zcloud/edu/dto/clientobject/study/StudentCO.java index a8f2f1c..83c4cbc 100644 --- a/web-client/src/main/java/com/zcloud/edu/dto/clientobject/study/StudentCO.java +++ b/web-client/src/main/java/com/zcloud/edu/dto/clientobject/study/StudentCO.java @@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; import java.time.LocalDateTime; @@ -212,6 +213,12 @@ public class StudentCO extends ClientObject { @TableField(exist = false) private String sex; + @ApiModelProperty(value = "培训课程名字集合") + @TableField(exist = false) + private String curriculumNameList; + @ApiModelProperty(value = "考试分数") + @TableField(exist = false) + private BigDecimal examScore; //环境 @ApiModelProperty(value = "环境") diff --git a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/study/StudentDO.java b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/study/StudentDO.java index a1683fb..8fc785f 100644 --- a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/study/StudentDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/study/StudentDO.java @@ -7,6 +7,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import java.math.BigDecimal; + /** * web-infrastructure * @@ -205,6 +207,12 @@ public class StudentDO extends BaseDO { @ApiModelProperty(value = "性别") @TableField(exist = false) private String sex; + @ApiModelProperty(value = "培训课程名字集合") + @TableField(exist = false) + private String curriculumNameList; + @ApiModelProperty(value = "考试分数") + @TableField(exist = false) + private BigDecimal examScore; } diff --git a/web-infrastructure/src/main/resources/mapper/study/StudentMapper.xml b/web-infrastructure/src/main/resources/mapper/study/StudentMapper.xml index e167af2..e271773 100644 --- a/web-infrastructure/src/main/resources/mapper/study/StudentMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/study/StudentMapper.xml @@ -371,10 +371,24 @@ (YEAR(NOW()) - SUBSTRING(FROM_BASE64(s.user_id_card), 7, 4)) ELSE NULL END AS age, - cast(substring(FROM_BASE64(s.user_id_card), 7, 8) AS DATE) AS birthday + cast(substring(FROM_BASE64(s.user_id_card), 7, 8) AS DATE) AS birthday, + c.name as class_name, + c.start_time, + c.end_time, + c.valid_start_time, + c.valid_end_time, + c.teacher_name, + c.train_type, + c.train_type_name, + c.training_location, + GROUP_CONCAT(DISTINCT cc.curriculum_name) AS curriculumNameList, + ser.exam_score from student s left join user u on u.phone = s.phone + left join class c on c.class_id = s.class_id + left join class_curriculum cc on cc.class_id = c.class_id + left join student_exam_record ser on ser.student_id = s.student_id and ser.class_id = c.class_id s.student_id = #{studentId}