fix 答疑

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

@@ -280,6 +280,8 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                                     classPeriodSectionVo.setPeriodId(userPeriodStatusVo.getPeriodId());
                                     classPeriodSectionVo.setPeriodStatusId(userPeriodStatusVo.getId());
                                     classPeriodSectionVo.setAuditTime(userPeriodStatusVo.getAuditTime());
+                                    classPeriodSectionVo.setAuditUserName(userPeriodStatusVo.getAuditUserName());
+                                    classPeriodSectionVo.setDurationTime(userPeriodStatusVo.getDurationTime());
                                 }
                                 classPeriodSectionVo.setModuleId(classPeriodVo.getId());
                                 classPeriodSectionVo.setChapterId(classPeriodChapterVo.getId());
@@ -309,6 +311,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                                     classPeriodSectionVo.setPeriodStatus(userPeriodStatusVo.getPeriodStatus());
                                     classPeriodSectionVo.setPeriodId(userPeriodStatusVo.getPeriodId());
                                     classPeriodSectionVo.setAuditTime(userPeriodStatusVo.getAuditTime());
+                                    classPeriodSectionVo.setAuditUserName(userPeriodStatusVo.getAuditUserName());
                                     classPeriodSectionVo.setPeriodStatusId(userPeriodStatusVo.getId());
                                     classPeriodChapterVo.setPerformance(Convert.toBigDecimal(userPeriodStatusVo.getPerformance()));
                                 }
@@ -352,6 +355,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                         classPeriodSectionVo.setPeriodId(userPeriodStatusVo.getPeriodId());
                         classPeriodSectionVo.setPeriodStatusId(userPeriodStatusVo.getId());
                         classPeriodSectionVo.setAuditTime(userPeriodStatusVo.getAuditTime());
+                        classPeriodSectionVo.setDurationTime(userPeriodStatusVo.getDurationTime());
                     }
                     classPeriodSectionVo.setModuleId(0L);
                     classPeriodSectionVo.setChapterId(classPeriodVo.getId());
@@ -384,6 +388,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                         classPeriodSectionVo.setPeriodId(userPeriodStatusVo.getPeriodId());
                         classPeriodSectionVo.setPeriodStatusId(userPeriodStatusVo.getId());
                         classPeriodSectionVo.setAuditTime(userPeriodStatusVo.getAuditTime());
+                        classPeriodSectionVo.setAuditUserName(userPeriodStatusVo.getAuditUserName());
                         classPeriodVo.setPerformance(Convert.toBigDecimal(userPeriodStatusVo.getPerformance()));
                     }
                     classPeriodSectionVo.setModuleId(0L);
@@ -421,6 +426,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                     classPeriodVo.setPeriodId(userPeriodStatusVo.getPeriodId());
                     classPeriodVo.setPeriodStatusId(userPeriodStatusVo.getId());
                     classPeriodVo.setAuditTime(userPeriodStatusVo.getAuditTime());
+                    classPeriodVo.setAuditUserName(userPeriodStatusVo.getAuditUserName());
                 }
                 classPeriodVo.setModuleId(0L);
                 classPeriodVo.setChapterId(0L);

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

@@ -86,6 +86,8 @@ public class ClassPeriodSectionVo {
 	@ApiModelProperty("审核时间")
 	private Long auditTime;
 
+	@ApiModelProperty("审核人")
+	private String auditUserName;
 
 	/** 1模块 2章 3节 4卷 */
 	@Excel(name = "1模块 2章 3节 4卷")
@@ -138,5 +140,9 @@ public class ClassPeriodSectionVo {
 	@ApiModelProperty("以往审核记录")
 	private List<UserPeriodStatusVo> userPeriodStatusVos;
 
+	/** 节时长(分钟) */
+	@Excel(name = "节时长(分钟)")
+	@ApiModelProperty("节时长(分钟)")
+	private Long durationTime;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassPeriodVo.java

@@ -93,6 +93,15 @@ public class ClassPeriodVo {
 	@ApiModelProperty("审核时间")
 	private Long auditTime;
 
+
+	@ApiModelProperty("审核人")
+	private String auditUserName;
+
+	/** 节时长(分钟) */
+	@Excel(name = "节时长(分钟)")
+	@ApiModelProperty("节时长(分钟)")
+	private Long durationTime;
+
 	/** 当前节状态 1 当前状态 0过往状态 */
 	/** 审核时间 */
 	@Excel(name = "当前节状态 1 当前状态 0过往状态")

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/UserPeriodStatusVo.java

@@ -90,4 +90,7 @@ public class UserPeriodStatusVo {
 	@Excel(name = "审核照片")
 	@ApiModelProperty("审核照片")
 	private List<UserStudyRecordPhotoVo> userStudyRecordPhotoList;
+
+	@ApiModelProperty("节时长(分钟)")
+	private Long durationTime;
 }

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeUserMapper.xml

@@ -104,6 +104,7 @@
         <result property="type" column="type"/>
         <result property="courseId" column="course_id"/>
         <result property="studyEndTime" column="study_end_time"/>
+        <result property="durationTime" column="duration_time"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.grade.vo.ClassPeriodChapterVo" id="ClassPeriodChapterVo">
@@ -366,11 +367,13 @@
             and u.user_id = #{userId}
         </if>
         ) as user_id,
-        (SELECT cs.`name` FROM course_section cs where cm.menu_id = cs.section_id) as type_name,
+        cs.`name` as type_name,
+        cs.duration_time,
         null as class_hours,
         3 as type
         FROM
         course_menu cm
+        LEFT JOIN course_section cs on cm.menu_id = cs.section_id
         LEFT JOIN goods_course gc on gc.course_id = cm.course_id
         where 1=1
         <if test="goodsId != null and goodsId !='' ">

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

@@ -31,6 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="realName" column="realname"/>
         <result property="performance" column="performance"/>
         <result property="auditUserName" column="audit_user_name"/>
+        <result property="durationTime" column="duration_time"/>
     </resultMap>
 
     <select id="selectPeriodStatus" parameterType="com.zhongzheng.modules.grade.bo.UserPeriodQueryBo" resultMap="UserPeriodStatusVo">
@@ -41,7 +42,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             (SELECT exam_name FROM exam e where e.exam_id= up.exam_id) as type_name
         </if>
         <if test="sectionId != null ">
-            (SELECT name FROM course_section cs where up.section_id= cs.section_id)  as type_name
+            (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