fix 重修数

zhongzheng-api/src/main/java/com/zhongzheng/controller/goods/GoodsController.java

@@ -126,7 +126,6 @@ public class GoodsController extends BaseController {
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
         bo.setUserId(loginUser.getUser().getUserId());
         List<GoodsAttachedVo> list = iGoodsAttachedService.selectList(bo);
-        System.out.println(list);
         return AjaxResult.success(list);
     }
 

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

@@ -60,4 +60,7 @@ public class CoursePhotoLogAddBo {
     /** 当前状态 1 当前状态 0过往状态 */
     @ApiModelProperty("当前状态 1 当前状态 0过往状态")
     private Integer currentStatus;
+    /** 拍照时间间隔 */
+    @ApiModelProperty("拍照时间间隔")
+    private String timeInterval;
 }

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

@@ -67,4 +67,7 @@ public class CoursePhotoLogEditBo {
     /** 当前状态 1 当前状态 0过往状态 */
     @ApiModelProperty("当前状态 1 当前状态 0过往状态")
     private Integer currentStatus;
+    /** 拍照时间间隔 */
+    @ApiModelProperty("拍照时间间隔")
+    private String timeInterval;
 }

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

@@ -56,4 +56,6 @@ private static final long serialVersionUID=1L;
     private Long chapterId;
     /** 当前状态 1 当前状态 0过往状态 */
     private Integer currentStatus;
+    /** 拍照时间间隔 */
+    private String timeInterval;
 }

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

@@ -317,7 +317,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
             LambdaUpdateWrapper<UserBankRecord> objectLambdaUpdateWrapper2 = Wrappers.lambdaUpdate();
             objectLambdaUpdateWrapper2.eq(UserBankRecord::getUserId, bo.getUserId());
             objectLambdaUpdateWrapper2.eq(UserBankRecord::getGoodsId, vo.getGoodsId());
-            objectLambdaUpdateWrapper2.eq(UserBankRecord::getSectionId,vo.getSectionId());
+            objectLambdaUpdateWrapper2.eq(UserBankRecord::getExamId,vo.getExamId());
             objectLambdaUpdateWrapper2.eq(UserBankRecord::getGradeId,vo.getGradeId());
             objectLambdaUpdateWrapper2.eq(vo.getModuleId()>0,UserBankRecord::getModuleId,vo.getModuleId());
             objectLambdaUpdateWrapper2.eq(vo.getChapterId()>0,UserBankRecord::getChapterId,vo.getChapterId());

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

@@ -72,4 +72,8 @@ public class CoursePhotoLogVo {
 	@Excel(name = "当前状态 1 当前状态 0过往状态")
 	@ApiModelProperty("当前状态 1 当前状态 0过往状态")
 	private Integer currentStatus;
+	/** 拍照时间间隔 */
+	@Excel(name = "拍照时间间隔")
+	@ApiModelProperty("拍照时间间隔")
+	private String timeInterval;
 }

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

@@ -337,7 +337,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
             }else {
                 classPeriodStudentVo.setAllStatus(-1);
             }
