serv-课程任务

schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbCourse.java

@@ -1,6 +1,7 @@
 package org.xyzh.common.dto.study;
 
 import org.xyzh.common.dto.BaseDTO;
+import java.util.Date;
 
 /**
  * @description 课程表
@@ -77,6 +78,21 @@ public class TbCourse extends BaseDTO {
      * @description 更新者
      */
     private String updater;
+    
+    /**
+     * @description 更新时间
+     */
+    private Date updateTime;
+    
+    /**
+     * @description 删除时间
+     */
+    private Date deleteTime;
+    
+    /**
+     * @description 是否删除
+     */
+    private Boolean deleted;
 
     public String getCourseID() {
         return courseID;
@@ -182,6 +198,22 @@ public class TbCourse extends BaseDTO {
         this.updater = updater;
     }
 
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Date getDeleteTime() {
+        return deleteTime;
+    }
+
+    public void setDeleteTime(Date deleteTime) {
+        this.deleteTime = deleteTime;
+    }
+
     @Override
     public String toString() {
         return "TbCourse{" +

schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbCourseChapter.java

@@ -1,6 +1,7 @@
 package org.xyzh.common.dto.study;
 
 import org.xyzh.common.dto.BaseDTO;
+import java.util.Date;
 
 /**
  * @description 课程章节表
@@ -69,6 +70,21 @@ public class TbCourseChapter extends BaseDTO {
      * @description 更新者
      */
     private String updater;
+    
+    /**
+     * @description 更新时间
+     */
+    private Date updateTime;
+    
+    /**
+     * @description 删除时间
+     */
+    private Date deleteTime;
+    
+    /**
+     * @description 是否删除
+     */
+    private Boolean deleted;
 
     public String getChapterID() {
         return chapterID;
@@ -166,6 +182,22 @@ public class TbCourseChapter extends BaseDTO {
         this.updater = updater;
     }
 
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Date getDeleteTime() {
+        return deleteTime;
+    }
+
+    public void setDeleteTime(Date deleteTime) {
+        this.deleteTime = deleteTime;
+    }
+
     @Override
     public String toString() {
         return "TbCourseChapter{" +

schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbCourseNode.java

@@ -1,6 +1,7 @@
 package org.xyzh.common.dto.study;
 
 import org.xyzh.common.dto.BaseDTO;
+import java.util.Date;
 
 /**
  * @description 学习节点表
@@ -69,6 +70,21 @@ public class TbCourseNode extends BaseDTO {
      * @description 更新者
      */
     private String updater;
+    
+    /**
+     * @description 更新时间
+     */
+    private Date updateTime;
+    
+    /**
+     * @description 删除时间
+     */
+    private Date deleteTime;
+    
+    /**
+     * @description 是否删除
+     */
+    private Boolean deleted;
 
     public String getNodeID() {
         return nodeID;
@@ -166,6 +182,22 @@ public class TbCourseNode extends BaseDTO {
         this.updater = updater;
     }
 
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Date getDeleteTime() {
+        return deleteTime;
+    }
+
+    public void setDeleteTime(Date deleteTime) {
+        this.deleteTime = deleteTime;
+    }
+
     @Override
     public String toString() {
         return "TbCourseNode{" +

schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbCourseTag.java

@@ -1,5 +1,7 @@
 package org.xyzh.common.dto.study;
 
+import java.util.Date;
+
 import org.xyzh.common.dto.BaseDTO;
 
 /**
@@ -28,6 +30,14 @@ public class TbCourseTag extends BaseDTO {
      */
     private String creator;
 
+    private String updater;
+
+    private Date updateTime;
+
+    private Date deleteTime;
+
+    private boolean deleted;
+
     public String getCourseID() {
         return courseID;
     }
@@ -52,6 +62,40 @@ public class TbCourseTag extends BaseDTO {
         this.creator = creator;
     }
 
+    
+
+    public String getUpdater() {
+      return updater;
+    }
+
+    public void setUpdater(String updater) {
+      this.updater = updater;
+    }
+
+    public Date getUpdateTime() {
+      return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+      this.updateTime = updateTime;
+    }
+
+    public Date getDeleteTime() {
+      return deleteTime;
+    }
+
+    public void setDeleteTime(Date deleteTime) {
+      this.deleteTime = deleteTime;
+    }
+
+    public boolean isDeleted() {
+      return deleted;
+    }
+
+    public void setDeleted(boolean deleted) {
+      this.deleted = deleted;
+    }
+
     @Override
     public String toString() {
         return "TbCourseTag{" +

schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbLearningRecord.java

@@ -59,6 +59,31 @@ public class TbLearningRecord extends BaseDTO {
      * @description 最后学习时间
      */
     private Date lastLearnTime;
+    
+    /**
+     * @description 创建者
+     */
+    private String creator;
+    
+    /**
+     * @description 更新者
+     */
+    private String updater;
+    
+    /**
+     * @description 更新时间
+     */
+    private Date updateTime;
+    
+    /**
+     * @description 删除时间
+     */
+    private Date deleteTime;
+    
+    /**
+     * @description 是否删除
+     */
+    private Boolean deleted;
 
     public String getUserID() {
         return userID;
@@ -132,6 +157,38 @@ public class TbLearningRecord extends BaseDTO {
         this.lastLearnTime = lastLearnTime;
     }
 
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+
+    public String getUpdater() {
+        return updater;
+    }
+
+    public void setUpdater(String updater) {
+        this.updater = updater;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Date getDeleteTime() {
+        return deleteTime;
+    }
+
+    public void setDeleteTime(Date deleteTime) {
+        this.deleteTime = deleteTime;
+    }
+
     @Override
     public String toString() {
         return "TbLearningRecord{" +

schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbLearningStatistics.java

@@ -43,6 +43,36 @@ public class TbLearningStatistics extends BaseDTO {
      * @description 完成数量
      */
     private Integer completeCount;
+    
+    /**
+     * @description 创建者
+     */
+    private String creator;
+    
+    /**
+     * @description 更新者
+     */
+    private String updater;
+
+    /**
+     * @description 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * @description 更新时间
+     */
+    private Date updateTime;
+    
+    /**
+     * @description 删除时间
+     */
+    private Date deleteTime;
+    
+    /**
+     * @description 是否删除
+     */
+    private Boolean deleted;
 
     public String getUserID() {
         return userID;
@@ -92,6 +122,47 @@ public class TbLearningStatistics extends BaseDTO {
         this.completeCount = completeCount;
     }
 
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+
+    public String getUpdater() {
+        return updater;
+    }
+
+    public void setUpdater(String updater) {
+        this.updater = updater;
+    }
+
+    public Date getCreateTime() {
+      return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+      this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+      return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Date getDeleteTime() {
+        return deleteTime;
+    }
+
+    public void setDeleteTime(Date deleteTime) {
+        this.deleteTime = deleteTime;
+    }
+
+
     @Override
     public String toString() {
         return "TbLearningStatistics{" +

schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbLearningTask.java

@@ -2,6 +2,7 @@ package org.xyzh.common.dto.study;
 
 import org.xyzh.common.dto.BaseDTO;
 import java.util.Date;
+import java.lang.Boolean;
 
 /**
  * @description 学习任务表
@@ -53,6 +54,21 @@ public class TbLearningTask extends BaseDTO {
      * @description 更新者
      */
     private String updater;
+    
+    /**
+     * @description 更新时间
+     */
+    private Date updateTime;
+    
+    /**
+     * @description 删除时间
+     */
+    private Date deleteTime;
+    
+    /**
+     * @description 是否删除
+     */
+    private Boolean deleted;
 
     public String getTaskID() {
         return taskID;
@@ -118,6 +134,23 @@ public class TbLearningTask extends BaseDTO {
         this.updater = updater;
     }
 
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Date getDeleteTime() {
+        return deleteTime;
+    }
+
+    public void setDeleteTime(Date deleteTime) {
+        this.deleteTime = deleteTime;
+    }
+
+
     @Override
     public String toString() {
         return "TbLearningTask{" +

schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbTaskCourse.java

@@ -1,6 +1,7 @@
 package org.xyzh.common.dto.study;
 
 import org.xyzh.common.dto.BaseDTO;
+import java.util.Date;
 
 /**
  * @description 任务课程关联表
@@ -37,6 +38,26 @@ public class TbTaskCourse extends BaseDTO {
      * @description 创建者
      */
     private String creator;
+    
+    /**
+     * @description 更新者
+     */
+    private String updater;
+    
+    /**
+     * @description 更新时间
+     */
+    private Date updateTime;
+    
+    /**
+     * @description 删除时间
+     */
+    private Date deleteTime;
+    
+    /**
+     * @description 是否删除
+     */
+    private Boolean deleted;
 
     public String getTaskID() {
         return taskID;
@@ -78,6 +99,30 @@ public class TbTaskCourse extends BaseDTO {
         this.creator = creator;
     }
 
+    public String getUpdater() {
+        return updater;
+    }
+
+    public void setUpdater(String updater) {
+        this.updater = updater;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Date getDeleteTime() {
+        return deleteTime;
+    }
+
+    public void setDeleteTime(Date deleteTime) {
+        this.deleteTime = deleteTime;
+    }
+
     @Override
     public String toString() {
         return "TbTaskCourse{" +

schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbTaskResource.java

@@ -1,6 +1,7 @@
 package org.xyzh.common.dto.study;
 
 import org.xyzh.common.dto.BaseDTO;
+import java.util.Date;
 
 /**
  * @description 任务资源关联表
@@ -37,6 +38,26 @@ public class TbTaskResource extends BaseDTO {
      * @description 创建者
      */
     private String creator;
+    
+    /**
+     * @description 更新者
+     */
+    private String updater;
+    
+    /**
+     * @description 更新时间
+     */
+    private Date updateTime;
+    
+    /**
+     * @description 删除时间
+     */
+    private Date deleteTime;
+    
+    /**
+     * @description 是否删除
+     */
+    private Boolean deleted;
 
     public String getTaskID() {
         return taskID;
@@ -78,6 +99,32 @@ public class TbTaskResource extends BaseDTO {
         this.creator = creator;
     }
 
+    public String getUpdater() {
+        return updater;
+    }
+
+    public void setUpdater(String updater) {
+        this.updater = updater;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Date getDeleteTime() {
+        return deleteTime;
+    }
+
+    public void setDeleteTime(Date deleteTime) {
+        this.deleteTime = deleteTime;
+    }
+
+
+
     @Override
     public String toString() {
         return "TbTaskResource{" +

schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbTaskUser.java

@@ -49,6 +49,26 @@ public class TbTaskUser extends BaseDTO {
      * @description 创建者
      */
     private String creator;
+    
+    /**
+     * @description 更新者
+     */
+    private String updater;
+    
+    /**
+     * @description 更新时间
+     */
+    private Date updateTime;
+    
+    /**
+     * @description 删除时间
+     */
+    private Date deleteTime;
+    
+    /**
+     * @description 是否删除
+     */
+    private Boolean deleted;
 
     public String getTaskID() {
         return taskID;
@@ -106,6 +126,31 @@ public class TbTaskUser extends BaseDTO {
         this.creator = creator;
     }
 
+    public String getUpdater() {
+        return updater;
+    }
+
+    public void setUpdater(String updater) {
+        this.updater = updater;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Date getDeleteTime() {
+        return deleteTime;
+    }
+
+    public void setDeleteTime(Date deleteTime) {
+        this.deleteTime = deleteTime;
+    }
+
+
     @Override
     public String toString() {
         return "TbTaskUser{" +

schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/vo/TaskItemVO.java

@@ -0,0 +1,147 @@
+package org.xyzh.common.vo;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import org.xyzh.common.dto.study.TbLearningTask;
+import org.xyzh.common.dto.study.TbTaskCourse;
+import org.xyzh.common.dto.study.TbTaskResource;
+import org.xyzh.common.dto.study.TbTaskUser;
+
+public class TaskItemVO extends TbLearningTask {
+    
+    private String courseID;
+    private String courseName;
+    private String resourceID;
+    private String resourceName;
+    private String userID;
+    private String username;
+    private Boolean required;
+    private Integer orderNum;
+    private Integer status;
+    private BigDecimal progress;
+    private Date completeTime;
+
+    
+
+    public TaskItemVO() {
+    }
+
+    public TaskItemVO(TbTaskCourse taskCourse) {
+      this.courseID = taskCourse.getCourseID();
+      this.setTaskID(taskCourse.getTaskID());
+      this.orderNum = taskCourse.getOrderNum();
+      this.required = taskCourse.getRequired();
+    }
+    public TaskItemVO(TbTaskResource taskResource) {
+      this.resourceID = taskResource.getResourceID();
+      this.setTaskID(taskResource.getTaskID());
+      this.required = taskResource.getRequired();
+      this.orderNum = taskResource.getOrderNum();
+
+    }
+    public TaskItemVO(TbTaskUser taskUser) {
+      this.userID = taskUser.getUserID();
+      this.setTaskID(taskUser.getTaskID());
+      this.status = taskUser.getStatus();
+      this.progress = taskUser.getProgress();
+      this.completeTime = taskUser.getCompleteTime();
+    }
+
+    public String getCourseID() {
+      return courseID;
+    }
+    public void setCourseID(String courseID) {
+      this.courseID = courseID;
+    }
+    public String getCourseName() {
+      return courseName;
+    }
+    public void setCourseName(String courseName) {
+      this.courseName = courseName;
+    }
+    public String getResourceID() {
+      return resourceID;
+    }
+    public void setResourceID(String resourceID) {
+      this.resourceID = resourceID;
+    }
+    public String getResourceName() {
+      return resourceName;
+    }
+    public void setResourceName(String resourceName) {
+      this.resourceName = resourceName;
+    }
+    public String getUserID() {
+      return userID;
+    }
+    public void setUserID(String userID) {
+      this.userID = userID;
+    }
+    public String getUsername() {
+      return username;
+    }
+    public void setUsername(String userName) {
+      this.username = userName;
+    }
+
+    public Boolean getRequired() {
+      return required;
+    }
+    public void setRequired(Boolean required) {
+      this.required = required;
+    }
+    public Integer getOrderNum() {
+      return orderNum;
+    }
+    public void setOrderNum(Integer orderNum) {
+      this.orderNum = orderNum;
+    }
+    
+    public TbTaskCourse toTaskCourse() {
+      TbTaskCourse taskCourse = new TbTaskCourse();
+      taskCourse.setCourseID(courseID);
+      taskCourse.setTaskID(getTaskID());
+      taskCourse.setCreateTime(getCreateTime());
+      taskCourse.setCreator(getCreator());
+      return taskCourse;
+    }
+    public TbTaskResource toTaskResource() {
+      TbTaskResource taskResource = new TbTaskResource();
+      taskResource.setResourceID(resourceID);
+      taskResource.setTaskID(getTaskID());
+      taskResource.setCreateTime(getCreateTime());
+      taskResource.setCreator(getCreator());
+      return taskResource;
+    }
+    public TbTaskUser toTaskUser() {
+      TbTaskUser taskUser = new TbTaskUser();
+      taskUser.setUserID(userID);
+      taskUser.setTaskID(getTaskID());
+      taskUser.setCreateTime(getCreateTime());
+      taskUser.setCreator(getCreator());
+      return taskUser;
+    }
+    public Integer getStatus() {
+      return status;
+    }
+    public void setStatus(Integer status) {
+      this.status = status;
+    }
+    public BigDecimal getProgress() {
+      return progress;
+    }
+    public void setProgress(BigDecimal progress) {
+      this.progress = progress;
+    }
+    public Date getCompleteTime() {
+      return completeTime;
+    }
+    public void setCompleteTime(Date completeTime) {
+      this.completeTime = completeTime;
+    }
+
+    
+}

schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/vo/TaskVO.java

@@ -0,0 +1,81 @@
+package org.xyzh.common.vo;
+
+import org.xyzh.common.dto.BaseDTO;
+import org.xyzh.common.dto.study.TbLearningTask;
+import org.xyzh.common.dto.study.TbTaskCourse;
+import org.xyzh.common.dto.study.TbTaskResource;
+import org.xyzh.common.dto.study.TbTaskUser;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class TaskVO extends BaseDTO{
+    private static final long serialVersionUID = 1L;
+
+    private TbLearningTask learningTask;
+    private List<TaskItemVO> taskCourses;
+    private List<TaskItemVO> taskResources;
+    private List<TaskItemVO> taskUsers;
+
+    public TbLearningTask getLearningTask() {
+        return learningTask;
+    }
+    public void setLearningTask(TbLearningTask learningTask) {
+        this.learningTask = learningTask;
+    }
+    public List<TaskItemVO> getTaskCourses() {
+        return taskCourses;
+    }
+    public void setTaskCourses(List<TaskItemVO> taskCourses) {
+        this.taskCourses = taskCourses;
+    }
+    public List<TaskItemVO> getTaskResources() {
+        return taskResources;
+    }
+    public void setTaskResources(List<TaskItemVO> taskResources) {
+        this.taskResources = taskResources;
+    }
+    public List<TaskItemVO> getTaskUsers() {
+        return taskUsers;
+    }
+    public void setTaskUsers(List<TaskItemVO> taskUsers) {
+        this.taskUsers = taskUsers;
+    }
+
+    public List<TbTaskCourse> toTaskCourses() {
+      return getTaskCourses().stream().map(TaskItemVO::toTaskCourse).collect(Collectors.toList());
+    }
+    public List<TbTaskResource> toTaskResources() {
+      return getTaskResources().stream().map(TaskItemVO::toTaskResource).collect(Collectors.toList());
+    }
+    public List<TbTaskUser> toTaskUsers() {
+      return getTaskUsers().stream().map(TaskItemVO::toTaskUser).collect(Collectors.toList());
+    }
+
+    public void setTaskCourseList(List<TbTaskCourse> taskCourses) {
+        if (taskCourses == null) {
+            return;
+        }
+        this.taskCourses = taskCourses.stream().map(item -> {
+            return new TaskItemVO(item);
+        }).collect(Collectors.toList());
+    }
+    public void setTaskResourceList(List<TbTaskResource> taskResources) {
+        if (taskResources == null) {
+            return;
+        }
+        this.taskResources = taskResources.stream().map(item -> {
+            return new TaskItemVO(item);
+        }).collect(Collectors.toList());
+    }
+    public void setTaskUserList(List<TbTaskUser> taskUsers) {
+        if (taskUsers == null) {
+            return;
+        }
+        this.taskUsers = taskUsers.stream().map(item -> {
+            return new TaskItemVO(item);
+        }).collect(Collectors.toList());
+    }
+    
+    
+}