Parcourir la source

fix 我的学习

he2802 il y a 4 ans
Parent
commit
2ee8c7bff7

+ 3 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/OrderPossessUserQueryBo.java

@@ -42,5 +42,7 @@ public class OrderPossessUserQueryBo extends BaseEntity {
 	/** 拥有的课程id或题库id或考试重点 */
 	@ApiModelProperty("拥有的课程id或题库id或考试重点")
 	private Long possessId;
-
+	/** 用户id */
+	@ApiModelProperty("用户ID")
+	private Long userId;
 }

+ 1 - 6
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/OrderPossessUser.java

@@ -23,16 +23,11 @@ public class OrderPossessUser implements Serializable {
 
 private static final long serialVersionUID=1L;
 
-
     /** 用户id */
-    @TableId(value = "user_id")
     private Long userId;
 
     /** 来源id  0 订单购买  1订单活动购买  2 等级解锁 */
-    @TableId(value = "
-source_id")
-    private Integer
-sourceId;
+    private Integer sourceId;
 
     /** 解锁类型 0课程 1题库  2考试重点 */
     private Integer typeId;

+ 19 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/OrderPossessUserVo.java

@@ -2,11 +2,14 @@ package com.zhongzheng.modules.user.vo;
 
 import com.zhongzheng.common.annotation.Excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zhongzheng.modules.bank.vo.QuestionBankVo;
+import com.zhongzheng.modules.course.vo.CourseVo;
+import com.zhongzheng.modules.exam.vo.ExamNoteVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.util.Date;
-
+import java.util.List;
 
 
 /**
@@ -33,4 +36,19 @@ public class OrderPossessUserVo {
 	@ApiModelProperty("拥有的课程id或题库id或考试重点")
 	private Long possessId;
 
+	/** 拥有的课程 */
+	@Excel(name = "拥有的课程")
+	@ApiModelProperty("拥有的课程")
+	private List<CourseVo> CourseVoList;
+
+	/** 拥有的考试重点 */
+	@Excel(name = "拥有的考试重点")
+	@ApiModelProperty("拥有的考试重点")
+	private List<ExamNoteVo> examNoteList;
+
+	/** 拥有的考试重点 */
+	@Excel(name = "拥有的考试重点")
+	@ApiModelProperty("拥有的考试重点")
+	private List<QuestionBankVo> questionBankList;
+
 }