fix 重修

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CoursePhotoLogAddBo.java

@@ -63,4 +63,7 @@ public class CoursePhotoLogAddBo {
     /** 拍照时间间隔 */
     @ApiModelProperty("拍照时间间隔")
     private String timeInterval;
+    /** 课程ID */
+    @ApiModelProperty("课程ID")
+    private Long courseId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CoursePhotoLogEditBo.java

@@ -70,4 +70,7 @@ public class CoursePhotoLogEditBo {
     /** 拍照时间间隔 */
     @ApiModelProperty("拍照时间间隔")
     private String timeInterval;
+    /** 课程ID */
+    @ApiModelProperty("课程ID")
+    private Long courseId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CoursePhotoLogQueryBo.java

@@ -59,4 +59,7 @@ public class CoursePhotoLogQueryBo extends BaseEntity {
 	private Long moduleId;
 	private Long chapterId;
 	private Integer currentStatus;
+	/** 课程ID */
+	@ApiModelProperty("课程ID")
+	private Long courseId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CoursePhotoLog.java

@@ -58,4 +58,6 @@ private static final long serialVersionUID=1L;
     private Integer currentStatus;
     /** 拍照时间间隔 */
     private String timeInterval;
+    /** 课程ID */
+    private Long courseId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/mapper/CourseMenuMapper.java

@@ -21,11 +21,11 @@ public interface CourseMenuMapper extends BaseMapper<CourseMenu> {
 
     List<CourseUserMenuVo> menuList(CourseMenuQueryBo bo);
 
-    Integer rebuildCheck(@Param("sectionId") Long id,@Param("gradeId") Long gradeId,@Param("userId")Long userId);
+    Integer rebuildCheck(@Param("sectionId") Long id,@Param("gradeId") Long gradeId,@Param("userId")Long userId,@Param("courseId")Long courseId);
 
-    Integer rebuildChapterCheck(@Param("chapterId")Long id,@Param("gradeId") Long gradeId,@Param("userId") Long userId);
+    Integer rebuildChapterCheck(@Param("chapterId")Long id,@Param("gradeId") Long gradeId,@Param("userId") Long userId,@Param("courseId")Long courseId);
 
-    Integer rebuildModuleCheck(@Param("moduleId")Long id,@Param("gradeId") Long gradeId,@Param("userId") Long userId);
+    Integer rebuildModuleCheck(@Param("moduleId")Long id,@Param("gradeId") Long gradeId,@Param("userId") Long userId,@Param("courseId")Long courseId);
 
     Integer learningCheck(@Param("sectionId") Long id,@Param("gradeId") Long gradeId,@Param("userId")Long userId,@Param("courseId")Long courseId);
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseMenuServiceImpl.java

@@ -175,7 +175,7 @@ public class CourseMenuServiceImpl extends ServiceImpl<CourseMenuMapper, CourseM
             for (CourseUserMenuVo courseMenuVo : courseMenuVos) {
                 //为节的时候查询重修情况，和是否已学习
                 if (courseMenuVo.getType().equals(3)) {
-                    Integer rebuild = baseMapper.rebuildCheck(courseMenuVo.getMenuId(), courseMenuVo.getGradeId(), bo.getUserId());
+                    Integer rebuild = baseMapper.rebuildCheck(courseMenuVo.getMenuId(), courseMenuVo.getGradeId(), bo.getUserId(),bo.getCourseId());
                     if (rebuild > 0) {
                         courseMenuVo.setRebuild(1);
                     }
@@ -190,14 +190,14 @@ public class CourseMenuServiceImpl extends ServiceImpl<CourseMenuMapper, CourseM
                 }
                 //为章的时候查询重修情况
                 if (courseMenuVo.getType().equals(2)){
-                    Integer rebuild = baseMapper.rebuildChapterCheck(courseMenuVo.getMenuId(), courseMenuVo.getGradeId(), bo.getUserId());
+                    Integer rebuild = baseMapper.rebuildChapterCheck(courseMenuVo.getMenuId(), courseMenuVo.getGradeId(), bo.getUserId(),bo.getCourseId());
                     if (rebuild > 0) {
                         courseMenuVo.setRebuild(1);
                     }
                 }
                 //为模块的时候查询重修情况
                 if (courseMenuVo.getType().equals(1)){
-                    Integer rebuild = baseMapper.rebuildModuleCheck(courseMenuVo.getMenuId(), courseMenuVo.getGradeId(), bo.getUserId());
+                    Integer rebuild = baseMapper.rebuildModuleCheck(courseMenuVo.getMenuId(), courseMenuVo.getGradeId(), bo.getUserId(),bo.getCourseId());
                     if (rebuild > 0) {
                         courseMenuVo.setRebuild(1);
                     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseServiceImpl.java

@@ -33,6 +33,7 @@ import com.zhongzheng.modules.goods.vo.GoodsVo;
 import com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo;
 import com.zhongzheng.modules.grade.bo.UserPeriodStatusAddBo;
 import com.zhongzheng.modules.grade.domain.UserPeriodStatus;
+import com.zhongzheng.modules.grade.service.IClassGradeUserService;
 import com.zhongzheng.modules.grade.service.IUserPeriodService;
 import com.zhongzheng.modules.grade.service.IUserPeriodStatusService;
 import com.zhongzheng.modules.grade.vo.ClassGradeVo;
@@ -94,6 +95,9 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
     @Autowired
     private IUserBankRecordService iUserBankRecordService;
 
+    @Autowired
+    private IClassGradeUserService iClassGradeUserService;
+
 
 
     @Override
@@ -276,6 +280,9 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean editRebuild(ClassGradeUserQueryBo bo) {
+        if(Validator.isEmpty(bo.getGradeId())||Validator.isEmpty(bo.getUserId())){
+            throw new CustomException("参数错误");
+        }
         //将该班级下的学员作弊的节改成待重修
         List<GoodsPeriodStatusVo> goodsPeriodStatusVos = baseMapper.listSection(bo);
         for (GoodsPeriodStatusVo goodsPeriodStatusVo : goodsPeriodStatusVos) {
@@ -325,6 +332,8 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
             objectLambdaUpdateWrapper2.set(UserBankRecord::getCurrentStatus,0); //做卷记录改为历史状态
             iUserBankRecordService.update(null, objectLambdaUpdateWrapper2);
         }
+        //更新班级学时状态
+        iClassGradeUserService.updateUserPeriodStatus(bo);
         return true;
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CoursePhotoLogVo.java

@@ -76,4 +76,8 @@ public class CoursePhotoLogVo {
 	@Excel(name = "拍照时间间隔")
 	@ApiModelProperty("拍照时间间隔")
 	private String timeInterval;
+	/** 课程ID */
+	@Excel(name = "课程ID")
+	@ApiModelProperty("课程ID")
+	private Long courseId;
 }

zhongzheng-system/src/main/resources/mapper/modules/course/CourseMenuMapper.xml

@@ -157,6 +157,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           AND up.user_id = #{userId}
           AND up.module_id= 0
           and up.chapter_id=0
+          and up.course_id=#{courseId}
           and up.section_id=#{sectionId}
           AND ups.period_status =1
           and (ups.`status` = 0 or ups.`status` = 3)
@@ -188,6 +189,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             up.grade_id =#{gradeId}
           AND up.user_id = #{userId}
           AND up.module_id= 0
+          and up.course_id=#{courseId}
           and up.chapter_id=#{chapterId}
           AND ups.period_status =1
           and (ups.`status` = 0 or ups.`status` = 3)
@@ -203,6 +205,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             up.grade_id =#{gradeId}
           AND up.user_id = #{userId}
           AND up.module_id= #{moduleId}
+          AND up.course_id=#{courseId}
           AND ups.period_status =1
           and (ups.`status` = 0 or ups.`status` = 3)
     </select>

zhongzheng-system/src/main/resources/mapper/modules/course/CoursePhotoLogMapper.xml

@@ -21,6 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="chapterId" column="chapter_id"/>
         <result property="currentStatus" column="current_status"/>
         <result property="timeInterval" column="time_interval"/>
+        <result property="courseId" column="course_id"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.course.vo.CoursePhotoLogVo" id="CoursePhotoLogVoResult">
@@ -38,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="chapterId" column="chapter_id"/>
         <result property="currentStatus" column="current_status"/>
         <result property="timeInterval" column="time_interval"/>
+        <result property="courseId" column="course_id"/>
     </resultMap>
 
     <select id="getLastInfo" parameterType="com.zhongzheng.modules.course.bo.CoursePhotoLogQueryBo"  resultMap="CoursePhotoLogVoResult">
@@ -50,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           AND goods_id = #{goodsId}
           AND grade_id = #{gradeId}
           AND section_id = #{sectionId}
+        AND course_id = #{courseId}
         AND current_status =1
         <if test="moduleId != null ">
             and module_id = #{moduleId}