学习记录

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsUserVo.java

@@ -243,4 +243,12 @@ public class GoodsUserVo {
 	/** 学习进度 */
 	@ApiModelProperty("总节数")
 	private Long secAllNum;
+
+	/** 学习进度 */
+	@ApiModelProperty("0无预约考试 1有预约考试")
+	private Long applyStatus;
+
+	/** 学习进度 */
+	@ApiModelProperty("0无刷题 1有刷题")
+	private Long beforeStatus;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserStudyRecordAddBo.java

@@ -12,7 +12,7 @@ import java.util.Date;
  * 用户学习记录添加对象 user_study_record
  *
  * @author ruoyi
- * @date 2021-06-25
+ * @date 2021-12-16
  */
 @Data
 @ApiModel("用户学习记录添加对象")
@@ -42,4 +42,25 @@ public class UserStudyRecordAddBo {
     /** 结束时间 */
     @ApiModelProperty("结束时间")
     private Long endTime;
+    /** 模块ID */
+    @ApiModelProperty("模块ID")
+    private Long moduleId;
+    /** 章ID */
+    @ApiModelProperty("章ID")
+    private Long chapterId;
+    /** 0 未完整看完 1完整播放 */
+    @ApiModelProperty("0 未完整看完 1完整播放")
+    private Integer status;
+    /** 商品Id */
+    @ApiModelProperty("商品Id")
+    private Long goodsId;
+    /** 班级ID */
+    @ApiModelProperty("班级ID")
+    private Long gradeId;
+
+
+    /** 照片添加 */
+    @ApiModelProperty("照片添加")
+    private String photo;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserStudyRecordEditBo.java

@@ -11,13 +11,12 @@ import java.util.Date;
  * 用户学习记录编辑对象 user_study_record
  *
  * @author ruoyi
- * @date 2021-06-25
+ * @date 2021-12-16
  */
 @Data
 @ApiModel("用户学习记录编辑对象")
 public class UserStudyRecordEditBo {
 
-
     /** 学习记录ID */
     @ApiModelProperty("学习记录ID")
     private Long recordId;
@@ -49,4 +48,26 @@ public class UserStudyRecordEditBo {
     /** 结束时间 */
     @ApiModelProperty("结束时间")
     private Long endTime;
+
+
+    /** 模块ID */
+    @ApiModelProperty("模块ID")
+    private Long moduleId;
+
+    /** 章ID */
+    @ApiModelProperty("章ID")
+    private Long chapterId;
+
+    /** 0 未完整看完 1完整播放 */
+    @ApiModelProperty("0 未完整看完 1完整播放")
+    private Integer status;
+
+    /** 商品Id */
+    @ApiModelProperty("商品Id")
+    private Long goodsId;
+
+    /** 班级ID */
+    @ApiModelProperty("班级ID")
+    private Long gradeId;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserStudyRecordPhotoAddBo.java

@@ -12,12 +12,15 @@ import java.util.Date;
  * 学习拍摄照片添加对象 user_study_record_photo
  *
  * @author ruoyi
- * @date 2021-11-30
+ * @date 2021-12-16
  */
 @Data
 @ApiModel("学习拍摄照片添加对象")
 public class UserStudyRecordPhotoAddBo {
 
+    /** 学习记录id */
+    @ApiModelProperty("学习记录id")
+    private Long recordId;
     /** 拍摄照片 */
     @ApiModelProperty("拍摄照片")
     private String photo;

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserStudyRecordPhotoEditBo.java

@@ -11,12 +11,16 @@ import java.util.Date;
  * 学习拍摄照片编辑对象 user_study_record_photo
  *
  * @author ruoyi
- * @date 2021-11-30
+ * @date 2021-12-16
  */
 @Data
 @ApiModel("学习拍摄照片编辑对象")
 public class UserStudyRecordPhotoEditBo {
 
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
     /** 学习记录id */
     @ApiModelProperty("学习记录id")
     private Long recordId;

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserStudyRecordPhotoQueryBo.java

@@ -15,7 +15,7 @@ import com.zhongzheng.common.core.domain.BaseEntity;
  * 学习拍摄照片分页查询对象 user_study_record_photo
  *
  * @author ruoyi
- * @date 2021-11-30
+ * @date 2021-12-16
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -36,6 +36,9 @@ public class UserStudyRecordPhotoQueryBo extends BaseEntity {
 	private String isAsc;
 
 
+	/** 学习记录id */
+	@ApiModelProperty("学习记录id")
+	private Long recordId;
 	/** 拍摄照片 */
 	@ApiModelProperty("拍摄照片")
 	private String photo;

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserStudyRecordQueryBo.java

@@ -15,7 +15,7 @@ import com.zhongzheng.common.core.domain.BaseEntity;
  * 用户学习记录分页查询对象 user_study_record
  *
  * @author ruoyi
- * @date 2021-06-25
+ * @date 2021-12-16
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -54,6 +54,22 @@ public class UserStudyRecordQueryBo extends BaseEntity {
 	/** 结束时间 */
 	@ApiModelProperty("结束时间")
 	private Long endTime;
+	/** 模块ID */
+	@ApiModelProperty("模块ID")
+	private Long moduleId;
+	/** 章ID */
+	@ApiModelProperty("章ID")
+	private Long chapterId;
+	/** 0 未完整看完 1完整播放 */
+	@ApiModelProperty("0 未完整看完 1完整播放")
+	private Integer status;
+	/** 商品Id */
+	@ApiModelProperty("商品Id")
+	private Long goodsId;
+	/** 班级ID */
+	@ApiModelProperty("班级ID")
+	private Long gradeId;
+
 	/** 课程名 */
 	@ApiModelProperty("课程名")
 	private String courseName;
@@ -73,4 +89,5 @@ public class UserStudyRecordQueryBo extends BaseEntity {
 	@ApiModelProperty("结束时间2")
 	private String endTime2;
 
+
 }

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

@@ -1,7 +1,6 @@
 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;
@@ -14,7 +13,7 @@ import com.zhongzheng.common.annotation.Excel;
  * 用户学习记录对象 user_study_record
  *
  * @author ruoyi
- * @date 2021-06-25
+ * @date 2021-12-16
  */
 @Data
 @NoArgsConstructor
@@ -24,39 +23,35 @@ public class UserStudyRecord implements Serializable {
 
 private static final long serialVersionUID=1L;
 
-
     /** 学习记录ID */
     @TableId(value = "record_id")
     private Long recordId;
-
     /** $column.columnComment */
     private Long userId;
-
     /** 课程ID */
     private Long courseId;
-
     /** 节ID */
     private Long sectionId;
-
     /** 创建时间 */
     @TableField(fill = FieldFill.INSERT)
     private Long createTime;
-
     /** $column.columnComment */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Long updateTime;
-
     /** 学习时长 */
     private Long studyDuration;
-
     /** 开始时间 */
     private Long startTime;
-
     /** 结束时间 */
     private Long endTime;
-
-    private String coverUrl;
-
-    private String courseName;
-
+    /** 模块ID */
+    private Long moduleId;
+    /** 章ID */
+    private Long chapterId;
+    /** 0 未完整看完 1完整播放 */
+    private Integer status;
+    /** 商品Id */
+    private Long goodsId;
+    /** 班级ID */
+    private Long gradeId;
 }

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

@@ -13,7 +13,7 @@ import com.zhongzheng.common.annotation.Excel;
  * 学习拍摄照片对象 user_study_record_photo
  *
  * @author ruoyi
- * @date 2021-11-30
+ * @date 2021-12-16
  */
 @Data
 @NoArgsConstructor

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

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 学习拍摄照片Mapper接口
  *
  * @author ruoyi
- * @date 2021-11-30
+ * @date 2021-12-16
  */
 public interface UserStudyRecordPhotoMapper extends BaseMapper<UserStudyRecordPhoto> {
 

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

@@ -14,14 +14,14 @@ import java.util.List;
  * 学习拍摄照片Service接口
  *
  * @author ruoyi
- * @date 2021-11-30
+ * @date 2021-12-16
  */
 public interface IUserStudyRecordPhotoService extends IService<UserStudyRecordPhoto> {
 	/**
 	 * 查询单个
 	 * @return
 	 */
-	UserStudyRecordPhotoVo queryById(Long recordId);
+	UserStudyRecordPhotoVo queryById(Long id);
 
 	/**
 	 * 查询列表

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

@@ -25,20 +25,21 @@ import java.util.stream.Collectors;
  * 学习拍摄照片Service业务层处理
  *
  * @author ruoyi
- * @date 2021-11-30
+ * @date 2021-12-16
  */
 @Service
 public class UserStudyRecordPhotoServiceImpl extends ServiceImpl<UserStudyRecordPhotoMapper, UserStudyRecordPhoto> implements IUserStudyRecordPhotoService {
 
     @Override
-    public UserStudyRecordPhotoVo queryById(Long recordId){
-        UserStudyRecordPhoto db = this.baseMapper.selectById(recordId);
+    public UserStudyRecordPhotoVo queryById(Long id){
+        UserStudyRecordPhoto db = this.baseMapper.selectById(id);
         return BeanUtil.toBean(db, UserStudyRecordPhotoVo.class);
     }
 
     @Override
     public List<UserStudyRecordPhotoVo> queryList(UserStudyRecordPhotoQueryBo bo) {
         LambdaQueryWrapper<UserStudyRecordPhoto> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getRecordId() != null, UserStudyRecordPhoto::getRecordId, bo.getRecordId());
         lqw.eq(StrUtil.isNotBlank(bo.getPhoto()), UserStudyRecordPhoto::getPhoto, bo.getPhoto());
         lqw.eq(bo.getPeriodId() != null, UserStudyRecordPhoto::getPeriodId, bo.getPeriodId());
         return entity2Vo(this.list(lqw));

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

@@ -10,6 +10,7 @@ import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.user.bo.*;
 import com.zhongzheng.modules.user.domain.UserStudyRecord;
 import com.zhongzheng.modules.user.mapper.UserStudyRecordMapper;
+import com.zhongzheng.modules.user.service.IUserStudyRecordPhotoService;
 import com.zhongzheng.modules.user.service.IUserStudyRecordService;
 import com.zhongzheng.modules.user.vo.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,6 +43,10 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
     @Autowired
     private IUserStudyRecordService iUserStudyRecordService;
 
+    @Autowired
+    private IUserStudyRecordPhotoService userStudyRecordPhotoService;
+
+
 
 
     @Override
@@ -96,10 +101,11 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
         add.setUpdateTime(DateUtils.getNowTime());
         add.setStartTime(DateUtils.getNowTime()-add.getStudyDuration());
         add.setEndTime(DateUtils.getNowTime());
-
-
-
         this.save(add);
+        //新增学时记录,照片
+        userPeriodSave(add,bo);
+       //完成当天学习计划
+        userPlanSave(add);
         return 0;
     }
 
@@ -120,6 +126,17 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
         //TODO 做一些数据校验,如唯一约束
     }
 
+
+    private void userPeriodSave(UserStudyRecord entity,UserStudyRecordAddBo bo){
+        UserStudyRecordPhotoAddBo userStudyRecordPhotoAddBo = new UserStudyRecordPhotoAddBo();
+        userStudyRecordPhotoAddBo.setPhoto(bo.getPhoto());
+        userStudyRecordPhotoService.insertByAddBo(userStudyRecordPhotoAddBo);
+    }
+
+    private void userPlanSave(UserStudyRecord entity){
+
+    }
+
     @Override
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         if(isValid){

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

@@ -13,17 +13,21 @@ import java.util.Date;
  * 学习拍摄照片视图对象 mall_package
  *
  * @author ruoyi
- * @date 2021-11-30
+ * @date 2021-12-16
  */
 @Data
 @ApiModel("学习拍摄照片视图对象")
 public class UserStudyRecordPhotoVo {
 	private static final long serialVersionUID = 1L;
 
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
 	/** 学习记录id */
+	@Excel(name = "学习记录id")
 	@ApiModelProperty("学习记录id")
 	private Long recordId;
-
 	/** 拍摄照片 */
 	@Excel(name = "拍摄照片")
 	@ApiModelProperty("拍摄照片")

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

@@ -13,7 +13,7 @@ import java.util.Date;
  * 用户学习记录视图对象 mall_package
  *
  * @author ruoyi
- * @date 2021-06-25
+ * @date 2021-12-16
  */
 @Data
 @ApiModel("用户学习记录视图对象")
@@ -48,6 +48,26 @@ public class UserStudyRecordVo {
 	@Excel(name = "结束时间")
 	@ApiModelProperty("结束时间")
 	private Long endTime;
+	/** 模块ID */
+	@Excel(name = "模块ID")
+	@ApiModelProperty("模块ID")
+	private Long moduleId;
+	/** 章ID */
+	@Excel(name = "章ID")
+	@ApiModelProperty("章ID")
+	private Long chapterId;
+	/** 0 未完整看完 1完整播放 */
+	@Excel(name = "0 未完整看完 1完整播放")
+	@ApiModelProperty("0 未完整看完 1完整播放")
+	private Integer status;
+	/** 商品Id */
+	@Excel(name = "商品Id")
+	@ApiModelProperty("商品Id")
+	private Long goodsId;
+	/** 班级ID */
+	@Excel(name = "班级ID")
+	@ApiModelProperty("班级ID")
+	private Long gradeId;
 	@ApiModelProperty("封面地址")
 	private String coverUrl;
 	@ApiModelProperty("课程名称")
@@ -58,5 +78,4 @@ public class UserStudyRecordVo {
 	private String realname;
 	@ApiModelProperty("视频标题")
 	private String title;
-
 }

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

@@ -156,6 +156,8 @@
         <result property="studyCount" column="study_count"/>
         <result property="makeGoodsName" column="make_goods_name"/>
         <result property="makeGoodsCode" column="make_goods_code"/>
+        <result property="applyStatus" column="apply_status"/>
+        <result property="beforeStatus" column="before_status"/>
     </resultMap>
 
 
@@ -381,7 +383,9 @@
         SELECT
             g.*,
             cgu.grade_id,
-               cgu.user_id
+               cgu.user_id,
+        (case WHEN (SELECT COUNT(1) FROM exam_apply_goods eag LEFT JOIN exam_apply ea on eag.apply_id = ea.apply_id where eag.goods_id = cgg.goods_id and ea.`status` = 1 and unix_timestamp(now()) BETWEEN ea.apply_start_time and ea.apply_end_time) >0 then 1 ELSE 0 end) as apply_status,
+        (case WHEN (SELECT COUNT(1) FROM exam_before_goods ebg LEFT JOIN exam_before eb on ebg.before_id = eb.before_id where ebg.goods_id = cgg.goods_id and eb.`status` = 1 and unix_timestamp(now()) BETWEEN eb.before_start_time and eb.before_end_time) >0 then 1 ELSE 0 end) as before_status
         FROM
             class_grade_user cgu
                 LEFT JOIN class_grade_goods cgg ON cgu.grade_id = cgg.grade_id