fix 学习拍照

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/UserStudyRecord.java

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.user.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
@@ -65,4 +66,6 @@ private static final long serialVersionUID=1L;
     private Integer currentStatus;
     /** 订单商品ID */
     private Long orderGoodsId;
+
+    private String photo;
 }

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

@@ -319,23 +319,28 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
-        add.setStartTime(DateUtils.getNowTime().longValue() - add.getStudyDuration().longValue());
+        if(Validator.isNotEmpty(add.getStudyDuration())){
+            add.setStartTime(DateUtils.getNowTime().longValue() - add.getStudyDuration().longValue());
+        }else{
+            add.setStartTime(DateUtils.getNowTime().longValue());
+        }
         add.setEndTime(DateUtils.getNowTime());
         if(Validator.isNotEmpty(first)&&Validator.isNotEmpty(first.getFirstStartTime())){
             add.setFirstStartTime(first.getFirstStartTime());
         }else{
             add.setFirstStartTime(add.getStartTime());
         }
-        if(courseSectionVo.getSectionType()==1||courseSectionVo.getSectionType()==2||courseSectionVo.getSectionType()==3){
+        this.save(add);
+/*        if(courseSectionVo.getSectionType()==1||courseSectionVo.getSectionType()==2||courseSectionVo.getSectionType()==3){
             UserStudyRecordQueryBo queryBo = BeanUtil.toBean(bo, UserStudyRecordQueryBo.class);
-/*            queryBo.setUserId(bo.getUserId());
+*//*            queryBo.setUserId(bo.getUserId());
             queryBo.setGradeId(bo.getGradeId());
             queryBo.setGoodsId(bo.getGoodsId());
             queryBo.setCourseId(bo.getCourseId());
             queryBo.setModuleId(bo.getModuleId());
             queryBo.setChapterId(bo.getChapterId());
             queryBo.setSectionId(bo.getSectionId());
-            queryBo.setOrderGoodsId(bo.getOrderGoodsId());*/
+            queryBo.setOrderGoodsId(bo.getOrderGoodsId());*//*
             UserStudyRecordVo lastVo = queryLast(queryBo);
             if(Validator.isEmpty(lastVo)||Validator.isEmpty(lastVo.getVideoCurrentTime())||lastVo.getVideoCurrentTime().longValue()>add.getVideoCurrentTime().longValue()){
                 //如果没有历史数据或者之前播放时长比现在晚，则新增观看记录
@@ -359,7 +364,7 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
             }
         }else{
             this.save(add);
-        }
+        }*/
 
         //新增学时记录,照片
         userPeriodSave(add, bo);

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

@@ -109,4 +109,7 @@ public class UserStudyRecordVo {
 	@Excel(name = "录播和回放的url地址")
 	@ApiModelProperty("录播和回放的url地址")
 	private String recordingUrl;
+
+	@ApiModelProperty("拍照地址")
+	private String photo;
 }

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

@@ -20,6 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="firstStartTime" column="first_start_time"/>
         <result property="currentStatus" column="current_status"/>
         <result property="orderGoodsId" column="order_goods_id"/>
+        <result property="photo" column="photo"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.user.vo.GoodsStudyRecordVo" id="GoodsStudyRecordVoResult">