|
@@ -35,24 +35,44 @@ public class UserCourseCatalog implements Serializable {
|
|
|
@TableId(type = IdType.ASSIGN_ID)
|
|
|
@ApiModelProperty(value = "主键")
|
|
|
private String id;
|
|
|
+
|
|
|
/**
|
|
|
- * 所属部门
|
|
|
+ * 用户id
|
|
|
*/
|
|
|
- @Excel(name = "所属部门", width = 15)
|
|
|
- @ApiModelProperty(value = "所属部门")
|
|
|
+ @Excel(name = "用户id", width = 15)
|
|
|
+ @ApiModelProperty(value = "用户id")
|
|
|
private String userId;
|
|
|
+
|
|
|
/**
|
|
|
- * 学时
|
|
|
+ * 任务id
|
|
|
*/
|
|
|
- @Excel(name = "学时", width = 15)
|
|
|
- @ApiModelProperty(value = "学时")
|
|
|
+ @Excel(name = "任务id", width = 15)
|
|
|
+ @ApiModelProperty(value = "任务id")
|
|
|
private String courseCatalogId;
|
|
|
+
|
|
|
/**
|
|
|
* 已学时长
|
|
|
*/
|
|
|
@Excel(name = "已学时长", width = 15)
|
|
|
@ApiModelProperty(value = "已学时长")
|
|
|
- private Integer alreadyLearnTime;
|
|
|
+ private Integer totalLearnTime;
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 最新开始时间
|
|
|
+ */
|
|
|
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
|
|
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
|
+ @ApiModelProperty(value = "最新开始时间")
|
|
|
+ private Date lastStartTime;
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 最新结束时间
|
|
|
+ */
|
|
|
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
|
|
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
|
+ @ApiModelProperty(value = "最新结束时间")
|
|
|
+ private Date lastEndTime;
|
|
|
+
|
|
|
/**
|
|
|
* 学习进度
|
|
|
*/
|