From a8d571b2c1b4881bff496f14e9d07ad1dc556f90 Mon Sep 17 00:00:00 2001 From: liujie <1793218484@qq.com> Date: 星期五, 05 九月 2025 11:12:01 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/DolphinEnglish --- ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyInductionResultVO.java | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyInductionResultVO.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyInductionResultVO.java index faefba8..cc713b9 100644 --- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyInductionResultVO.java +++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyInductionResultVO.java @@ -1,12 +1,13 @@ package com.ruoyi.study.vo; -import com.ruoyi.study.domain.TStudyInduction; import com.ruoyi.study.domain.TSubject; +import com.ruoyi.study.domain.TSubjectRecordDetail; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.math.BigDecimal; import java.util.List; /** @@ -23,9 +24,18 @@ * 自主学习题目信息 */ @ApiModelProperty("自主学习题目信息") - private TStudyInduction data; - - public StudyInductionResultVO(TStudyInduction data, List<TSubject> subjectList) { + private LearnStudyVO data; + /** + * 2.0新增答题记录 + */ + @ApiModelProperty("2.0新增答题记录") + private List<TSubjectRecordDetail> list; + /** + * 正确率 + */ + @ApiModelProperty("正确率") + private BigDecimal accuracy; + public StudyInductionResultVO(LearnStudyVO data, List<List<TSubject>> subjectList) { this.data = data; super.setSubjectList(subjectList); } -- Gitblit v1.7.1