he2802 před 4 roky
rodič
revize
03ae33cf95

+ 1 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeServiceImpl.java

@@ -335,6 +335,7 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
             SubjectStudyRecordQueryBo subjectStudyRecordQueryBo = new SubjectStudyRecordQueryBo();
             subjectStudyRecordQueryBo.setGoodsId(classGradeStudentVo.getGoodsId());
             subjectStudyRecordQueryBo.setUserId(classGradeStudentVo.getUserId());
+            subjectStudyRecordQueryBo.setGradeId(bo.getGradeId());
             List<SubjectStudyRecordVo> subjectStudyRecordVos = iUserStudyRecordService.listSubject(subjectStudyRecordQueryBo);
             for (SubjectStudyRecordVo subjectStudyRecordVo : subjectStudyRecordVos) {
                 secLong = new BigDecimal(secLong.toString()).add(new BigDecimal(subjectStudyRecordVo.getSectionNum().toString())).longValue();

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeUserServiceImpl.java

@@ -148,7 +148,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
 
             SubjectStudyRecordQueryBo subjectStudyRecordQueryBo = new SubjectStudyRecordQueryBo();
             subjectStudyRecordQueryBo.setGoodsId(classPeriodStudentVo.getGoodsId());
-            subjectStudyRecordQueryBo.setUserId(bo.getUserId());
+            subjectStudyRecordQueryBo.setUserId(classPeriodStudentVo.getUserId());
             subjectStudyRecordQueryBo.setGradeId(bo.getGradeId());
             List<SubjectStudyRecordVo> subjectStudyRecordVos = iUserStudyRecordService.listSubject(subjectStudyRecordQueryBo);
             for (SubjectStudyRecordVo subjectStudyRecordVo : subjectStudyRecordVos) {

+ 4 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserNoteVo.java

@@ -75,5 +75,9 @@ public class UserNoteVo {
 	@ApiModelProperty("创建时间")
 	private Long createTime;
 
+	/** 创建时间 */
+	@ApiModelProperty("地址")
+	private String recordingUrl;
+
 
 }

+ 3 - 1
zhongzheng-system/src/main/resources/mapper/modules/user/UserNoteMapper.xml

@@ -30,6 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="chapterId" column="chapter_id"/>
         <result property="gradeId" column="grade_id"/>
         <result property="sectionName" column="section_name"/>
+        <result property="recordingUrl" column="recording_url"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.user.vo.UserDateNoteVo" id="UserDateNoteVo">
@@ -70,7 +71,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="listDateSon" parameterType="com.zhongzheng.modules.user.bo.UserNoteQueryBo" resultMap="UserNoteVo">
         SELECT
             un.*,
-               (SELECT cs.`name` FROM course_section cs where cs.section_id = un.section_id) as section_name
+               (SELECT cs.`name` FROM course_section cs where cs.section_id = un.section_id) as section_name,
+        (SELECT cs.recording_url FROM course_section cs where cs.section_id = un.section_id) as recording_url
         FROM
         user_note un
         WHERE 1=1