he2802 пре 2 година
родитељ
комит
4026897a7c

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

@@ -1689,7 +1689,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                                     classPeriodSectionVo.setAuditTime(userPeriodStatusVo.getAuditTime());
                                     classPeriodSectionVo.setAuditUserName(userPeriodStatusVo.getAuditUserName());
                                     classPeriodSectionVo.setPeriodStatusId(userPeriodStatusVo.getId());
-                                    classPeriodChapterVo.setPerformance(Convert.toBigDecimal(userPeriodStatusVo.getPerformance()));
+                                    classPeriodSectionVo.setPerformance(Convert.toBigDecimal(userPeriodStatusVo.getPerformance()));
                                 }
                                 classPeriodSectionVo.setModuleId(classPeriodVo.getId());
                                 classPeriodSectionVo.setChapterId(classPeriodChapterVo.getId());
@@ -1797,6 +1797,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                         classPeriodSectionVo.setPeriodStatusId(userPeriodStatusVo.getId());
                         classPeriodSectionVo.setAuditTime(userPeriodStatusVo.getAuditTime());
                         classPeriodSectionVo.setAuditUserName(userPeriodStatusVo.getAuditUserName());
+                        classPeriodSectionVo.setPerformance(Convert.toBigDecimal(userPeriodStatusVo.getPerformance()));
                         classPeriodVo.setPerformance(Convert.toBigDecimal(userPeriodStatusVo.getPerformance()));
                     }
                     classPeriodSectionVo.setModuleId(0L);

+ 4 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassPeriodSectionVo.java

@@ -167,7 +167,10 @@ public class ClassPeriodSectionVo implements Comparable<ClassPeriodSectionVo> {
 	private Integer sectionType;
 	@ApiModelProperty("录播地址")
 	private String recordingUrl;
-
+	/** 分数 */
+	@Excel(name = "分数")
+	@ApiModelProperty("分数")
+	private BigDecimal performance;
 	@Override
 	public int compareTo(ClassPeriodSectionVo o) {
 		return this.getSort() - o.getSort();

+ 0 - 1
zhongzheng-system/src/main/resources/mapper/modules/grade/UserPeriodStatusMapper.xml

@@ -48,7 +48,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ,(SELECT name FROM course_section cs where up.section_id= cs.section_id)  as type_name,
             (SELECT duration_time FROM course_section cs where up.section_id= cs.section_id)  as duration_time
         </if>
-
         FROM
         user_period_status ups
         LEFT JOIN user_period up ON up.id = ups.period_id