-            classPeriodStudentVo.setWaitRebuildNum(classPeriodUserVos.getCheat());
+            classPeriodStudentVo.setWaitRebuildNum(classPeriodUserVos.getCheat()+classPeriodUserVos.getExamCheat());
             if (!CollectionUtils.isEmpty(baseMapper.selectStart(classPeriodStudentVo.getUserId(),classPeriodStudentVo.getGoodsId(),classPeriodStudentVo.getGradeId()))) {
                 //查找开始学习时间
                 classPeriodStudentVo.setStartTime(baseMapper.selectStart(classPeriodStudentVo.getUserId(),classPeriodStudentVo.getGoodsId(),classPeriodStudentVo.getGradeId()).get(0));

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserStudyRecordMapper.java

@@ -65,4 +65,6 @@ public interface UserStudyRecordMapper extends BaseMapper<UserStudyRecord> {
     UserPeriodStatus selectStudyExamRecordCount(UserBankRecordVo userBankRecordVo);
 
     Long selectCountPlan(Long planId);
+
+    SectionStudyRecordVo listExamRecord(SubjectStudyRecordQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IUserStudyRecordService.java

@@ -73,4 +73,8 @@ public interface IUserStudyRecordService extends IService<UserStudyRecord> {
     List<ExamStudyRecordVo> querExamStudy(UserQueryBo bo);
 
     List<ExamSonStudyRecordVo> listExamSon(SubjectStudyRecordQueryBo bo);
+
+	SectionStudyRecordVo listExamRecord(SubjectStudyRecordQueryBo bo);
+
+	void studyFinish(UserStudyRecord bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserBankRecordServiceImpl.java

@@ -16,10 +16,7 @@ import com.zhongzheng.modules.user.domain.UserStudyRecord;
 import com.zhongzheng.modules.user.domain.UserStudyRecordPhoto;
 import com.zhongzheng.modules.user.mapper.UserBankRecordMapper;
 import com.zhongzheng.modules.user.mapper.UserStudyRecordMapper;
-import com.zhongzheng.modules.user.service.IUserBankQuestionRecordService;
-import com.zhongzheng.modules.user.service.IUserBankRecordService;
-import com.zhongzheng.modules.user.service.IUserService;
-import com.zhongzheng.modules.user.service.IUserStudyRecordPhotoService;
+import com.zhongzheng.modules.user.service.*;
 import com.zhongzheng.modules.user.vo.UserBankRecordVo;
 import com.zhongzheng.modules.user.vo.UserVo;
 import org.slf4j.Logger;
@@ -67,6 +64,9 @@ public class UserBankRecordServiceImpl extends ServiceImpl<UserBankRecordMapper,
     @Autowired
     private IUserStudyRecordPhotoService userStudyRecordPhotoService;
 
+    @Autowired
+    private IUserStudyRecordService iUserStudyRecordService;
+
 
 
     private static Logger log = LoggerFactory.getLogger(UserBankRecordServiceImpl.class);
@@ -162,6 +162,13 @@ public class UserBankRecordServiceImpl extends ServiceImpl<UserBankRecordMapper,
         update.setUpdateTime(DateUtils.getNowTime());
         boolean b = this.updateById(update);
         updateExam(update);
+        //判断有无学习结束
+        UserStudyRecord userStudyRecord = new UserStudyRecord();
+        userStudyRecord.setUserId(bo.getUserId());
+        userStudyRecord.setGoodsId(bo.getGoodsId());
+        userStudyRecord.setGradeId(bo.getGradeId());
+        userStudyRecord.setStatus(1);
+        iUserStudyRecordService.studyFinish(userStudyRecord);
         return b;
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserStudyRecordServiceImpl.java

@@ -256,7 +256,8 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
         return 0;
     }
 
-    private void studyFinish(UserStudyRecord bo) {
+    @Override
+    public void studyFinish(UserStudyRecord bo) {
         //获得当前所在班级
         if (bo.getStatus() != null && bo.getStatus().equals(1)){
             Long secLong = 0L;
@@ -266,12 +267,13 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
             subjectStudyRecordQueryBo.setUserId(bo.getUserId());
             subjectStudyRecordQueryBo.setGradeId(bo.getGradeId());
             List<SubjectStudyRecordVo> subjectStudyRecordVos = iUserStudyRecordService.listSubject(subjectStudyRecordQueryBo);
+            SectionStudyRecordVo sectionStudyRecordVo = iUserStudyRecordService.listExamRecord(subjectStudyRecordQueryBo);
             for (SubjectStudyRecordVo subjectStudyRecordVo : subjectStudyRecordVos) {
                 secLong = new BigDecimal(secLong.toString()).add(new BigDecimal(subjectStudyRecordVo.getSectionNum().toString())).longValue();
                 studyLong = new BigDecimal(studyLong.toString()).add(new BigDecimal(subjectStudyRecordVo.getRecordNum().toString())).longValue();
             }
             //发送课时完成
-            if (secLong.equals(studyLong)) {
+            if (secLong.equals(studyLong)&&sectionStudyRecordVo.getExamRecordNum().equals(sectionStudyRecordVo.getExamNum())) {
 
                 LambdaQueryWrapper<ClassGradeUser> classGradeUser = Wrappers.lambdaQuery();
                 classGradeUser.eq(ClassGradeUser::getUserId, bo.getUserId());
@@ -611,4 +613,9 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
 
         return examSonStudyRecordVos;
     }
+
+    @Override
+    public SectionStudyRecordVo listExamRecord(SubjectStudyRecordQueryBo bo) {
+        return this.baseMapper.listExamRecord(bo);
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/SectionStudyRecordVo.java

@@ -52,4 +52,10 @@ public class SectionStudyRecordVo {
     @ApiModelProperty("学习时长")
     private Long videoCurrentTime;
 
+    @ApiModelProperty("试卷数量")
+    private Long examNum;
+
+    @ApiModelProperty("试卷已做数量")
+    private Long examRecordNum;
+
 }

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

@@ -20,6 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="moduleId" column="module_id"/>
         <result property="chapterId" column="chapter_id"/>
         <result property="currentStatus" column="current_status"/>
+        <result property="timeInterval" column="time_interval"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.course.vo.CoursePhotoLogVo" id="CoursePhotoLogVoResult">
@@ -36,6 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="moduleId" column="module_id"/>
         <result property="chapterId" column="chapter_id"/>
         <result property="currentStatus" column="current_status"/>
+        <result property="timeInterval" column="time_interval"/>
     </resultMap>
 
     <select id="getLastInfo" parameterType="com.zhongzheng.modules.course.bo.CoursePhotoLogQueryBo"  resultMap="CoursePhotoLogVoResult">

zhongzheng-system/src/main/resources/mapper/modules/goods/GoodsAttachedMapper.xml

@@ -131,7 +131,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				LEFT JOIN course_subject cs2 ON qb2.subject_id = cs2.id
 		WHERE
 			ga.goods_id = #{goodsId}
-		order by ga.sort,ga.create_time  asc
+		order by ga.sort,ga.id  asc
     </select>
 
 	<select id="selectDoList" parameterType="com.zhongzheng.modules.goods.bo.GoodsAttachedQueryBo" resultMap="GoodsAttachedResultVo">

zhongzheng-system/src/main/resources/mapper/modules/user/UserBankRecordMapper.xml

@@ -52,4 +52,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         AND ubr.user_id = #{userId}
     </select>
+
+
 </mapper>

zhongzheng-system/src/main/resources/mapper/modules/user/UserStudyRecordMapper.xml

@@ -65,6 +65,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="endTime" column="end_time"/>
         <result property="status" column="status"/>
         <result property="videoCurrentTime" column="video_current_time"/>
+
+        <result property="examNum" column="exam_num"/>
+        <result property="examRecordNum" column="exam_record_num"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.user.vo.ExamStudyRecordVo" id="ExamStudyRecordVoResult">
@@ -178,6 +181,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
     </select>
 
+    <select id="listExamRecord" parameterType="com.zhongzheng.modules.user.bo.SubjectStudyRecordQueryBo"  resultMap="SectionStudyRecordVoResult">
+        SELECT (SELECT COUNT(m.id) FROM course_menu_exam m LEFT JOIN goods_course c on m.course_id=c.course_id LEFT JOIN
+                                        class_grade_goods cgg on cgg.goods_id = c.goods_id where cgu.grade_id=cgg.grade_id and m.type = 1 ) as exam_num,
+               (SELECT COUNT(DISTINCT ubr.chapter_id, ubr.exam_id) FROM user_bank_record ubr LEFT JOIN class_grade_goods cgg on cgg.goods_id
+                   = ubr.goods_id where ubr.`status`=1 and ubr.report_status =1 and ubr.user_id=#{userId} and cgu.grade_id=cgg.grade_id and ubr.current_status=1 ) as exam_record_num
+        FROM
+             class_grade_user cgu
+        where 1=1
+        <if test="userId != null and userId !='' ">
+            and cgu.user_id = #{userId}
+        </if>
+        <if test="gradeId != null and gradeId !='' ">
+            and cgu.grade_id = #{gradeId}
+        </if>
+
+        LIMIT 1
+    </select>
+
     <select id="listSection" parameterType="com.zhongzheng.modules.user.bo.SubjectStudyRecordQueryBo"  resultMap="SectionStudyRecordVoResult">
         SELECT
             s.section_id,