copy

cloud-assignment-api/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>com.yizhi</groupId>
+        <artifactId>assignment-project</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>cloud-assignment-api</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.yizhi</groupId>
+            <artifactId>cloud-common-api</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.yizhi</groupId>
+            <artifactId>cloud-util</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.yizhi</groupId>
+            <artifactId>cloud-core</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.mybatis.generator</groupId>
+                <artifactId>mybatis-generator-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/feign/ApiAssignmentExerciseBookClient.java

+package com.yizhi.assignment.application.feign;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.yizhi.assignment.application.vo.entity.AssignmentAnswerTipoff;
+import com.yizhi.assignment.application.vo.AssignmentStudentExerciseBookListVO;
+import com.yizhi.assignment.application.vo.apivo.ApiAssignmentCommentVO;
+import io.swagger.annotations.ApiParam;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @ClassName ApiAssignmentExerciseBookClient
+ * @Description TODO
+ * @Author shengchenglong
+ * @DATE 2019-10-22 11:15
+ * @Version 1.0
+ */
+@FeignClient(name = "assignment", contextId = "ApiAssignmentExerciseBookClient")
+public interface ApiAssignmentExerciseBookClient {
+
+    @GetMapping("/remote/api/assignment/exerciseBook/page")
+    Page<AssignmentStudentExerciseBookListVO> list(
+            @ApiParam("作业id") @RequestParam("assignmentId") Long assignmentId,
+            @ApiParam("要跳转的页数") @RequestParam(name = "pageNo", defaultValue = "1") int pageNo,
+            @ApiParam("每页条数，默认：10") @RequestParam(name = "pageSize", defaultValue = "10") int pageSize);
+    @GetMapping("/remote/api/assignment/exerciseBook/thumbUp")
+    boolean thumbup(@RequestParam("assignmentAnswerId") Long assignmentAnswerId,
+                    @RequestParam("isThumbUp") boolean isThumbUp);
+
+    @GetMapping("/remote/api/assignment/exerciseBook/comment/page")
+    Page<ApiAssignmentCommentVO> commentPage(
+            @RequestParam("assignmentAnswerId") Long assignmentAnswerId,
+            @ApiParam("要跳转的页数") @RequestParam(name = "pageNo", defaultValue = "1") int pageNo,
+            @ApiParam("每页条数，默认：10") @RequestParam(name = "pageSize", defaultValue = "10") int pageSize);
+
+    @GetMapping("/remote/api/assignment/exerciseBook/comment/add")
+    Boolean commentAdd(
+            @RequestParam("assignmentAnswerId") Long assignmentAnswerId,
+            @RequestParam(name = "parentCommentId", required = false) Long parentCommentId,
+            @RequestParam("content") String content);
+
+    @PostMapping("/remote/api/assignment/exerciseBook/tipoff")
+    Boolean tipoff(@RequestBody AssignmentAnswerTipoff record);
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/feign/AssignmentStudentClient.java

+package com.yizhi.assignment.application.feign;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.yizhi.assignment.application.vo.AssignmentCalendarVO;
+import com.yizhi.assignment.application.vo.CalendarTaskParamVo;
+import com.yizhi.assignment.application.vo.apivo.*;
+import com.yizhi.assignment.application.vo.entity.Assignment;
+import io.swagger.annotations.ApiParam;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+@FeignClient(name="assignment", contextId = "AssignmentStudentClient")
+public interface AssignmentStudentClient {
+	
+	
+	@GetMapping("/remote/api/assignment/my/answer/zip")
+	public String getStudentAnswerZipByAnswerId(@RequestParam(name="assignmentId")Long assignmentId,@RequestParam(name="answerId")Long answerId);
+	
+	
+	/**
+	 * 分页查询作业列表
+	 * @param type
+	 * @param pageNo
+	 * @param pageSize
+	 * @return
+	 */
+	@GetMapping("/remote/api/assignment/my/list")
+    public Page<ApiAssignmentListResultVO> list(@RequestParam(name = "type", defaultValue = "1") int type, @RequestParam(name = "pageNo", defaultValue = "1") int pageNo, @RequestParam(name = "pageSize", defaultValue = "10") int pageSize, @RequestParam(name = "accountId") Long accountId, @RequestParam(name = "relationIds") List<Long> relationIds, @RequestParam(name = "companyId") Long companyId, @RequestParam(name = "siteId") Long siteId);
+	
+	
+	
+	/**
+	 * 根据名字关键字查询
+	 * @param name
+	 * @param pageNo
+	 * @param pageSize
+	 * @return
+	 */
+	@GetMapping("/remote/api/assignment/my/list/search")
+    public Page<ApiAssignmentListResultVO> listSearch(@RequestParam(name = "name",required=false) String name,@RequestParam(name = "pageNo", defaultValue = "1") int pageNo,@RequestParam(name = "pageSize", defaultValue = "10") int pageSize,@RequestParam(name = "accountId") Long accountId,@RequestParam(name = "relationIds") List<Long> relationIds,@RequestParam(name = "siteId") Long siteId);
+	
+	
+	
+	/**
+	 * 答案列表
+	 * @param assignmentId
+	 * @param accountId
+	 * @return
+	 */
+	@GetMapping("/remote/api/assignment/my/answer/list")
+	public ApiAssignmentAnswerResultVo answerList(@RequestParam(name = "assignmentId") Long assignmentId,
+												  @RequestParam(name = "accountId") Long accountId);
+	
+	
+	/**
+	 * 查看作业以及自己的某一份答案详细信息
+	 * @param assignmentId 
+	 * @return
+	 */
+	 @GetMapping("/remote/api/assignment/my/toAssignment")
+	 public ApiAssignmentDetailsVo toAssignment(@RequestParam(name = "assignmentId") Long assignmentId, @RequestParam(name = "answerId") Long answerId, @RequestParam(name = "accountId") Long accountId);
+	 
+	 /**
+	  * 活动用
+	  * @param assignmentId
+	  * @return
+	  */
+	 @GetMapping("/remote/api/assignment/my/toAssignmentActivity")
+	 public Assignment toAssignmentActivity(@RequestParam(name = "assignmentId") Long assignmentId);
+	 
+	 /**
+	  * 查看作业详细信息
+	  * @param assignmentId
+	  * @return
+	  */
+	 @GetMapping("/remote/api/assignment/my/getAssignment")
+	 public ApiAssignmentVO getAssignment(@RequestParam(name = "assignmentId") Long assignmentId, @RequestParam(name = "accountId") Long accountId);
+	
+	 
+	 @PostMapping("/remote/api/assignment/my/can/submit")
+	 public Integer canSubmit(@RequestBody ApiAssignmentAswerVO assignmentAswerVO);
+	 
+	 
+	 /**
+	  * 作业提交
+	  * @param assignmentAswerVO
+	  * @return
+	  */
+	 @PostMapping("/remote/api/assignment/my/submit")
+	 public Boolean submit(@RequestBody ApiAssignmentAswerVO assignmentAswerVO);
+	 
+	 
+	 
+	 /**
+	  * 查看作业评阅
+	  * @return
+	  */
+	 @GetMapping("/remote/api/assignment/my/suggestion/get")
+	 public ApiSuggestionVo getSuggesstion(@RequestParam(name = "assignmentId") Long assignmentId,@RequestParam(name = "accountId") Long accountId);
+	 
+	 
+	 
+	 @GetMapping("/remote/api/assignment/my/list/search/others")
+	 public List<ToOthersApi> listSearchOthers(
+	 		@RequestParam(name = "name",required=false) String name,
+			@RequestParam(name = "pageNo", defaultValue = "1") int pageNo,
+			@RequestParam(name = "pageSize", defaultValue = "10") int pageSize,
+			@RequestParam(name = "accountId") Long accountId,
+			@RequestParam(name = "relationIds") List<Long> relationIds,
+			@RequestParam(name = "siteId") Long siteId
+	 );
+
+	 
+	 /**
+	  * 根据id查询到这个账号下的作业个数
+	  * @param accountId
+	  * @return
+	  */
+	 @GetMapping("/remote/api/assignment/my/assignment/num")
+	 public Integer getAssignmentNumByAccountId(@ApiParam(name="relationIds",value="关联ids")@RequestParam(name="relationIds",required=false)List<Long> relationIds,
+			 @ApiParam(name="siteId",value="站点id")@RequestParam(name="siteId",required=true)Long siteId,
+			 @ApiParam(name="accountId",value="账号id")@RequestParam(name="accountId",required=true)Long accountId);
+	 
+	 
+	 /**
+	  * 培训项目积分
+	  * @param ids
+	  * @return
+	  */
+	 @GetMapping("/remote/api/assignment/training/point")
+	 public Map<String,Integer> getTrainingPoint(@RequestParam(name = "ids") List<Long> ids);
+
+	/**
+	 * 日历任务获取作业列表
+
+	 */
+	@PostMapping("/remote/api/assignment/getPageToCalendar")
+	public Page<AssignmentCalendarVO> getPageToCalendar(@ApiParam("paramVo") @RequestBody CalendarTaskParamVo paramVo);
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/feign/ManageAssignmentExerciseBookClient.java

+package com.yizhi.assignment.application.feign;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.yizhi.assignment.application.vo.entity.AssignmentAnswerTipoff;
+import com.yizhi.assignment.application.vo.TipoffAssignmentListVO;
+import com.yizhi.assignment.application.vo.apivo.ApiAssignmentCommentVO;
+import io.swagger.annotations.ApiParam;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * @ClassName AssignmentExpriceBookController
+ * @Description TODO
+ * @Author shengchenglong
+ * @DATE 2019-10-22 11:15
+ * @Version 1.0
+ */
+@FeignClient(value = "assignment", contextId = "ManageAssignmentExerciseBookClient")
+public interface ManageAssignmentExerciseBookClient {
+
+    @GetMapping("/remote/manage/assignment/exerciseBook/answer/down")
+    public boolean answerDown(@RequestParam("answerId") Long answerId, @RequestParam("isDown") Integer isDown);
+
+    @GetMapping("/remote/manage/assignment/exerciseBook/answer/delete")
+    public boolean answerDelete(@RequestParam("answerId") Long answerId);
+
+    @GetMapping("/remote/manage/assignment/exerciseBook/comment/page")
+    public Page<ApiAssignmentCommentVO> commentPage(
+            @RequestParam("assignmentAnswerId") Long assignmentAnswerId,
+            @ApiParam("要跳转的页数") @RequestParam(name = "pageNo", defaultValue = "1") int pageNo,
+            @ApiParam("每页条数，默认：10") @RequestParam(name = "pageSize", defaultValue = "10") int pageSize
+    );
+
+
+    @GetMapping("/remote/manage/assignment/exerciseBook/comment/delete")
+    boolean commentDelete(@RequestParam("commentId") Long commentId);
+
+    @GetMapping("/remote/manage/assignment/exerciseBook/comment/audit")
+    public boolean commentAudit(@RequestParam("commentId") Long commentId, @RequestParam("auditStatus") Integer auditStatus);
+
+    @GetMapping("/remote/manage/assignment/exerciseBook/tipoff/answer/page")
+    public Page<TipoffAssignmentListVO> tipoffAnswerPage(
+            @RequestParam("assignmentName") String assignmentName,
+            @ApiParam("要跳转的页数") @RequestParam(name = "pageNo", defaultValue = "1") int pageNo,
+            @ApiParam("每页条数，默认：10") @RequestParam(name = "pageSize", defaultValue = "10") int pageSize);
+
+    @GetMapping("/remote/manage/assignment/exerciseBook/tipoff/page")
+    public Page<AssignmentAnswerTipoff> tipoffPage(
+            @RequestParam("answerId") Long answerId,
+            @ApiParam("要跳转的页数") @RequestParam(name = "pageNo", defaultValue = "1") int pageNo,
+            @ApiParam("每页条数，默认：10") @RequestParam(name = "pageSize", defaultValue = "10") int pageSize);
+
+    @GetMapping("/remote/manage/assignment/exerciseBook/tipoff/remove")
+    public Boolean tipoffRemove(
+            @RequestParam("tipoffId") Long tipoffId);
+
+    @GetMapping("/remote/manage/assignment/exerciseBook/comment/export")
+    public String commentExport(@RequestParam("answerId") Long answerId);
+
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/feign/MinimbaClient.java

+package com.yizhi.assignment.application.feign;
+
+import com.yizhi.assignment.application.vo.MinimbaStudyRecordVO;
+import com.yizhi.assignment.application.vo.MinimbaUserDetailParamVO;
+import com.yizhi.assignment.application.vo.MinimbaUserDetailVO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+
+/**
+ * 复旦minimba feign接口
+ *
+ * @author dingxiaowei
+ */
+@FeignClient(name = "assignment", contextId = "MinimbaClient")
+public interface MinimbaClient {
+
+    /**
+     * 复旦minimba项目获取用户打卡,点赞信息
+     *
+     * @param paramVO
+     * @return
+     */
+    @PostMapping("/remote/assignment/minimba/userDetails")
+    MinimbaUserDetailVO getUserDetails(@RequestBody MinimbaUserDetailParamVO paramVO);
+
+    /**
+     * 点一个项目,该用户的学习记录
+     * @param projectId
+     * @return
+     */
+    @GetMapping("/remote/assignment/minimba/studyingRecords")
+    List<MinimbaStudyRecordVO> getProjectStudyingRecords(@RequestParam("projectId") Long projectId);
+
+
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/AccessoryVO.java

+package com.yizhi.assignment.application.vo;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 复旦mini mba作业类
+ * @author ding
+ *
+ */
+@Data
+@Api(tags = "AssignmentListVO", description = "复旦mini mba作业附件类")
+public class AccessoryVO {
+
+
+	@ApiModelProperty(value = "附件名称")
+	private String accessoryName;
+
+	@ApiModelProperty("附件url")
+	private String accessoryUrl;
+
+	@ApiModelProperty("附件大小")
+	private String accessorySize;
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/AnswerListVo.java

+package com.yizhi.assignment.application.vo;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+
+@Data
+@Api(tags = "AnswerListVo")
+public class AnswerListVo {
+
+    @ApiModelProperty(name = "assignmentId", value = "老师布置作业的id")
+    private Long assignmentId;
+
+    @ApiModelProperty(name = "state", value = "批阅状态（1:待阅，2：已阅,不传则为所有）")
+    private Integer state;
+
+    @ApiModelProperty(name = "name", value = "用户名/姓名/标签")
+    private String name;
+
+    @ApiModelProperty(name = "keywords", value = "部门关键字")
+    private String keywords;
+
+    @ApiModelProperty(name = "type", value = "1.提交时间；2 用户名")
+    private Integer type;
+
+    @ApiModelProperty(name = "pageNo", value = "要跳转的页数")
+    private Integer pageNo;
+
+    @ApiModelProperty(name = "pageSize", value = "每页的条数")
+    private Integer pageSize;
+
+    private List<Long> accountIds;
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/AnswersDownVO.java

+package com.yizhi.assignment.application.vo;
+
+import java.util.Date;
+import java.util.List;
+import com.yizhi.assignment.application.vo.entity.AssignmentAnswerFile;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 显示老师布置的作业列表
+ * @author wangfeida
+ *
+ */
+@Data
+@Api(tags = "AnswersDownVO", description = "批量下载的vo")
+public class AnswersDownVO {
+	
+	@ApiModelProperty(name="accountName",value="accountName")
+	private String accountName;     //用户名
+	
+	@ApiModelProperty(name="assignmentName",value="assignmentName")
+	private String assignmentName;     //作业名字
+	
+	@ApiModelProperty(name="作业来源（1本地2做课）",value="source")
+	private Integer source;     //来源
+	
+	@ApiModelProperty(name="答案提交时间",value="commitTime")
+	private Date commitTime;
+	
+	
+	@ApiModelProperty(name="accountId",value="accountId")
+	private List<AssignmentAnswerFile> list;
+
+
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/AssignmentAnswerContentVO.java

+/**
+ * Project Name:cloud-assignment
+ * File Name:AssignmentCommentVO.java
+ * Package Name:com.yizhi.application.vo
+ * Date:2018年3月7日下午6:11:11
+ * Copyright (c) yizhi.
+ *
+*/
+
+package com.yizhi.assignment.application.vo;
+
+import java.util.List;
+
+import com.yizhi.assignment.application.vo.entity.AssignmentAnswerFile;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * ClassName:AssignmentCommentVO
+ * 作业批阅VO
+ * Date:     2018年3月7日 下午6:11:11 
+ * @author   lilingye
+ * @version  
+ * @since    JDK 1.8 
+ */
+@Data
+@Api(tags = "AssignmentAnswerContentVO", description = "老师批阅作业")
+public class AssignmentAnswerContentVO {
+	
+	/*
+	 * answerId 作业提交id;
+	 */
+	@ApiModelProperty(name="answerId",value = "作业提交id",required=true)
+	private Long answerId;
+	/*
+	 * 作业分数
+	 */
+	@ApiModelProperty(name="score",value = "作业分数",required=true)
+	private Integer score;
+	
+	/*
+	 * 评语
+	 */
+	@ApiModelProperty(name="comment",value = "评语",required=false)
+	private String comment;
+
+	/**
+	 * 文件路径
+	 */
+	@ApiModelProperty(name="反馈文件的路径",required=false)
+	private List<AssignmentAnswerFile> listFeedBackFiles;
+	
+
+	@ApiModelProperty(name="accountId",value = "用户id,前端不传",required=false)
+	private Long accountId;
+	
+	@ApiModelProperty(name="accountName",value = "用户姓名,前端不传",required=false)
+	private String accountName;
+
+}
+

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/AssignmentAnswerDownloadVO.java

+package com.yizhi.assignment.application.vo;
+
+import java.util.List;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@Api(tags = "AssignmentAnswerDownloadVO", description = "批量下载学生作业")
+public class AssignmentAnswerDownloadVO {
+	
+	@ApiModelProperty(name="ids",value="学生的作业答案id")
+	private List<Long> ids;
+
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/AssignmentAnswerExport.java

+package com.yizhi.assignment.application.vo;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@Api(tags = "AssignmentAnswerExport", description = "导出学生作业")
+public class AssignmentAnswerExport {
+
+	@ApiModelProperty(name="answerId",value="答案Id")
+	private Long answerId;
+	
+	
+	@ApiModelProperty(name="accountId",value="账号id")
+	private Long accountId;
+	
+	@ApiModelProperty(name="accountName",value="用户名")
+	private String accountName;
+	
+	@ApiModelProperty(name="realName",value="姓名")
+	private String realName; 	
+	
+	
+	@ApiModelProperty(name="departName",value="所在部门")
+	private String departName;
+	
+	
+	@ApiModelProperty(name="commitTime",value="提交时间")
+	private Date commitTime;
+	
+	@ApiModelProperty(name="state",value="批阅状态")
+	private Integer state;
+	
+	@ApiModelProperty(name="lastReadTime",value="最后批阅时间")
+	private Date lastReadTime;
+	
+	@ApiModelProperty(name="score",value="作业成绩")
+	private Integer score;
+	
+	@ApiModelProperty(name="grade",value="作业等级")
+	private String grade;
+	
+	@ApiModelProperty(name="suggestion",value="作业评语")
+	private String suggestion;
+	
+	@ApiModelProperty(name="content",value="作业内容")
+	private String content;
+	
+	@ApiModelProperty(name="accountState",value="用户状态")
+	private String accountState;
+	
+	
+
+
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/AssignmentAnswerListExport.java

+package com.yizhi.assignment.application.vo;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AssignmentAnswerListExport {
+	
+	@ApiModelProperty(name="name",value="作业名字")
+	private String name;
+	
+	
+	@ApiModelProperty(name="type",value="评分类型(1：打分制，2：等级制)")
+	private Integer type;
+	
+	@ApiModelProperty(name="list",value="查询出来的结果")
+	private List<AssignmentAnswerExport> list;
+
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/AssignmentAnswerMarkingSelectVO.java

+package com.yizhi.assignment.application.vo;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@Api(tags = "AssignmentAnswerMarkingSelectVO", description = "获取单个学生作业信息")
+public class AssignmentAnswerMarkingSelectVO {
+
+    @ApiModelProperty(name = "assignmentId", value = "老师布置的作业id", required = true)
+    private Long assignmentId;
+
+
+    @ApiModelProperty(name = "assignmentAnswerId", value = "学生提交的作业id", required = true)
+    private Long assignmentAnswerId;
+    /**
+     * 新增条件查询所有的列表
+     */
+    @ApiModelProperty(name = "state", value = "批阅状态（1:待阅，2：已阅,不传则为所有）")
+    private Integer state;
+    @ApiModelProperty(name = "name", value = "用户名/姓名/标签")
+    private String name;
+    @ApiModelProperty(name = "department", value = "部门关键字")
+    private String department;
+    @ApiModelProperty(name = "type", value = "1.提交时间；2 用户名")
+    private Integer type;
+    /**
+     * 管辖区内用户列表
+     */
+    private List<Long> accountIds;
+
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/AssignmentCalendarVO.java

+package com.yizhi.assignment.application.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@ApiModel(value = "AssignmentCalendarVO", description = "")
+@Data
+public class AssignmentCalendarVO {
+
+	@ApiModelProperty(value = "id")
+	private Long id;
+
+	@ApiModelProperty(value = "名称")
+	private String name;
+
+	@ApiModelProperty(notes = "作业完成时间")
+	private Date finishTime;
+
+	@ApiModelProperty(value = "日历任务设置的开始时间")
+	private Date taskStartDate;
+
+	@ApiModelProperty(value = "日历任务设置的结束时间")
+	private Date taskEndDate;
+
+	@ApiModelProperty(value = "允许次数，允许参加的次数")
+	private Integer count;
+
+	@ApiModelProperty(value="状态：1、未提交  2、待批阅  3、未通过 4、已通过")
+	private Integer taskStatus;
+
+	@ApiModelProperty("业务按钮状态")
+	public List<String> taskButtonStatus;
+
+	@ApiModelProperty("业务状态标签")
+	public String taskTag;
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/AssignmentDeleteVO.java

+package com.yizhi.assignment.application.vo;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+@Data
+@Api(tags = "AssignmentDeleteVO", description = "删除作业入参")
+public class AssignmentDeleteVO {
+	@ApiModelProperty(name="assignmentId",value="作业主键id")
+	private Long assignmentId;     //主键id
+	
+	@ApiModelProperty(name="accountId",value="用户id",required=false)
+	private Long accountId;     //用户id
+	
+	@ApiModelProperty(name="accountName",value="用户名字",required=false)
+	private String accountName;     //用户名
+
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/AssignmentListVO.java

+package com.yizhi.assignment.application.vo;
+
+import java.util.Date;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 显示老师布置的作业列表
+ * @author wangfeida
+ *
+ */
+@Data
+@Api(tags = "AssignmentListVO", description = "老师布置的作业列表")
+public class AssignmentListVO {
+	
+	@ApiModelProperty(name="id",value="主键id")
+	private Long id;     //主键id
+	
+	
+	@ApiModelProperty(name="serialNum",value="作业序号")
+	private Long serialNum;     //作业序号
+	
+	@ApiModelProperty(name="name",value="作业名字")
+	private String name;  //作业名字
+	
+	@ApiModelProperty(name="traingProjectId",value="所属项目id")
+	private Long traingProjectId;   //所属项目id
+	
+	@ApiModelProperty(name="traingProjectName",value="所属项目名字")
+	private String traingProjectName;   //所属项目名字
+	
+	@ApiModelProperty(name="submitNum",value="作业提交数量")
+	private Integer submitNum;  //作业提交数量
+	
+	@ApiModelProperty(name="noRead",value="作业未批阅数量")
+	private Integer noRead;//  作业未批阅数量
+	
+	@ApiModelProperty(name="status",value="作业状态 状态(1：草稿，2：上架，3：下架)")
+	private Integer status;//作业状态
+	
+	@ApiModelProperty(name="endDate",value="要求完成时间")
+	private Date endDate;
+	
+	@ApiModelProperty(name="endDate",value="可见范围(1：平台用户可见，2：指定学员可见)，默认平台用户可见")
+	private Integer visibleRange;
+
+	@ApiModelProperty(name="image",value="作业封面")
+	private String image;  //作业名字
+
+
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/AssignmentListVoTo.java

+package com.yizhi.assignment.application.vo;
+
+import java.util.List;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@Api(tags = "AssignmentListVo", description = "管理端作业列表入参")
+public class AssignmentListVoTo {
+	
+	@ApiModelProperty(name="name",value="name",required=false)
+	private String name;   
+	
+	
+	
+	
+	@ApiModelProperty(name="source",value="0直接进来的  1 培训项目进来的 2投票进来",required=false)
+	private Integer source=0;
+	
+	@ApiModelProperty(name="pageNo",value="pageNo",required=false)
+	private Integer pageNo;     
+	
+	@ApiModelProperty(name="pageSize",value="pageSize",required=false)
+	private Integer pageSize;
+	
+	@ApiModelProperty(name="orgIds",value="orgIds",required=false)
+	private List<Long> orgIds;
+	
+	@ApiModelProperty(name="siteId",value="siteId",required=false)
+	private Long siteId;
+	
+	@ApiModelProperty(name="companyId",value="companyId",required=false)
+	private Long companyId;
+
+    private List<Long> accountIds;
+
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/AssignmentPageCommentVo.java

+package com.yizhi.assignment.application.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yizhi.assignment.application.vo.entity.CommentReply;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class AssignmentPageCommentVo {
+
+    private Long id;
+
+    @ApiModelProperty(value = "账号id")
+    private Long accountId;
+
+    @ApiModelProperty(value = "评论人")
+    private String commentator;
+
+    @ApiModelProperty(value = "评论内容")
+    private String content;
+
+    @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+
+    @ApiModelProperty(value = "点赞数")
+    private Integer thumbsUps;
+
+    @ApiModelProperty(value = "用户头像")
+    private String userAvatar;
+
+    @ApiModelProperty(value = "是否点赞 1 是 0否")
+    private Integer status;
+
+    @ApiModelProperty(value = "是否已经点赞")
+    private Boolean hasThumbsUp;
+
+    @ApiModelProperty(value = "回复数")
+    private Integer replys;
+
+    @ApiModelProperty(value = "回复列表")
+    List<CommentReply> commentReplies = new ArrayList<>();
+
+    @ApiModelProperty(value = "姓名")
+    private String commentatorName;
+
+    @ApiModelProperty("状态(0：上架|1：下架  默认为0)")
+    private Integer state;
+
+    @ApiModelProperty(value = "评论对象")
+    private String replyName;
+
+
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/AssignmentQXVO.java

+package com.yizhi.assignment.application.vo;
+
+import java.util.List;
+import com.yizhi.assignment.application.vo.entity.AssignmentStudent;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@Data
+public class AssignmentQXVO {
+	
+	@ApiModelProperty(name="作业名字",value="作业名字")
+	private String name;
+	
+	@ApiModelProperty(name="siteId",value="站点id")
+	private Long siteId;
+	
+	@ApiModelProperty(name="visibleRange",value="可见范围(1：平台用户可见，2：指定学员可见)，默认平台用户可见")
+	private Integer visibleRange;
+	
+	@ApiModelProperty(name="指定范围的组织，用户，用户组",value="指定范围的组织，用户，用户组")
+	private List<AssignmentStudent> listStudent;
+	
+	@ApiModelProperty(name="已经提交的作业人员",value="已经提交的作业人员")
+	private List<Long> listSubmitAccountId;
+
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/AssignmentReadListVO.java

+package com.yizhi.assignment.application.vo;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@Api(tags = "AssignmentReadListVO", description = "老师布置单个作业，显示学生作业列表")
+public class AssignmentReadListVO {
+
+    @ApiModelProperty(name = "", value = "主键id")
+    private Long id;
+
+    @ApiModelProperty(name = "accountName", value = "用户名")
+    private String accountName;
+
+    @ApiModelProperty(name = "realName", value = "真实姓名")
+    private String realName;
+
+    @ApiModelProperty(name = "createTime", value = "作业提交时间")
+    private Date createTime;
+
+    @ApiModelProperty(name = "score", value = "分数")
+    private Integer score;
+
+    @ApiModelProperty(name = "gradeName", value = "等级")
+    private String gradeName;
+
+    @ApiModelProperty(name = "type", value = "1分数2等级")
+    private Integer type;
+
+    @ApiModelProperty(name = "status", value = "评阅状态(1:待阅,2:已阅)")
+    private Integer status;
+
+    @ApiModelProperty(name = "accountId", value = "用户id")
+    private Long accountId;
+
+
+
+    @ApiModelProperty(value = "点赞数")
+    private int thumbupTimes;
+
+    @ApiModelProperty(value = "评论数")
+    private int commentTimes;
+
+    @ApiModelProperty(value = "作业状态0上架,1下架")
+    private Integer down;
+
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/AssignmentSaveParamVo.java

+package com.yizhi.assignment.application.vo;
+
+import com.yizhi.assignment.application.vo.entity.AssignmentFile;
+import com.yizhi.assignment.application.vo.entity.AssignmentGrade;
+import com.yizhi.assignment.application.vo.entity.AssignmentPoint;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 新建作业
+ *
+ * @author wangfeida
+ */
+@Data
+@Api(tags = "AssignmentSaveParamVo", description = "新建作业入参vo类")
+public class AssignmentSaveParamVo {
+
+    @ApiModelProperty(name = "style", value = "1是保存 2是修改", required = true)
+    private Integer style;
+
+    @ApiModelProperty(name = "id", value = "作业id", required = true)
+    private Long id;
+
+    @ApiModelProperty(name = "name", value = "作业名称", required = true)
+    private String name;
+
+    @ApiModelProperty(name = "content", value = "作业内容", required = true)
+    private String content;
+
+    @ApiModelProperty(name = "finishTime", value = "作业完成时间，如果不限制则不传，如果限制则传 格式2038-01-01 00:00:00", required = false)
+    private String finishTime;
+
+    @ApiModelProperty(name = "amendable", value = "是否支持补交(0：否，1：是)，默认是", required = true)
+    private Integer amendable;
+
+    @ApiModelProperty(value = "是否启用提醒 1:启用 0：关闭")
+    private Integer enableRemind;
+
+    @ApiModelProperty(name = "count", value = "提交次数", required = false)
+    private Integer count;
+
+    @ApiModelProperty(name = "visibleRange", value = "可见范围(1：平台用户可见，2：指定学员可见)，默认平台用户可见", required = true)
+    private Integer visibleRange;
+
+    @ApiModelProperty(name = "fileUrlList", value = "作业文件url", required = false)
+    List<AssignmentFile> fileUrlList;
+
+    @ApiModelProperty(name = "passScore", value = "合格分", required = true)
+    private Integer passScore;
+
+    @ApiModelProperty(name = "type", value = "1打分制，2等级制", required = true)
+    private Integer type;
+
+    @ApiModelProperty(name = "listGrade", value = "如果type=2等级制度集合,如果是打分，则不写", required = false)
+    private List<AssignmentGrade> listGrade;
+
+    @ApiModelProperty(name = "listPoint", value = "可获得积分,沒有设置则不填", required = false)
+    private List<AssignmentPoint> listPoint;
+
+    @ApiModelProperty(name = "trainingProjectId", value = "作业所属项目id,前端不传", required = false)
+    private Long trainingProjectId;
+
+    @ApiModelProperty(name = "accountId", value = "用户id，前端不传", required = false)
+    private Long accountId;
+
+    @ApiModelProperty(name = "accountName", value = "用户名，前端不传", required = false)
+    private String accountName;
+
+    @ApiModelProperty(name = "companyId", value = "公司id，前端不传", required = false)
+    private Long companyId;
+
+    @ApiModelProperty(name = "siteId", value = "站点id，前端不传", required = false)
+    private Long siteId;
+
+    @ApiModelProperty(name = "orgId", value = "组织机构id，前端不传", required = false)
+    private Long orgId;
+
+    @ApiModelProperty(value = "各个业务设置提醒时的数据")
+    private MessageRemindVo messageRemindVo;
+
+    @ApiModelProperty(notes = "答案字数区间-最小值")
+    private Integer answerCharaterNumMin;
+
+    @ApiModelProperty(notes = "答案字数区间-最大值")
+    private Integer answerCharaterNumMax;
+
+    @ApiModelProperty(notes = "附件个数区间-最小值")
+    private Integer answerAttachmentNumMin;
+
+    @ApiModelProperty(notes = "附件个数区间-最大值")
+    private Integer answerAttachmentNumMax;
+
+    @ApiModelProperty(notes = "学员端是否显示评阅结果和评阅状态，0不显示，1显示")
+    private Integer showRes;
+
+    @ApiModelProperty(notes = "是否启用作业本，0否，1是")
+    private Integer enableExerciseBook;
+
+    @ApiModelProperty(notes = "关键字,逗号分隔")
+    private String keywords;
+
+    @ApiModelProperty(notes = "图片")
+    private String image;
+
+
+    @ApiModelProperty(value = "是否启用在日历任务中显示")
+    private Integer enableTask;
+
+    @ApiModelProperty(value = "日历任务设置的开始时间")
+    private Date taskStartDate;
+
+    @ApiModelProperty(value = "日历任务设置的结束时间")
+    private Date taskEndDate;
+
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/AssignmentSelectVo.java

+package com.yizhi.assignment.application.vo;
+
+import com.yizhi.assignment.application.vo.entity.AssignmentFile;
+import com.yizhi.assignment.application.vo.entity.AssignmentGrade;
+import com.yizhi.assignment.application.vo.entity.AssignmentPoint;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+@Api(tags = "AssignmentSelectVo", description = "查看老师作业详细信息")
+public class AssignmentSelectVo {
+
+    @ApiModelProperty(name = "id", value = "主键id")
+    private Long id;
+
+    @ApiModelProperty(name = "name", value = "作业名称")
+    private String name;
+
+    @ApiModelProperty(name = "content", value = "内容")
+    private String content;
+
+    @ApiModelProperty(name = "", value = "老师布置得文件")
+    private List<AssignmentFile> assignmentFiles;
+
+    @ApiModelProperty(name = "finishTime", value = "作业完成时间")
+    private Date finishTime;
+
+    @ApiModelProperty(name = "amendable", value = "是否支持补交(0：否，1：是)，默认否")
+    private Integer amendable;  //是否支持补交(0：否，1：是)，默认否
+
+    @ApiModelProperty(name = "visibleRange", value = "可见范围(1：平台用户可见，2：指定学员可见)，默认平台用户可见")
+    private Integer visibleRange;  //可见范围
+
+    @ApiModelProperty(value = "是否启用提醒 1:启用 0：关闭")
+    private Integer enableRemind;
+
+    @ApiModelProperty(name = "type", value = "1打分制，2等级制")
+    private Integer type;
+
+    @ApiModelProperty(name = "listGrade", value = "如果type=2等级制度集合,如果是打分，则不写")
+    private List<AssignmentGrade> listGrade;
+
+    @ApiModelProperty(name = "listPoint", value = "可获得积分,沒有设置则不写")
+    private List<AssignmentPoint> listPoint;
+
+    @ApiModelProperty(name = "passScore", value = "合格分")
+    private Integer passScore;
+
+    @ApiModelProperty(name = "count", value = "提交次数")
+    private Integer count;
+
+
+    @ApiModelProperty(notes = "答案字数区间-最小值")
+    private Integer answerCharaterNumMin;
+
+    @ApiModelProperty(notes = "答案字数区间-最大值")
+    private Integer answerCharaterNumMax;
+
+    @ApiModelProperty(notes = "附件个数区间-最小值")
+    private Integer answerAttachmentNumMin;
+
+    @ApiModelProperty(notes = "附件个数区间-最大值")
+    private Integer answerAttachmentNumMax;
+
+    @ApiModelProperty(notes = "学员端是否显示评阅结果和评阅状态，0不显示，1显示")
+    private Integer showRes;
+
+    @ApiModelProperty(notes = "是否启用作业本，0否，1是")
+    private Integer enableExerciseBook;
+
+    @ApiModelProperty(notes = "关键字,逗号分隔")
+    private String keywords;
+
+    @ApiModelProperty(notes = "logo图片")
+    private String image;
+
+    @ApiModelProperty(value = "是否启用在日历任务中显示")
+    private Integer enableTask;
+
+    @ApiModelProperty(value = "日历任务设置的开始时间")
+    private Date taskStartDate;
+
+    @ApiModelProperty(value = "日历任务设置的结束时间")
+    private Date taskEndDate;
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/AssignmentStudentExerciseBookListVO.java

+package com.yizhi.assignment.application.vo;
+
+import com.yizhi.assignment.application.vo.apivo.ApiFileVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @ClassName AssignmentExerciseBookListVO
+ * @Description TODO
+ * @Author shengchenglong
+ * @DATE 2019-10-22 11:26
+ * @Version 1.0
+ */
+@Data
+@ApiModel("学员端-作业本-列表VO")
+public class AssignmentStudentExerciseBookListVO {
+
+    @ApiModelProperty("提交作业的id")
+    private Long assignmentAnswerId;
+
+    @ApiModelProperty("提交次数")
+    private int commitNum;
+
+    @ApiModelProperty("提交时间")
+    private Date commitTime;
+
+    @ApiModelProperty("提交人")
+    private String accountName;
+
+    @ApiModelProperty("作业提交内容")
+    private String content;
+
+    @ApiModelProperty("点赞次数")
+    private int thumbpsTimes;
+
+    @ApiModelProperty("提交人头像")
+    private String headPortrait;
+
+    @ApiModelProperty("是否对该作业本点过赞")
+    private boolean hasThumbUp;
+
+    @ApiModelProperty("附件列表")
+    private List<ApiFileVo> fileVos;
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/AssignmentUpAndDownVO.java

+package com.yizhi.assignment.application.vo;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@Api(tags = "AssignmentUpAndDownVO", description = "作业上架下架入参")
+public class AssignmentUpAndDownVO {
+	@ApiModelProperty(name="id",value="作业id",required=true)
+	private Long id;
+	
+	@ApiModelProperty(name="id",value="作业现在的状态状态(2：上架，3：下架)",required=true)
+	private Integer status;
+	
+	@ApiModelProperty(name="accountId",value="用户id",required=false)
+	private Long accountId;     //用户id
+	
+	@ApiModelProperty(name="accountName",value="用户名字",required=false)
+	private String accountName;     //用户名
+
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/CalendarTaskParamVo.java

+package com.yizhi.assignment.application.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class CalendarTaskParamVo {
+
+
+    @ApiModelProperty("时间参数")
+    public Date date;
+
+    @ApiModelProperty("业务类型")
+    public Integer taskType = 0;
+
+    @ApiModelProperty("当前页数")
+    public Integer pageNo;
+
+    @ApiModelProperty("页内条数")
+    public Integer pageSize;
+
+
+}
+

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/DownloadAnswerVO.java

+package com.yizhi.assignment.application.vo;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class DownloadAnswerVO {
+	
+	@ApiModelProperty("作业id")
+	private Long assignmentId;
+	
+	@ApiModelProperty("答案ids")
+	private List<Long> answerIds;
+
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/ListAuditor.java

+package com.yizhi.assignment.application.vo;
+
+import java.util.List;
+
+import com.yizhi.core.application.context.RequestContext;
+import com.yizhi.assignment.application.vo.entity.AssignmentAuditor;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@Api(tags = "ListAuditor", description = "评阅人")
+public class ListAuditor {
+	
+	@ApiModelProperty(name="assignmentId",value="作业id",required=true)
+	private Long assignmentId;
+	
+	
+	@ApiModelProperty(name="listAuditor人",value="评阅人详细信息",required=true)
+	private List<AssignmentAuditor> listAuditor;
+	
+	@ApiModelProperty(name="contextHolder人",value="上下文对象",required=true)
+	private RequestContext contextHolder;
+
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/ListStudent.java

+package com.yizhi.assignment.application.vo;
+
+import java.util.List;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@Api(tags = "ListStudent", description = "学生")
+public class ListStudent {
+	
+	@ApiModelProperty(name="assignmentId",value="作业id")
+	private Long assignmentId;
+	
+	@ApiModelProperty(name="listAccountId",value="idList",required=false)
+	private List<StudentVo> listAccountId;
+	
+	
+	@ApiModelProperty(name="accountId",value = "当前登陆人用户id",required=true)
+	private Long accountId;
+	
+	@ApiModelProperty(name="accountName",value = "当前登陆人用户姓名",required=true)
+	private String accountName;
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/MessageRemindVo.java

+package com.yizhi.assignment.application.vo;
+
+import com.yizhi.core.application.context.RequestContext;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author hutao123
+ * @since 2019-09-09
+ */
+@Data
+@Api(tags = "MessageRemindVo", description = "各个业务设置提醒时的数据")
+public class MessageRemindVo implements Serializable {
+    private static final long serialVersionUID  = -7621642684091133619l;
+
+    @ApiModelProperty(value = "提醒id  ")
+    private Long id;
+
+    @ApiModelProperty(value = "消息id")
+    private Long messageId;
+
+    @ApiModelProperty(value = "消息类型：1、自定义消息；2、系统消息；3、事件触发消息")
+    private Integer messageType;
+
+    @ApiModelProperty(value = "用户id  主要用于触发消息 个人完成发消息类型")
+    private Long accountId;
+
+    @ApiModelProperty(value = "消息内容（完整版）")
+    private String messageContext;
+
+    @ApiModelProperty(value = "关联模块类型(1：学习计划、2：考试、3：调研、4、投票5：报名、6：作业、7：签到、8：项目、9：直播、10：积分)")
+    private Integer relationType;
+
+    @ApiModelProperty(value = "关联的业务id: 比如调研id")
+    private Long relationId;
+
+    @ApiModelProperty(value = "发送方式：1、站内信；2、短信；3、邮件")
+    private Integer sendType;
+
+    @ApiModelProperty(value = "该业务提醒是被关闭，关闭则为true，默认false")
+    private Boolean hasDeleted = false;
+
+    @ApiModelProperty(value = "该业务提醒是否有变化，有则为true，默认false")
+    private Boolean isChangge = false;
+
+    @ApiModelProperty(value = "专门存放提醒时间设置")
+    private List<MessageTaskRemindVo> messageTaskRemindVos = new ArrayList<>();
+
+    @ApiModelProperty(value = "目前只有培训项目需要，计划同步项目可见范围")
+    private Boolean visibleRangeUpdate = false;
+
+    @ApiModelProperty(value = "指定范围(0:全平台,1:指定用户)")
+    private Integer visibleRange;
+
+    @ApiModelProperty(value = "业务参数对象")
+    private TaskVo taskVo;
+
+    @ApiModelProperty(value = "触发消息专用 发送时间")
+    private Date sendTime;
+
+    @ApiModelProperty(value = "是否设置为上架状态")
+    private Boolean hasUp = false;
+
+    @ApiModelProperty(value = "是否是 修改业务状态 ")
+    private Boolean taskStatusUpdate = false;
+
+    @ApiModelProperty(value = "业务状态  1：才允上架许发送（业务上架）0：不允许发送（业务非上架）  仅针对于系统消息")
+    private Integer taskStatus;
+
+    @ApiModelProperty(value = "上下文 必传，主要需要 siteId companyId accountId  accountName 都不能是空")
+    private RequestContext requestContext;
+
+    @ApiModelProperty(value = "调研是否为复制类型")
+    private Boolean isCopy = false;
+
+    @ApiModelProperty(value = "复制调研时，旧的调研id")
+    private Long oldRelationId;
+
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/MessageTaskRemindVo.java

+package com.yizhi.assignment.application.vo;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author hutao123
+ * @since 2019-09-09
+ */
+@Data
+@Api(tags = "MessageTaskRemindVo", description = "各个业务设置提醒时的数据")
+public class MessageTaskRemindVo implements Serializable {
+
+    @ApiModelProperty(value = "待发消息id")
+    private Long messageRemindId;
+
+    @ApiModelProperty(value = "提醒时间事件类型 1：业务开始时间、 2：业务结束时间、3：自定义时间")
+    private Integer timeEventType;
+
+    @ApiModelProperty(value = "发生时间枚举：1：五分钟前、2：十分钟前、3：三十分钟前、4：一个小时前、5：两个小时前、6：一天前、7：两天前")
+    private Integer timeType;
+
+    @ApiModelProperty(value = "最终发送时间")
+    private Date sendTime;
+
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/MinimbaAssignmentVO.java

+package com.yizhi.assignment.application.vo;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 复旦mini mba作业类
+ * @author wangfeida
+ *
+ */
+@Data
+@Api(tags = "AssignmentListVO", description = "复旦mini mba作业类")
+public class MinimbaAssignmentVO {
+
+	@ApiModelProperty(value = "作业提交内容")
+	private String content;
+
+	@ApiModelProperty(value = "作业提交时间")
+	private Date submitTime;
+
+	@ApiModelProperty(value = "被点赞数")
+	private Integer admireNum;
+
+	@ApiModelProperty(value = "被评论数")
+	private Integer commentNum;
+
+	@ApiModelProperty(value = "附件列表")
+	private List<AccessoryVO> accessoryVOList;
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/MinimbaStudyRecordVO.java

+package com.yizhi.assignment.application.vo;
+
+import io.swagger.annotations.Api;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 复旦mini mba项目学习记录类
+ *
+ * @author DING
+ */
+@Data
+@Api(tags = "AssignmentListVO", description = "复旦mini mba项目学习记录类")
+public class MinimbaStudyRecordVO {
+
+    private Long planId;
+
+    private String planName;
+
+    private Long courseId;
+
+    private Long examId;
+
+    private String courseStudyDuration;
+
+    private Double courseScore;
+
+    List<MinimbaAssignmentVO> assignmentAnswerList;
+
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/MinimbaUserDetailParamVO.java

+package com.yizhi.assignment.application.vo;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 复旦mini mba项目获取用户打卡,点赞信息请求类
+ * @author DING
+ *
+ */
+@Data
+@Api(tags = "MinimbaUserDetailParamVO", description = "复旦mini mba项目获取用户打卡,点赞信息请求类")
+public class MinimbaUserDetailParamVO {
+
+	@ApiModelProperty("培训项目id集合")
+	private List<Long> projectIds;
+
+	@ApiModelProperty("是否取实时数据 0:取前一天截止的数据 1:取实时数据")
+	private Integer isRealTime;
+
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/MinimbaUserDetailVO.java

+package com.yizhi.assignment.application.vo;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 复旦mini mba项目获取用户打卡,点赞信息返回类
+ * @author DING
+ *
+ */
+@Data
+@Api(tags = "MinimbaUserDetailVO", description = "复旦mini mba项目获取用户打卡,点赞信息返回类")
+public class MinimbaUserDetailVO {
+
+	@ApiModelProperty("累计打卡次数")
+	private Integer pushInNum;
+
+	@ApiModelProperty("被赞次数")
+	private Integer praisedNum;
+
+	@ApiModelProperty("计划完成百分比整数(所有项目完成的计划/所有项目的计划总数,百分比,分子取整,返回分子整数)")
+	private Integer percentage;
+
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/PdfPages.java

+package com.yizhi.assignment.application.vo;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@Api(tags = "PdfPages", description = "pdf图片")
+
+public class PdfPages {
+
+    private static final long serialVersionUID = 1L;
+
+	private Long id;
+
+	@ApiModelProperty(value = "页数")
+	
+	private Integer pdfPage;
+
+	@ApiModelProperty(value = "业务id")
+	
+	private Long bizId;
+
+	@ApiModelProperty(value = "业务类型")
+	
+	private Integer bizType;
+
+	@ApiModelProperty(value = "图片地址")
+	
+	private String imageUrl;
+
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/PointParamVO.java

+package com.yizhi.assignment.application.vo;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "PointParamVO", description = "其他微服务配置 积分")
+public class PointParamVO implements Serializable {
+
+    /**
+     *
+     */
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+    @ApiModelProperty(value = "事件名称")
+    private String eventName;
+
+    @ApiModelProperty(value = "事件类型/学习活动类型, 枚举 统一传入 ActivityTypeEnum.类型")
+    private String activityType;
+
+    @ApiModelProperty(value = "学习活动来源")
+    private String activitySource;
+
+    @ApiModelProperty(value = "积分来源Id, 存放业务主键， 课程Id，调研Id，考试Id, 投票ID, 作业ID")
+    private Long sourceId;
+
+    @ApiModelProperty("如果是考试,发送考试成绩")
+    private Integer score;
+
+    @ApiModelProperty("积分规则  1按课程  2 按章节 3 按素材")
+    private Integer portRule;
+
+    @ApiModelProperty(value = "学习活动名称")
+    private String activityName;
+
+    @ApiModelProperty(value = "发放条件")
+    private String releaseCondition;
+
+    @ApiModelProperty(value = "发放规则")
+    private String releaseRules;
+
+    @ApiModelProperty(value = "积分数量，  正数 加积分，  负数减积分")
+    private Integer operatingPoint;
+
+    @ApiModelProperty(value = "积分活动创建时间")
+    private Date createPointTime;
+
+    @ApiModelProperty(value = "学员id")
+    private Long accountId;
+
+    @ApiModelProperty(value = "学员姓名")
+    private String accountName;
+
+    private Long siteId;
+
+    private Long orgId;
+
+    private Long companyId;
+
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/StudentVo.java

+package com.yizhi.assignment.application.vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+@Data
+public class StudentVo {
+	
+	@ApiModelProperty(name="accountId",value="人员/部门/组织")
+	private Long adoId;
+	
+	@ApiModelProperty(name="type",value="type")
+	private Integer type;
+	
+	
+	
+
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/TaskVo.java

+package com.yizhi.assignment.application.vo;
+
+import com.yizhi.assignment.application.vo.enums.EvenType;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 消息
+ * </p>
+ *
+ * @author hutao123
+ * @since 2019-09-09
+ */
+@Data
+@Api(tags = "TaskVo", description = "业务参数对象")
+public class TaskVo implements Serializable {
+
+
+    @ApiModelProperty(value = "业务名称")
+    private String taskName;
+
+    @ApiModelProperty(value = "业务开始时间")
+    private Date taskStratTime;
+
+    @ApiModelProperty(value = "业务结束时间")
+    private Date taskEndTime;
+
+    @ApiModelProperty(value = "业务得分")
+    private Double taskScore;
+
+    @ApiModelProperty(value = "业务发生原因（主要用于积分）")
+    private String reason;
+
+    @ApiModelProperty(value = "业务时间（主要用于积分）")
+    private Date taskTime;
+
+    @ApiModelProperty(value = "事件类型")
+    private EvenType evenType;
+
+
+
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/TipoffAssignmentListVO.java

+package com.yizhi.assignment.application.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.xpath.operations.Bool;
+
+import java.util.Date;
+
+/**
+ * @ClassName TipoffListVO
+ * @Description TODO
+ * @Author shengchenglong
+ * @DATE 2019-10-22 18:23
+ * @Version 1.0
+ */
+@Data
+@ApiModel("作业举报--作业列表vo")
+public class TipoffAssignmentListVO {
+
+    @ApiModelProperty("作业答案id")
+    private Long answerId;
+
+    @ApiModelProperty("作业名称")
+    private String assignmentName;
+
+    @ApiModelProperty(hidden = true)
+    private Long accountId;
+
+    @ApiModelProperty("用户名")
+    private String username;
+
+    @ApiModelProperty("姓名")
+    private String fullName;
+
+    @ApiModelProperty("提交时间")
+    private Date commitTime;
+
+    @ApiModelProperty("举报数")
+    private Integer tipoffTimes;
+
+    @ApiModelProperty("举报时间")
+    private Date tipoffTime;
+
+    @ApiModelProperty("是否有新的举报")
+    private boolean hasNew;
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/VisibleRangeExport.java

+package com.yizhi.assignment.application.vo;
+
+import java.util.List;
+
+import com.yizhi.core.application.context.RequestContext;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 2019/09/19
+ * @author wangfeida
+ *
+ */
+@Data
+public class VisibleRangeExport {
+	@ApiModelProperty(name="bizId",value="具体业务id")
+	private Long bizId;
+	
+	@ApiModelProperty(name="bizName",value="具体业务名字")
+	private String bizName;
+	
+	@ApiModelProperty(name="个人ID集合",value="个人id集合")
+	private List<Long> accountIds;
+	
+	@ApiModelProperty(name="组织ID集合",value="组织ID集合")
+	private List<Long> orgIds;
+	
+	@ApiModelProperty(name="上下文对象",value="上下文对象")
+	private RequestContext context;
+
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/apivo/ApiAssignmentAnswerCheckVO.java

+package com.yizhi.assignment.application.vo.apivo;
+
+import com.yizhi.assignment.application.vo.entity.AssignmentAnswerFile;
+import com.yizhi.assignment.application.vo.entity.AssignmentGrade;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@Api(tags = "ApiAssignmentAnswerCheckVO", description = "单个作业显示")
+public class ApiAssignmentAnswerCheckVO {
+
+    @ApiModelProperty(notes = "学生真实姓名")
+    private String realName;
+
+    @ApiModelProperty(notes = "答案详情")
+    private String content;
+
+    @ApiModelProperty(notes = "作业答案文件信息")
+    private List<AssignmentAnswerFile> listAssignmentAnswerFile;
+
+    @ApiModelProperty(notes = "作业成绩")
+    private Integer score;
+
+    @ApiModelProperty(notes = "合格分")
+    private Integer passScore;
+
+
+    @ApiModelProperty(notes = "作业评语")
+    private String suggestion;
+
+    @ApiModelProperty(notes = "答案反馈文件信息")
+    private List<AssignmentAnswerFile> listAssignmentAnswerBackFile;
+
+//    @ApiModelProperty(name = "nextAnswerId", value = "下一个学生提交的作业id")
+//    private Long nextAnswerId;
+//
+//    @ApiModelProperty(name = "prevAnswerId", value = "上一个学生提交的作业id")
+//    private Long prevAnswerId;
+
+
+    /**
+     * 下边的这三个字段没用了，以前的需求需要这个代码，现在的需求不需要了，但是前端需调调试bug，因此先添加上
+     */
+
+    @ApiModelProperty(notes = "作业地址")
+    private List<String> fileUrl;
+
+    @ApiModelProperty(notes = "全部等级")
+    private List<AssignmentGrade> grades;
+
+    @ApiModelProperty(notes = "作业等级")
+    private String grade;
+
+    @ApiModelProperty(notes = "学员提交作业answerId")
+    private List<Long> answerIds;
+
+
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/apivo/ApiAssignmentAnswerResultVo.java

+package com.yizhi.assignment.application.vo.apivo;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 学员端作业vo
+ *
+ * @Author: wangfeida
+ * @Date: 2018/9/5 20:01
+ */
+@Data
+@Api(tags = {"学员端作业答案列表"}, description = "学员端作业答案列表")
+public class ApiAssignmentAnswerResultVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    
+    @ApiModelProperty(notes = "作业id")
+    private Long id;
+
+    @ApiModelProperty(notes = "作业名称")
+    private String assignmentName;
+    
+
+    @ApiModelProperty(notes = "作业内容（作业要求）")
+    private String assignmentContent;
+    
+    
+    @ApiModelProperty(notes = "所属培训项目名称")
+    private String projectName;
+    
+    
+    @ApiModelProperty(notes = "作业截止时间")
+    private Date finishTime;
+    
+    
+    @ApiModelProperty(notes = "上传次数")
+    private Integer count;
+    
+    @ApiModelProperty(notes="已经提交的次数")
+    private Integer submitCount;
+    
+    @ApiModelProperty(notes="是否允许补交amendable是否支持补交(0：否，1：是） ")
+    private Integer amendable;
+    
+    
+    @ApiModelProperty(notes = "合格分")
+    private Integer passScore;
+    
+    @ApiModelProperty(notes="是否合格1 合格 2不合格")
+    private Integer isPass;
+    
+    
+    @ApiModelProperty(notes="是否逾期  1没有逾期  2逾期")
+    private Integer isOverDue;
+    
+    
+    @ApiModelProperty(notes="显示分数还是评阅中 1显示分数  2 显示字符串（评阅中）3等级制     都是 tag取值")
+    private Integer isScoreOrResult;
+    
+    @ApiModelProperty(notes = "作业评语")
+    private String suggestion;
+    
+    @ApiModelProperty(notes = "提交时间")
+    private Date commitTime;
+    
+    
+    @ApiModelProperty(notes="标签")
+    private String tag;
+    
+    
+    @ApiModelProperty(notes = "作业上传文件清单")
+    private List<ApiFileVo> fileList;
+    
+    
+    @ApiModelProperty(notes="作业答案列表")
+    private List<ApiAssignmentAnswerVo> answerResultList;
+    
+
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/apivo/ApiAssignmentAnswerVo.java

+package com.yizhi.assignment.application.vo.apivo;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+/**
+ *
+ * @Author: wangfeida
+ * @Date: 2018/9/5 20:08
+ */
+@Data
+@Api(tags = {"作业答案列表"}, description = "作业答案列表")
+public class ApiAssignmentAnswerVo {
+	
+	@ApiModelProperty(notes="作业Id")
+	private Long assignmentId;
+
+	@ApiModelProperty(notes="答案Id")
+	private Long answerId;
+	
+   
+    @ApiModelProperty(notes = "提交时间")
+    private Date commitTime;
+    
+    
+    @ApiModelProperty(notes = "答案状态 评阅状态(1:待阅,2:已阅)")
+    private Integer status;
+    
+    
+    @ApiModelProperty(notes = "分数，status=1 没值，如果status=2有值")
+    private Integer score;
+    
+    
+    @ApiModelProperty(notes="是否合格1 合格 2不合格")
+    private Integer isPass;
+    
+    
+    @ApiModelProperty(name="type",value="1打分制，2等级制",required=true)
+   	private Integer type;
+
+   	private Integer isDown;
+    
+    
+    @ApiModelProperty(notes = "等级  status=1 没值，如果status=2有值")
+    private String grade;
+    
+
+   
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/apivo/ApiAssignmentAnswersVO.java

+package com.yizhi.assignment.application.vo.apivo;
+
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.FieldFill;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author: shengchenglong
+ * @Date: 2018/3/7 15:58
+ */
+@Data
+@Api(tags = "ApiAssignmentAnswersVO", description = "学员作业显示列表")
+@TableName("assignment_answer")
+public class ApiAssignmentAnswersVO {
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(notes = "id主键")
+    private Long id;
+
+    @ApiModelProperty(notes = "作业id")
+    @TableField("assignment_id")
+    private Long assignmentId;
+
+    @ApiModelProperty(notes = "账号id")
+    @TableField("account_id")
+    private Long accountId;
+
+    @ApiModelProperty(notes = "分数")
+    private Integer score;
+
+    @ApiModelProperty(notes = "等级")
+    private String grade;
+
+
+
+    @ApiModelProperty(notes = "等级id")
+    @TableField("grade_id")
+    private Long gradeId;
+
+    @ApiModelProperty(notes = "评阅人")
+    @TableField("auditor_id")
+    private Long auditorId;
+
+    @ApiModelProperty(notes = "评阅状态(1:待阅,2:已阅)")
+    private Integer status;
+
+    @ApiModelProperty(notes = "公司id")
+    @TableField("company_id")
+    private Long companyId;
+
+    @ApiModelProperty(notes = "用户名")
+    @TableField("account_name")
+    private String accountName;
+
+    @ApiModelProperty(notes = "学生真实姓名")
+    @TableField("real_name")
+    private String real_name;
+
+    @ApiModelProperty(notes = "站点id")
+    @TableField("site_id")
+    private Long siteId;
+
+    @ApiModelProperty(notes = "部门id")
+    @TableField("org_id")
+    private Long orgId;
+
+    @ApiModelProperty(notes = "创建人id")
+    @TableField(value = "create_by_id", fill = FieldFill.INSERT)
+    private Long createById;
+
+    @ApiModelProperty(notes = "创建人姓名")
+    @TableField(value = "create_by_name", fill = FieldFill.INSERT)
+    private String createByName;
+
+    @ApiModelProperty(notes = "创建时间")
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    @ApiModelProperty(notes = "修改人id")
+    @TableField(value = "update_by_id", fill = FieldFill.INSERT)
+    private Long updateById;
+
+    @ApiModelProperty(notes = "修改人姓名")
+    @TableField(value = "update_by_name", fill = FieldFill.INSERT)
+    private String updateByName;
+
+    @ApiModelProperty(notes = "修改时间")
+    @TableField(value = "update_time", fill = FieldFill.INSERT)
+    private Date updateTime;
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/apivo/ApiAssignmentAswerVO.java

+package com.yizhi.assignment.application.vo.apivo;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author: shengchenglong
+ * @Date: 2018/3/7 15:58
+ */
+@Data
+@Api(tags = {"学员端答案vo"}, description = "学员端作业提交答案vo")
+public class ApiAssignmentAswerVO {
+
+    /**
+     * 作业id
+     */
+    @ApiModelProperty(notes = "作业id",required=true)
+    private Long assignmentId;
+    
+    
+    /**
+     * 答案来源
+     */
+    @ApiModelProperty(notes="答案来源（1本地2做课）",required=true)
+    private Integer source;
+    
+
+    /**
+     * 课程id
+     */
+    @ApiModelProperty(notes = "课程id",required=false)
+    private Long courseId;
+    
+
+    /**
+     * 上传文件vo集合
+     */
+    @ApiModelProperty(notes = "上传文件vo集合",required=false)
+    private List<ApiFileVo> fileVos;
+    
+    
+    
+    
+    
+    @ApiModelProperty(notes="文字说明",required=false)
+    private String content;
+    
+    
+    
+    
+    @ApiModelProperty(name="accountId",value="用户id,前端不传",required=false)
+	private Long accountId;
+	
+	@ApiModelProperty(name="accountName",value="用户名,前端不传",required=false)
+	private String accountName;
+	
+	@ApiModelProperty(name="realName",value="真实姓名,前端不传",required=false)
+	private String realName;
+	
+	@ApiModelProperty(name="companyId",value="公司id,前端不传",required=false)
+	private Long companyId;
+	
+	@ApiModelProperty(name="siteId",value="站点id,前端不传",required=false)
+	private Long siteId;
+	
+	@ApiModelProperty(name="orgId",value="组织机构id,前端不传",required=false)
+	private Long orgId;
+	
+
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/apivo/ApiAssignmentCommentVO.java

+package com.yizhi.assignment.application.vo.apivo;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @ClassName ApiAssignmentCommentVO
+ * @Description TODO
+ * @Author shengchenglong
+ * @DATE 2019-10-22 15:38
+ * @Version 1.0
+ */
+@ApiModel("评论VO")
+@Data
+public class ApiAssignmentCommentVO {
+
+    @ApiModelProperty("评论id")
+    private Long commentId;
+
+    @ApiModelProperty("评论内容")
+    private String content;
+
+    @ApiModelProperty("当前评论人名称")
+    private String createByName;
+
+    @ApiModelProperty("回复对象的名称(空字符串的话则不是回复)")
+    private String parentCreateByName = "";
+
+    @ApiModelProperty("评论时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "审核状态：0通过，1下架（默认通过）")
+    private Integer auditStatus;
+
+    @JsonIgnore
+    private String auditStatusStr;
+
+    @ApiModelProperty("评论人")
+    private String manageCommentator;
+
+    @ApiModelProperty("姓名")
+    private String manageCommentatorFullName;
+
+    public String getAuditStatusStr() {
+        if (auditStatus != null) {
+            if (auditStatus.equals(0)) {
+                return  "已上架";
+            } else {
+                return  "已下架";
+            }
+        }
+        return "";
+    }
+
+    public void setAuditStatusStr(String auditStatusStr) {
+        if (auditStatus != null) {
+            if (auditStatus.equals(0)) {
+                this.auditStatusStr = "已上架";
+            } else {
+                this.auditStatusStr = "已下架";
+            }
+        }
+    }
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/apivo/ApiAssignmentDetailsVo.java

+package com.yizhi.assignment.application.vo.apivo;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 学员端作业vo
+ *
+ * @Author: shengchenglong
+ * @Date: 2018/3/8 10:49
+ */
+@Data
+@Api(tags = {"学员端作业vo"}, description = "学员端作业vo")
+public class ApiAssignmentDetailsVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    
+    @ApiModelProperty(notes = "作业id")
+    private Long id;
+
+    @ApiModelProperty(notes = "作业名称")
+    private String assignmentName;
+
+    @ApiModelProperty(notes = "作业内容（作业要求）")
+    private String assignmentContent;
+
+    @ApiModelProperty(notes = "作业上传文件清单")
+    private List<ApiFileVo> fileList;
+
+    @ApiModelProperty(notes = "作业创建时间")
+    private Date startTime;
+    
+    @ApiModelProperty(notes = "作业截止时间")
+    private Date finishTime;
+    
+    @ApiModelProperty(notes="答案状态 评阅状态(1:待阅,2:已阅)")
+    private Integer status;
+
+    @ApiModelProperty(notes = "所属培训项目名称")
+    private String projectName;
+    
+    @ApiModelProperty(notes="管理端设定的次数")
+    private Integer count;
+    
+    @ApiModelProperty(notes="已经提交的次数")
+    private Integer submitCount;
+
+    @ApiModelProperty(notes = "合格分")
+    private Integer passScore;
+    
+    @ApiModelProperty(notes="1显示分数 2显示等级")
+    private Integer isScoreAndGrade;
+
+    //答案
+    @ApiModelProperty(notes = "答案清单(提交答案后 可能这里会有多个文件)")
+    private List<ApiFileVo> answerFileList;
+    
+    @ApiModelProperty(notes="答案内容")
+    private String answerContent;
+
+    //批阅
+    @ApiModelProperty(notes="批阅时间")
+    private Date readTime;
+    
+    @ApiModelProperty(notes="分数")
+    private Integer Score;
+    
+    @ApiModelProperty(notes="等级")
+    private String grade;
+    
+    @ApiModelProperty(notes="评语")
+    private String suggestion;
+    
+    @ApiModelProperty(notes="反馈文件")
+    private List<ApiFileVo> backFileList;
+
+
+    @ApiModelProperty(notes = "答案字数区间-最小值")
+    private Integer answerCharaterNumMin;
+
+    @ApiModelProperty(notes = "答案字数区间-最大值")
+    private Integer answerCharaterNumMax;
+
+    @ApiModelProperty(notes = "附件个数区间-最小值")
+    private Integer answerAttachmentNumMin;
+
+    @ApiModelProperty(notes = "附件个数区间-最大值")
+    private Integer answerAttachmentNumMax;
+
+    @ApiModelProperty(notes = "学员端是否显示评阅结果和评阅状态，0不显示，1显示")
+    private Integer showRes;
+
+    @ApiModelProperty(notes = "是否启用作业本，0否，1是")
+    private Integer enableExerciseBook;
+
+    @ApiModelProperty(notes = "提交作业的状态1，下架 ")
+    private Integer isDown;
+
+    @ApiModelProperty("提交人数")
+    private Integer commitAccountNum;
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/apivo/ApiAssignmentListResultVO.java

+package com.yizhi.assignment.application.vo.apivo;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+
+/**
+ * 学员端作业vo
+ *
+ * @Author: wangfeida
+ * @Date: 2018/09/07 16:40
+ */
+@Data
+@Api(tags = {"学员端作业列表---未完成/已完成列表"}, description = "学员端作业列表---未完成/已完成列表")
+public class ApiAssignmentListResultVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    
+    @ApiModelProperty(notes = "作业id")
+    private Long id;
+
+    @ApiModelProperty(notes = "作业名称")
+    private String assignmentName;
+    
+    @ApiModelProperty(notes = "所属培训项目名称")
+    private String projectName;
+    
+
+    @ApiModelProperty(notes = "作业截止时间")
+    private Date finishTime;
+    
+
+    @ApiModelProperty(notes="分数")
+    private Integer score;
+    
+    
+    @ApiModelProperty(notes="等级")
+    private String GradeLeval;
+    
+    
+    @ApiModelProperty(notes="1显示分数 2显示等级")
+    private Integer isScoreAndGrade;
+    
+    @ApiModelProperty(notes="是否合格1 合格 2不合格")
+    private Integer isPass;
+    
+    
+    @ApiModelProperty(notes="标签")
+    private String tag;
+
+    @ApiModelProperty(notes="管理端设置次数")
+    private Integer count;
+    
+    
+    @ApiModelProperty(notes="已经提交的次数")
+    private Integer submitCount;
+    
+    
+    @ApiModelProperty(notes="是否允许补交amendable是否支持补交(0：否，1：是） ")
+    private Integer amendable;
+    
+
+    @ApiModelProperty(notes="是否逾期  1没有逾期  2逾期")
+    private Integer isOverDue;
+
+    @ApiModelProperty(notes="合格分")
+    private Integer passScore;
+
+    
+    @ApiModelProperty(value="作业的批阅状态")
+    private Integer minAnswerStatus;
+    
+    @ApiModelProperty(value="作业的批阅状态")
+    private Integer maxAnswerStatus;
+
+    @ApiModelProperty(value = "作业的状态")
+    private Integer status;
+
+
+    @ApiModelProperty(value = "作业的要求")
+    private String detail;
+
+    @ApiModelProperty(value = "作业操作 1 详情，2 继续提交 3 详情/继续提交 4 无操作")
+    private Integer handle;
+    
+    @ApiModelProperty(value = "学员端是否显示评阅结果和评阅状态，0不显示，1显示")
+    private Integer showRes;
+
+    @ApiModelProperty(value = "用户id")
+    private Long accountId;
+
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/apivo/ApiAssignmentVO.java

+package com.yizhi.assignment.application.vo.apivo;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 学员端作业vo
+ *
+ * @Author: wangfeida
+ * @Date: 2018/09/07 16:40
+ */
+@Data
+@Api(tags = {"作业详情"}, description = "作业详情")
+public class ApiAssignmentVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    
+    @ApiModelProperty(notes = "作业id")
+    private Long id;
+
+    @ApiModelProperty(notes = "作业名称")
+    private String assignmentName;
+    
+    @ApiModelProperty(notes = "所属培训项目名称")
+    private String projectName;
+
+    @ApiModelProperty(notes = "作业截止时间")
+    private Date finishTime;
+
+    @ApiModelProperty(notes="管理端设置次数")
+    private Integer count;
+
+    @ApiModelProperty(notes="是否允许补交amendable是否支持补交(0：否，1：是） ")
+    private Integer amendable;
+
+    @ApiModelProperty(notes="合格分")
+    private Integer passScore;
+    
+    @ApiModelProperty(notes = "作业内容（作业要求）")
+    private String assignmentContent;
+
+    @ApiModelProperty(notes = "作业上传文件清单")
+    private List<ApiFileVo> fileList;
+
+    @ApiModelProperty(notes="学员已经提交的次数")
+    private Integer submitCount;
+
+
+    @ApiModelProperty(notes = "答案字数区间-最小值")
+    private Integer answerCharaterNumMin;
+
+    @ApiModelProperty(notes = "答案字数区间-最大值")
+    private Integer answerCharaterNumMax;
+
+    @ApiModelProperty(notes = "附件个数区间-最小值")
+    private Integer answerAttachmentNumMin;
+
+    @ApiModelProperty(notes = "附件个数区间-最大值")
+    private Integer answerAttachmentNumMax;
+
+    @ApiModelProperty(notes = "学员端是否显示评阅结果和评阅状态，0不显示，1显示")
+    private Integer showRes;
+
+    @ApiModelProperty(notes = "是否启用作业本，0否，1是")
+    private Integer enableExerciseBook;
+
+    @ApiModelProperty("提交人数")
+    private Integer commitAccountNum;
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/apivo/ApiFileVo.java

+package com.yizhi.assignment.application.vo.apivo;
+
+import com.yizhi.assignment.application.vo.PdfPages;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 作业文件vo
+ * 包含作业要求文件和学生提交作业文件
+ *
+ * @Author: shengchenglong
+ * @Date: 2018/3/9 16:18
+ */
+@Data
+@Api(tags = {"作业文件vo"}, description = "包含作业要求文件和学生提交作业文件")
+public class ApiFileVo {
+
+    /**
+     * 文件名，包含后缀
+     */
+    @ApiModelProperty(notes = "文件名，包含后缀")
+    private String fileName;
+
+    /**
+     * 文件后缀
+     */
+    @ApiModelProperty(notes = "文件后缀")
+    private String suffix;
+
+    /**
+     * oss URL
+     */
+    @ApiModelProperty(notes = "oss URL")
+    private String ossUrl;
+
+    @ApiModelProperty(notes = "转码后的视屏地址, 标清")
+    private String videoSd;
+
+    /**
+     * 文件大小
+     */
+    @ApiModelProperty(notes="文件大小")
+    private String size;
+    
+    @ApiModelProperty(notes="文件上传时间")
+    private Date upLoadTime;
+
+    @ApiModelProperty(notes = "是否是视屏文件")
+    private boolean isVideo;
+
+    @ApiModelProperty(notes = "如果该值不为空字符串,显示出来,视屏正在处理,暂时看不了;如果为空字符串,则视屏可观看")
+    private String state;
+    
+    @ApiModelProperty(notes = "作业文件id")
+    private Long id;
+    
+    private List<PdfPages> pdfPages;
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/apivo/ApiListVo.java

+package com.yizhi.assignment.application.vo.apivo;
+
+import java.util.Date;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@Api(tags = {"作业列表"}, description = "作业列表")
+public class ApiListVo {
+	
+	
+	   
+	    @ApiModelProperty(notes = "id主键")
+	    private Long id;
+
+	   
+	    @ApiModelProperty(notes = "项目名字")
+	    private String projectName;
+
+	    
+	    @ApiModelProperty(notes = "作业名字")
+	    private String assignmentName;
+	    
+	    @ApiModelProperty(notes = "作业内容")
+	    private String assignmentContent;
+	    
+	    @ApiModelProperty(notes = "开始时间")
+	    private Date startTime;
+	    
+	    @ApiModelProperty(notes = "完成时间")
+	    private Date finishTime;
+	    
+	    @ApiModelProperty(notes = "分数")
+	    private Integer score;
+	    
+	    @ApiModelProperty(notes = "级别")
+	    private String gradeName;
+	    
+
+	
+
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/apivo/ApiSuggestionVo.java

+package com.yizhi.assignment.application.vo.apivo;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+import com.yizhi.assignment.application.vo.entity.AssignmentAnswerFile;
+import com.yizhi.assignment.application.vo.entity.AssignmentFile;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author: shengchenglong
+ * @Date: 2018/3/9 18:47
+ */
+@Data
+@Api(tags = {"作业评语vo"}, description = "作业评语vo")
+public class ApiSuggestionVo {
+
+	
+	@ApiModelProperty(notes="作业id，不是答案id")
+	private Long id;
+	
+	@ApiModelProperty(notes="作业name")
+	private String assignmentName;
+	
+	@ApiModelProperty(notes="指定完成时间")
+	private Date finishTime;
+	
+	@ApiModelProperty(notes="状态 评阅状态(1:待阅,2:已阅)")
+	private Integer status;
+	
+	@ApiModelProperty(notes="评分类型(1：打分制，2：等级制)")
+	private Integer type;
+	
+	@ApiModelProperty(notes="分数")
+	private BigDecimal score;
+    
+	@ApiModelProperty(notes="提交时间")
+	private Date commitTime;
+	
+    @ApiModelProperty(notes = "等级")
+    private String gradeName;
+
+    @ApiModelProperty(notes = "评语")
+    private String suggestion;
+    
+    @ApiModelProperty("老师要求的文件")
+    private List<AssignmentFile> assignmentFileList;
+    
+    @ApiModelProperty("学生答案的文件")
+    private List<AssignmentAnswerFile> answerFileList;
+    
+    @ApiModelProperty("老师反馈的文件")
+    private List<AssignmentAnswerFile> backFileList;
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/apivo/AssignmentTrainingProject.java

+package com.yizhi.assignment.application.vo.apivo;
+
+import java.util.List;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 
+ *
+ * @Author:wangfeida
+ * @Date: 2018/39/29 14:58
+ */
+@Data
+@Api(tags = {"根据作业id修改培训项目"}, description = "根据作业id修改培训项目")
+public class AssignmentTrainingProject {
+
+ 
+    @ApiModelProperty(notes = "项目ID")
+    private Long projectId;
+
+  
+    @ApiModelProperty(notes = "项目名字")
+    private String projectName;
+
+    
+    @ApiModelProperty(notes = "作业id集合")
+    private List<Long> listAssignmentIds;
+
+    
+ 
+   
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/apivo/ToOthersApi.java

+package com.yizhi.assignment.application.vo.apivo;
+
+import java.util.Date;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+@Data
+public class ToOthersApi {
+	
+	@ApiModelProperty(value="主键id")
+	private Long id;
+	
+	@ApiModelProperty(value="作业名字")
+	private String name;
+	
+	@ApiModelProperty(value="作业内容")
+	private String content;
+	
+	
+	@ApiModelProperty(value="作业地址")
+	private String url;
+	
+	
+	@ApiModelProperty(value="状态")
+	private Integer state;
+
+	
+	@ApiModelProperty(value="开始时间")
+	private Date startTime;
+	
+	@ApiModelProperty(value="结束时间")
+	private Date endTime;
+	
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/entity/Assignment.java

+package com.yizhi.assignment.application.vo.entity;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.FieldFill;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 老师布置作业的主表
+ * </p>
+ *
+ * @author 王飞达123
+ * @since 2018-03-08
+ */
+@Data
+@Api(tags = "Assignment", description = "老师布置作业的主表")
+
+public class Assignment{
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(notes = "id主键")
+    private Long id;
+
+    @ApiModelProperty(notes = "所属项目id，未关联则为0")
+    
+    private Long trainingProjectId;
+
+    @ApiModelProperty(notes = "冗余培训项目名称")
+    
+    private String trainingProjectName;
+
+    @ApiModelProperty(notes = "作业序号")
+    
+    private Long serialNum;
+
+    @ApiModelProperty(notes = "作业名称")
+    private String name;
+
+    @ApiModelProperty(value = "是否启用提醒 1:启用 0：关闭")
+    
+    private Integer enableRemind;
+
+    @ApiModelProperty(notes = "是否支持补交(0：否，1：是)，默认否")
+    private Integer amendable;
+
+    @ApiModelProperty(notes = "可见范围(1：平台用户可见，2：指定学员可见)，默认平台用户可见")
+    
+    private Integer visibleRange;
+    
+
+    @ApiModelProperty(notes = "作业完成时间")
+    
+    private Date finishTime;
+
+    @ApiModelProperty(notes = "状态(1：草稿，2：上架，3：下架,0删除)")
+    private Integer status;
+
+    @ApiModelProperty(notes = "可以提交的次数")
+    private Integer count;
+    
+    @ApiModelProperty(notes = "合格分")
+    
+    private Integer passScore;
+    
+    
+    
+    @ApiModelProperty(name="type",value="1打分制，2等级制",required=true)
+	private Integer type;
+    
+
+    @ApiModelProperty(notes = "上架时间")
+    
+    private Date addedTime;
+
+
+    @ApiModelProperty(notes = "公司id")
+    
+    private Long companyId;
+
+    @ApiModelProperty(notes = "站点id")
+    
+    private Long siteId;
+
+    @ApiModelProperty(notes = "部门id")
+    
+    private Long orgId;
+
+    @ApiModelProperty(notes = "创建人id")
+    
+    private Long createById;
+
+    @ApiModelProperty(notes = "创建人姓名")
+    
+    private String createByName;
+
+    @ApiModelProperty(notes = "创建时间")
+    
+    private Date createTime;
+
+    @ApiModelProperty(notes = "修改人id")
+    
+    private Long updateById;
+
+    @ApiModelProperty(notes = "修改人姓名")
+    
+    private String updateByName;
+
+    @ApiModelProperty(notes = "修改时间")
+    
+    private Date updateTime;
+
+    @ApiModelProperty(notes = "答案字数区间-最小值")
+    
+    private Integer answerCharaterNumMin;
+
+    @ApiModelProperty(notes = "答案字数区间-最大值")
+    
+    private Integer answerCharaterNumMax;
+
+    @ApiModelProperty(notes = "附件个数区间-最小值")
+    
+    private Integer answerAttachmentNumMin;
+
+    @ApiModelProperty(notes = "附件个数区间-最大值")
+    
+    private Integer answerAttachmentNumMax;
+
+    @ApiModelProperty(notes = "学员端是否显示评阅结果和评阅状态，0不显示，1显示")
+    
+    private Integer showRes;
+
+    @ApiModelProperty(notes = "是否启用作业本，0否，1是")
+    
+    private Integer enableExerciseBook;
+
+    @ApiModelProperty(notes = "关键字,逗号分隔")
+    
+    private String keywords;
+
+    @ApiModelProperty(notes = "logo图片")
+    private String image;
+
+    @ApiModelProperty(value = "是否启用在日历任务中显示")
+    
+    private Integer enableTask;
+
+    @ApiModelProperty(value = "日历任务设置的开始时间")
+    
+    private Date taskStartDate;
+
+    @ApiModelProperty(value = "日历任务设置的结束时间")
+    
+    private Date taskEndDate;
+
+
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/entity/AssignmentAnswer.java

+package com.yizhi.assignment.application.vo.entity;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.FieldFill;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 学员对作业的对应关系
+ * <p>
+ * </p>
+ *
+ * @author 王飞达123
+ * @since 2018-03-08
+ */
+@Data
+@Api(tags = "AssignmentAnswer", description = "学员对作业的对应关系 ")
+@TableName("assignment_answer")
+public class AssignmentAnswer extends Model<AssignmentAnswer> {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(notes = "id主键")
+    private Long id;
+
+    @ApiModelProperty(notes = "作业id")
+    @TableField("assignment_id")
+    private Long assignmentId;
+
+    @ApiModelProperty(notes = "真实姓名")
+    @TableField("real_name")
+    private String realName;
+
+    @ApiModelProperty(notes = "账号id")
+    @TableField("account_id")
+    private Long accountId;
+    
+    
+    @ApiModelProperty(notes = "用户名")
+    @TableField("account_name")
+    private String accountName;
+    
+    @ApiModelProperty(notes = "文字说明")
+    private String content;
+   
+
+    @ApiModelProperty(notes = "分数")
+    private Integer score;
+    
+    
+    @ApiModelProperty(value = "获取积分")
+	@TableField("point")
+	private Integer Point;
+
+   
+
+    @ApiModelProperty(notes = "评阅人")
+    @TableField("auditor_id")
+    private Long auditorId;
+    
+    @ApiModelProperty(notes = "评阅时间")
+    @TableField("auditor_time")
+    private Date auditorTime;
+    
+    
+    @ApiModelProperty(notes = "评阅状态(1:待阅,2:已阅)")
+    private Integer status;
+    
+    
+    @ApiModelProperty(notes="答案来源（1本地2做课）")
+    @TableField("source")
+    private Integer source;
+    
+    @ApiModelProperty(notes = "公司id")
+    @TableField("company_id")
+    private Long companyId;
+
+   
+
+    @ApiModelProperty(notes = "站点id")
+    @TableField("site_id")
+    private Long siteId;
+
+    @ApiModelProperty(notes = "部门id")
+    @TableField("org_id")
+    private Long orgId;
+
+    @ApiModelProperty(notes = "创建人id")
+    @TableField(value = "create_by_id", fill = FieldFill.INSERT)
+    private Long createById;
+
+    @ApiModelProperty(notes = "创建人姓名")
+    @TableField(value = "create_by_name", fill = FieldFill.INSERT)
+    private String createByName;
+
+    @ApiModelProperty(notes = "创建时间")
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    @ApiModelProperty(notes = "修改人id")
+    @TableField(value = "update_by_id", fill = FieldFill.INSERT)
+    private Long updateById;
+
+    @ApiModelProperty(notes = "修改人姓名")
+    @TableField(value = "update_by_name", fill = FieldFill.INSERT)
+    private String updateByName;
+
+    @ApiModelProperty(notes = "修改时间")
+    @TableField(value = "update_time", fill = FieldFill.INSERT)
+    private Date updateTime;
+    
+    @ApiModelProperty(notes="答案文件的zip包")
+    @TableField(value="answer_file_zip")
+    private String answerFileZip;
+
+    @ApiModelProperty(notes="是否是下架，0：否，1：是")
+    @TableField("is_down")
+    private Integer isDown;
+
+    @ApiModelProperty("是否删除")
+    private Integer deleted;
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/entity/AssignmentAnswerCourse.java

+package com.yizhi.assignment.application.vo.entity;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.FieldFill;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 一个学员对一个作业的回复内容
+ * </p>
+ *
+ * @author 王飞达123
+ * @since 2018-03-08
+ */
+@Data
+@Api(tags = "AssignmentAnswerCourse", description = "一个学员对一个作业的回复内容")
+@TableName("assignment_answer_course")
+public class AssignmentAnswerCourse extends Model<AssignmentAnswerCourse> {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(notes = "id主键")
+    private Long id;
+
+    @ApiModelProperty(notes = "作业提交id")
+    @TableField("answer_id")
+    private Long answerId;
+
+    @ApiModelProperty(notes = "素材id")
+    @TableField("mid")
+    private Long mid;
+
+    @ApiModelProperty(notes = "创建人id")
+    @TableField(value = "create_by_id", fill = FieldFill.INSERT)
+    private Long createById;
+
+    @ApiModelProperty(notes = "创建人姓名")
+    @TableField(value = "create_by_name", fill = FieldFill.INSERT)
+    private String createByName;
+
+    @ApiModelProperty(notes = "创建时间")
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    @ApiModelProperty(notes = "修改人id")
+    @TableField(value = "update_by_id", fill = FieldFill.INSERT)
+    private Long updateById;
+
+    @ApiModelProperty(notes = "修改人姓名")
+    @TableField(value = "update_by_name", fill = FieldFill.INSERT)
+    private String updateByName;
+
+    @ApiModelProperty(notes = "修改时间")
+    @TableField(value = "update_time", fill = FieldFill.INSERT)
+    private Date updateTime;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/entity/AssignmentAnswerFile.java

+package com.yizhi.assignment.application.vo.entity;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.FieldFill;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 学员对作业回复可以是文件，存放学员的作业回复的文件的地址
+ * </p>
+ *
+ * @author 王飞达123
+ * @since 2018-03-08
+ */
+@Data
+@Api(tags = "AssignmentAnswerFile", description = "学员对作业回复可以是文件，存放学员的作业回复的文件的地址")
+@TableName("assignment_answer_file")
+public class AssignmentAnswerFile extends Model<AssignmentAnswerFile> {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(notes = "id主键")
+    private Long id;
+
+    @ApiModelProperty(notes = "作业答案id")
+    @TableField("anwser_id")
+    private Long anwserId;
+
+    @ApiModelProperty(notes = "文件类型(1:作业答案,2:评阅回复)")
+    private Integer type;
+
+    @ApiModelProperty(notes = "文件存放路径")
+    @TableField("file_url")
+    private String fileUrl;
+
+    @ApiModelProperty(notes = "源文件名")
+    @TableField("file_name")
+    private String fileName;
+
+    @ApiModelProperty(notes = "后缀名")
+    private String suffix;
+    
+    @ApiModelProperty(notes = "文件大小")
+    private String size;
+    
+    @ApiModelProperty(notes = "如果是评阅回复，则转换为png格式")
+    private String png;
+
+    @ApiModelProperty(notes = "创建人id")
+    @TableField(value = "create_by_id", fill = FieldFill.INSERT)
+    private Long createById;
+
+    @ApiModelProperty(notes = "创建人姓名")
+    @TableField(value = "create_by_name", fill = FieldFill.INSERT)
+    private String createByName;
+
+    @ApiModelProperty(notes = "创建时间")
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    @TableField("video_ld")
+    private String videoLd;
+
+    @TableField("video_sd")
+    private String videoSd;
+
+    @TableField("video_hd")
+    private String videoHd;
+
+    @ApiModelProperty(notes = "是否是视频文件，0否，1是")
+    @TableField(value = "is_video")
+    private Integer isVideo;
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/entity/AssignmentAnswerSuggestion.java

+package com.yizhi.assignment.application.vo.entity;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.FieldFill;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 老师对学员做的作业的回复内容
+ * </p>
+ *
+ * @author 王飞达123
+ * @since 2018-03-08
+ */
+@Data
+@Api(tags = "AssignmentAnswerSuggestion", description = "老师对学员做的作业的回复内容")
+@TableName("assignment_answer_suggestion")
+public class AssignmentAnswerSuggestion extends Model<AssignmentAnswerSuggestion> {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(notes = "id主键")
+    private Long id;
+
+    @ApiModelProperty(notes = "作业提交id")
+    @TableField("answer_id")
+    private Long answerId;
+
+    @ApiModelProperty(notes = "评阅内容")
+    private String suggestion;
+
+    @ApiModelProperty(notes = "创建人id")
+    @TableField(value = "create_by_id", fill = FieldFill.INSERT)
+    private Long createById;
+
+    @ApiModelProperty(notes = "创建人姓名")
+    @TableField(value = "create_by_name", fill = FieldFill.INSERT)
+    private String createByName;
+
+    @ApiModelProperty(notes = "创建时间")
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    @ApiModelProperty(notes = "修改人id")
+    @TableField(value = "update_by_id", fill = FieldFill.INSERT)
+    private Long updateById;
+
+    @ApiModelProperty(notes = "修改人姓名")
+    @TableField(value = "update_by_name", fill = FieldFill.INSERT)
+    private String updateByName;
+
+    @ApiModelProperty(notes = "修改时间")
+    @TableField(value = "update_time", fill = FieldFill.INSERT)
+    private Date updateTime;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/entity/AssignmentAnswerThumb.java

+package com.yizhi.assignment.application.vo.entity;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @ClassName AssignmentAnswerThumb
+ * @Description TODO
+ * @Author shengchenglong
+ * @DATE 2019-10-22 12:01
+ * @Version 1.0
+ */
+@Data
+@ApiModel("作业本点赞")
+@TableName("assignment_answer_thumb")
+public class AssignmentAnswerThumb extends Model<AssignmentAnswerThumb> {
+
+    private Long id;
+
+    @TableField("assignment_answer_id")
+    private Long assignmentAnswerId;
+
+    @TableField("account_id")
+    private Long accountId;
+
+    @TableField("is_thumb")
+    private Integer isThumb;
+
+    @TableField("create_time")
+    private Date createTime;
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/entity/AssignmentAnswerTipoff.java

+package com.yizhi.assignment.application.vo.entity;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.FieldFill;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author shengchenglong123
+ * @since 2019-10-22
+ */
+@Data
+@Api(tags = "AssignmentAnswerTipoff", description = "")
+@TableName("assignment_answer_tipoff")
+public class AssignmentAnswerTipoff extends Model<AssignmentAnswerTipoff> {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "主键id")
+    private Long id;
+
+    @ApiModelProperty(value = "作业答案id")
+    @TableField("assignment_answer_id")
+    private Long assignmentAnswerId;
+
+    @ApiModelProperty(value = "举报原因")
+    private String content;
+
+    @ApiModelProperty(value = "举报图片")
+    @TableField("img_url")
+    private String imgUrl;
+
+    private String company;
+
+    @ApiModelProperty(value = "创建人id")
+    @TableField(value = "create_by_id", fill = FieldFill.INSERT)
+    private Long createById;
+
+    @ApiModelProperty(value = "创建人姓名")
+    @TableField(value = "create_by_name", fill = FieldFill.INSERT)
+    private String createByName;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    @ApiModelProperty(value = "处理状态，0，提交状态（待处理）；1 移除（不显示再列表）s")
+    private Integer status;
+
+    @ApiModelProperty(value = "处理人id")
+    @TableField("auditor_id")
+    private Long auditorId;
+
+    @ApiModelProperty(value = "处理意见")
+    @TableField("audit_content")
+    private String auditContent;
+
+    @ApiModelProperty(value = "处理时间")
+    @TableField("audit_time")
+    private Date auditTime;
+
+    @TableField("is_new")
+    private Integer isNew;
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/entity/AssignmentAuditor.java

+package com.yizhi.assignment.application.vo.entity;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.FieldFill;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 作业和评阅人的对应关系
+ * </p>
+ *
+ * @author 王飞达123
+ * @since 2018-03-08
+ */
+@Data
+@Api(tags = "AssignmentAuditor", description = "作业和评阅人的对应关系")
+@TableName("assignment_auditor")
+public class AssignmentAuditor extends Model<AssignmentAuditor> {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(notes = "id主键")
+    private Long id;
+
+    @ApiModelProperty(notes = "作业id")
+    @TableField("assignment_id")
+    private Long assignmentId;
+
+    @ApiModelProperty(notes = "账号id")
+    @TableField("account_id")
+    private Long accountId;
+
+    @ApiModelProperty(notes = "创建人id")
+    @TableField(value = "create_by_id", fill = FieldFill.INSERT)
+    private Long createById;
+
+    @ApiModelProperty(notes = "创建人姓名")
+    @TableField(value = "create_by_name", fill = FieldFill.INSERT)
+    private String createByName;
+
+    @ApiModelProperty(notes = "创建时间")
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
+    private Date createTime;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/entity/AssignmentComment.java

+package com.yizhi.assignment.application.vo.entity;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.FieldFill;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 作业答案 - 评论
+ * </p>
+ *
+ * @author shengchenglong123
+ * @since 2019-10-22
+ */
+@Data
+@Api(tags = "AssignmentComment", description = "作业答案 - 评论")
+@TableName("assignment_comment")
+public class AssignmentComment extends Model<AssignmentComment> {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键id")
+    private Long id;
+
+    @ApiModelProperty(value = "作业答案id")
+    @TableField("assignment_answer_id")
+    private Long assignmentAnswerId;
+
+    @ApiModelProperty(value = "评论内容")
+    private String content;
+
+    @ApiModelProperty(value = "审核状态：0通过，1下架（默认通过）")
+    @TableField("audit_status")
+    private Integer auditStatus;
+
+    @ApiModelProperty(value = "下架人id")
+    @TableField("auditor_id")
+    private Long auditorId;
+
+    @ApiModelProperty(value = "下架意见")
+    @TableField("audit_content")
+    private String auditContent;
+
+    @ApiModelProperty(value = "下架时间")
+    @TableField("auditor_time")
+    private Date auditorTime;
+
+    @ApiModelProperty(value = "创建者id")
+    @TableField(value = "create_by_id", fill = FieldFill.INSERT)
+    private Long createById;
+
+    @ApiModelProperty(value = "创建者名称")
+    @TableField(value = "create_by_name", fill = FieldFill.INSERT)
+    private String createByName;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    @ApiModelProperty(value = "父评论的id（该评论是对父评论的评论）")
+    @TableField("parent_id")
+    private Long parentId;
+
+    @ApiModelProperty(value = "父评论创建者名称")
+    @TableField("parent_create_by_name")
+    private String parentCreateByName;
+
+    @ApiModelProperty(value = "父评论创建者id")
+    @TableField("parent_create_by_id")
+    private Long parentCreateById;
+
+    @ApiModelProperty(value = "站点id")
+    @TableField("site_id")
+    private Long siteId;
+
+    @ApiModelProperty(value = "组织id")
+    @TableField("org_id")
+    private Long orgId;
+
+    @ApiModelProperty(value = "企业id")
+    @TableField("company_id")
+    private Long companyId;
+
+    @ApiModelProperty(value = "用户头像")
+    @TableField("user_avatar")
+    private String userAvatar;
+
+//    @ApiModelProperty("0上架，1下架")
+//    private Integer status;
+
+    @ApiModelProperty("0未删除,1已删除")
+    private Integer deleted;
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/entity/AssignmentContent.java

+package com.yizhi.assignment.application.vo.entity;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.FieldFill;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 老师布置的作业的内容
+ * </p>
+ *
+ * @author 王飞达123
+ * @since 2018-03-08
+ */
+@Data
+@Api(tags = "AssignmentContent", description = "老师布置的作业的内容")
+@TableName("assignment_content")
+public class AssignmentContent extends Model<AssignmentContent> {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(notes = "id主键")
+    private Long id;
+
+    @ApiModelProperty(notes = "作业id")
+    @TableField("assignment_id")
+    private Long assignmentId;
+
+    @ApiModelProperty(notes = "内容")
+    private String comment;
+
+    @ApiModelProperty(notes = "创建人id")
+    @TableField(value = "create_by_id", fill = FieldFill.INSERT)
+    private Long createById;
+
+    @ApiModelProperty(notes = "创建人姓名")
+    @TableField(value = "create_by_name", fill = FieldFill.INSERT)
+    private String createByName;
+
+    @ApiModelProperty(notes = "创建时间")
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    @ApiModelProperty(notes = "修改人id")
+    @TableField(value = "update_by_id", fill = FieldFill.INSERT)
+    private Long updateById;
+
+    @ApiModelProperty(notes = "修改人姓名")
+    @TableField(value = "update_by_name", fill = FieldFill.INSERT)
+    private String updateByName;
+
+    @ApiModelProperty(notes = "修改时间")
+    @TableField(value = "update_time", fill = FieldFill.INSERT)
+    private Date updateTime;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/entity/AssignmentFile.java

+package com.yizhi.assignment.application.vo.entity;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.FieldFill;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 老师布置的作业对应多个文件，存放多个文件地址
+ * </p>
+ *
+ * @author 王飞达123
+ * @since 2018-03-08
+ */
+@Data
+@Api(tags = "AssignmentFile", description = "老师布置的作业对应多个文件，存放多个文件地址")
+@TableName("assignment_file")
+public class AssignmentFile extends Model<AssignmentFile> {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(notes = "id主键,前端不输入，后台生成")
+    private Long id;
+
+    @ApiModelProperty(notes = "布置的作业id,前端不输入，后台生成")
+    @TableField("assignment_id")
+    private Long assignmentId;
+
+    @ApiModelProperty(notes = "文件存放路径",required=true)
+    @TableField("file_url")
+    private String fileUrl;
+
+    @ApiModelProperty(notes = "源文件名。例如：作业1",required=true)
+    @TableField("file_name")
+    private String fileName;
+
+    @ApiModelProperty(notes = "后缀名。例如：.doc/.ppt",required=true)
+    private String suffix;
+    
+    /**
+     * 文件大小
+     */
+    @ApiModelProperty(notes="文件大小",required=true)
+    private String size;
+
+    @ApiModelProperty(notes = "创建人id,前端不输入，后台生成")
+    @TableField(value = "create_by_id", fill = FieldFill.INSERT)
+    private Long createById;
+
+    @ApiModelProperty(notes = "创建人姓名,前端不输入，后台生成")
+    @TableField(value = "create_by_name", fill = FieldFill.INSERT)
+    private String createByName;
+
+    @ApiModelProperty(notes = "创建时间,前端不输入，后台生成")
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
+    private Date createTime;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/entity/AssignmentGrade.java

+package com.yizhi.assignment.application.vo.entity;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.FieldFill;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 老师布置的作业等级
+ * 编号100号作业 可以有多个等级
+ * </p>
+ *
+ * @author 王飞达123
+ * @since 2018-03-08
+ */
+@Data
+@Api(tags = "AssignmentGrade", description = "老师布置的作业等级 编号100号作业 可以有多个等级 ")
+@TableName("assignment_grade")
+public class AssignmentGrade extends Model<AssignmentGrade> {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(notes = "id主键")
+    private Long id;
+
+    @ApiModelProperty(notes = "作业id")
+    @TableField("assignment_id")
+    private Long assignmentId;
+
+    
+    @ApiModelProperty(notes = "开始分数")
+    @TableField("min_score")
+    private String minScore;
+    
+    
+    @ApiModelProperty(notes = "结束分数")
+    @TableField("max_score")
+    private String maxScore;
+    
+    
+    @ApiModelProperty(notes = "等级名字")
+    @TableField("description")
+    private String description;
+
+    @ApiModelProperty(notes = "创建人id")
+    @TableField(value = "create_by_id", fill = FieldFill.INSERT)
+    private Long createById;
+
+    @ApiModelProperty(notes = "创建人姓名")
+    @TableField(value = "create_by_name", fill = FieldFill.INSERT)
+    private String createByName;
+
+    @ApiModelProperty(notes = "创建时间")
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
+    private Date createTime;
+
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/entity/AssignmentPoint.java

+package com.yizhi.assignment.application.vo.entity;
+
+import java.io.Serializable;
+
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotations.Version;
+import com.baomidou.mybatisplus.enums.FieldFill;
+
+import lombok.Data;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author yizhi123
+ * @since 2018-09-04
+ */
+@Data
+@Api(tags = "AssignmentPoint", description = "")
+@TableName("assignment_point")
+public class AssignmentPoint extends Model<AssignmentPoint> {
+
+    private static final long serialVersionUID = 1L;
+
+
+@ApiModelProperty(value = "id主键")
+	private Long id;
+
+@ApiModelProperty(value = "任务id")
+	@TableField("assignment_id")
+	private Long assignmentId;
+
+@ApiModelProperty(value = "开始分数")
+	@TableField("min_score")
+	private Integer minScore;
+
+@ApiModelProperty(value = "结束分数")
+	@TableField("max_score")
+	private Integer maxScore;
+
+@ApiModelProperty(value = "获取积分")
+	@TableField("point")
+	private Integer point;
+
+@ApiModelProperty(value = "创建人id")
+	@TableField(value = "create_by_id", fill = FieldFill.INSERT)
+	private Long createById;
+
+@ApiModelProperty(value = "创建人姓名")
+	@TableField(value = "create_by_name", fill = FieldFill.INSERT)
+	private String createByName;
+
+@ApiModelProperty(value = "创建时间")
+	@TableField(value = "create_time", fill = FieldFill.INSERT)
+	private Date createTime;
+
+
+	@Override
+	protected Serializable pkVal() {
+		return this.id;
+	}
+
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/entity/AssignmentStudent.java

+package com.yizhi.assignment.application.vo.entity;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.FieldFill;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 老师布置作业和学生进行关联。
+ * 多对多的关系。
+ * 一个老师布置的作业有多个学生做。
+ * </p>
+ *
+ * @author 王飞达123
+ * @since 2018-03-08
+ */
+@Data
+@Api(tags = "AssignmentStudent", description = "老师布置作业和学生进行关联。 多对多的关系。 一个老师布置的作业有多个学生做。")
+@TableName("assignment_student")
+public class AssignmentStudent extends Model<AssignmentStudent> {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(notes = "id主键")
+    private Long id;
+
+    @ApiModelProperty(notes = "作业id")
+    @TableField("assignment_id")
+    private Long assignmentId;
+   
+
+    @ApiModelProperty(notes = "账号id")
+    @TableField("account_id")
+    private Long accountId;
+    
+    @ApiModelProperty(notes = "类型")
+    @TableField("type")
+    private Integer type;
+
+    @ApiModelProperty(notes = "创建人id")
+    @TableField(value = "create_by_id", fill = FieldFill.INSERT)
+    private Long createById;
+
+    @ApiModelProperty(notes = "创建人姓名")
+    @TableField(value = "create_by_name", fill = FieldFill.INSERT)
+    private String createByName;
+
+    @ApiModelProperty(notes = "创建时间")
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
+    private Date createTime;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/entity/Comment.java

+package com.yizhi.assignment.application.vo.entity;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.FieldFill;
+import com.yizhi.util.application.sensitive.annotation.SensitiveWords;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 培训项目 - 评论
+ * </p>
+ *
+ * @author shengchenglong
+ * @since 2018-03-27
+ */
+@Data
+@Api(tags = "Comment", description = "作业答案 - 评论")
+@TableName("comment")
+public class Comment extends Model<Comment> {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "主键id")
+    private Long id;
+
+    @ApiModelProperty(value = "作业答案id")
+    @TableField("assignment_answer_id")
+    private Long assignmentAnswerId;
+
+    @SensitiveWords
+    @ApiModelProperty(value = "评论内容")
+    private String content;
+
+    @ApiModelProperty(value = "审核状态：0通过，1下架（默认通过）")
+    @TableField("audit_status")
+    private String auditStatus;
+
+    @ApiModelProperty(value = "下架人id")
+    @TableField("auditor_id")
+    private Long auditorId;
+
+    @ApiModelProperty(value = "下架意见")
+    @TableField("audit_content")
+    private String auditContent;
+
+    @ApiModelProperty(value = "下架时间")
+    @TableField("auditor_time")
+    private Date auditorTime;
+
+    @ApiModelProperty(value = "创建者id")
+    @TableField(value = "create_by_id", fill = FieldFill.INSERT)
+    private Long createById;
+
+    @ApiModelProperty(value = "创建者名称")
+    @TableField(value = "create_by_name", fill = FieldFill.INSERT)
+    private String createByName;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    @ApiModelProperty(value = "站点id")
+    @TableField("site_id")
+    private Long siteId;
+
+    @ApiModelProperty(value = "组织id")
+    @TableField("org_id")
+    private Long orgId;
+
+    @ApiModelProperty(value = "企业id")
+    @TableField("company_id")
+    private Long companyId;
+
+    @ApiModelProperty(value = "用户头像")
+    @TableField("user_avatar")
+    private String  userAvatar;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @ApiModelProperty("状态(0：上架|1：下架  默认为0)")
+    @TableField("state")
+    private Integer state;
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/entity/CommentReply.java

+package com.yizhi.assignment.application.vo.entity;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.FieldFill;
+import com.yizhi.util.application.sensitive.annotation.SensitiveWords;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 培训项目 - 评论回复
+ * </p>
+ *
+ * @author shengchenglong
+ * @since 2018-03-27
+ */
+@Data
+@Api(tags = "CommentReply", description = "培训项目 - 评论回复")
+@TableName("comment_reply")
+public class CommentReply extends Model<CommentReply> {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "主键id")
+    private Long id;
+
+    @ApiModelProperty(value = "评论id")
+    @TableField("comment_id")
+    private Long commentId;
+
+    @ApiModelProperty(value = "作业答案id")
+    @TableField("assignment_answer_id")
+    private Long assignmentAnswerId;
+
+    @SensitiveWords
+    @ApiModelProperty(value = "回复内容")
+    private String content;
+
+    @ApiModelProperty(value = "删除状态：0未删除，1已删除")
+    @TableField("audit_status")
+    private String auditStatus;
+
+    @ApiModelProperty(value = "删除人id")
+    @TableField("auditor_id")
+    private Long auditorId;
+
+    @ApiModelProperty(value = "删除时间")
+    @TableField("auditor_time")
+    private Date auditorTime;
+
+    @ApiModelProperty(value = "创建者id")
+    @TableField(value = "create_by_id", fill = FieldFill.INSERT)
+    private Long createById;
+
+    @ApiModelProperty(value = "创建者账号名称")
+    @TableField(value = "create_by_name", fill = FieldFill.INSERT)
+    private String createByName;
+
+    @ApiModelProperty(value = "创建者真实名称")
+    @TableField(value = "create_by_full_name")
+    private String createByFullName;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    @ApiModelProperty(value = "站点id")
+    @TableField("site_id")
+    private Long siteId;
+
+    @ApiModelProperty(value = "组织id")
+    @TableField("org_id")
+    private Long orgId;
+
+    @ApiModelProperty(value = "企业id")
+    @TableField("company_id")
+    private Long companyId;
+
+    @ApiModelProperty(value = "用户头像")
+    @TableField("user_avatar")
+    private String userAvatar;
+
+    @ApiModelProperty(value = "回复用户父id")
+    @TableField("parent_account_id")
+    private Long parentAccountId;
+
+    @ApiModelProperty("回复用户父姓名")
+    @TableField("parent_account_fullName")
+    private String parentAccountFullName;
+
+    @ApiModelProperty(value = "回复用户父账号名称")
+    @TableField("parent_account_name")
+    private String parentAccountName;
+
+    @ApiModelProperty("评论回复父Id(若无默认为null)")
+    @TableField("reply_parent_id")
+    private Long replyParentId;
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+    
+    @ApiModelProperty("上架状态：0上架（默认）1下架")
+    @TableField("state")
+    private Integer state;
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/entity/CommentThumbsUp.java

+package com.yizhi.assignment.application.vo.entity;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableName;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 评论点赞记录
+ * </p>
+ *
+ * @author shengchenglong
+ * @since 2018-03-27
+ */
+@Data
+@Api(tags = "CommentThumbsUp", description = "评论点赞记录")
+@TableName("comment_thumbs_up")
+public class CommentThumbsUp extends Model<CommentThumbsUp> {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "主键id")
+    private Long id;
+
+    @ApiModelProperty(value = "评论id")
+    @TableField("comment_id")
+    private Long commentId;
+
+    @ApiModelProperty(value = "点赞人id")
+    @TableField("account_id")
+    private Long accountId;
+
+    @ApiModelProperty(value = "是否已经点赞")
+    @TableField(exist = false)
+    private Boolean hasThumbsUp;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/enums/AssignmentConstant.java

+package com.yizhi.assignment.application.vo.enums;
+
+/** 作业枚举类
+ * @author lly
+ * @date 2019年1月3日
+ */
+public enum AssignmentConstant {
+
+    SUBMISSION(0,"待提交"),MARKING(1,"批阅中"),PASS(2,"通过"),NO_PASS(3,"未通过"),Delay(4,"已逾期"),MARKUP(5,"补交");
+
+    private Integer code;
+    private String msg;
+
+    AssignmentConstant(Integer code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/enums/AssignmentHandleConstant.java

+package com.yizhi.assignment.application.vo.enums;
+
+/** 作业枚举类
+ * @author lly
+ * @date 2019年1月3日
+ */
+public enum AssignmentHandleConstant {
+
+    DETAIL(1,"详情"),SUBMIT(2,"提交作业"),SUBMITDETAIL(3,"提交作业&查看详情"),NO_HANDLE(4,"无操作"),
+    CONTINUEDETAIL(5,"继续提交&查看详情");
+
+    private Integer code;
+    private String msg;
+
+    AssignmentHandleConstant(Integer code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+}

cloud-assignment-api/src/main/java/com/yizhi/assignment/application/vo/enums/EvenType.java

+package com.yizhi.assignment.application.vo.enums;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ *
+ */
+
+public enum EvenType {
+
+    COURSE_UP(1L,Arrays.asList(1,2)),//"课程上架通知"
+    COURSE_FINISH(2L, Arrays.asList(1,2)),//课程完成通知
+    ENROLL_START(3L, Arrays.asList(1,3,4,5)),//报名开始
+    TRAINING_AUDIT_PASS(4L, Arrays.asList(1,3,4,5)),//项目审核通过通知
+    TRAINING_AUDIT_FAIL(5L, Arrays.asList(1,3,4,5)),//项目审核不通过通知
+    SIGN_SUCCESS(6L, Arrays.asList(1,3,4,5)),//签到成功通知
+    TRAINING_FINISH(7L, Arrays.asList(1,3,4,5)),//项目完成通知
+    ASSIGNMENT_AUDIT_FINISH(8L, Arrays.asList(1,6,7,8)),//作业已被批阅通知
+    EXAM_AUDIT_FINISH(9L, Arrays.asList(1,9,10,11)),//考试已被批阅通知
+    POINT_CHANGE(10L, Arrays.asList(1,12,13,14));//积分变动原因
+
+
+    //数据库message表的id
+    private Long key;
+
+    //数据库message_parameter表的field_type
+    private List<Integer> fieldType;
+
+    private EvenType(Long key, List<Integer> fieldType) {
+        this.key = key;
+        this.fieldType = fieldType;
+    }
+
+    public Long getKey() {
+        return key;
+    }
+
+    public List<Integer> getName() {
+        return fieldType;
+    }
+
+}

cloud-assignment/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>com.yizhi</groupId>
+        <artifactId>assignment-project</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>cloud-assignment</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.yizhi</groupId>
+            <artifactId>cloud-assignment-api</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.yizhi</groupId>
+            <artifactId>cloud-system-api</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.yizhi</groupId>
+            <artifactId>cloud-comment-api</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.yizhi</groupId>
+            <artifactId>cloud-common-api</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.yizhi</groupId>
+            <artifactId>cloud-newMessage-api</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.yizhi</groupId>
+            <artifactId>cloud-orm</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.yizhi</groupId>
+            <artifactId>cloud-util</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.yizhi</groupId>
+            <artifactId>cloud-core</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <!-- deploy 时跳过该模块 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+
+</project>
\ No newline at end of file

cloud-assignment/src/main/java/com/yizhi/application/AssignmentApplication.java

+package com.yizhi.application;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.ComponentScan;
+
+/**    
+ * @Author: shengchenglong
+ * @Date: 2018/3/6 14:29
+ */
+@SpringBootApplication
+@EnableDiscoveryClient
+@ComponentScan(basePackages = {"com.yizhi"})
+@EnableFeignClients(basePackages = {"com.yizhi"})
+public class AssignmentApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(AssignmentApplication.class, args);
+    }
+
+}

cloud-assignment/src/main/java/com/yizhi/application/controller/api/MinimbaController.java

+package com.yizhi.application.controller.api;
+
+import com.yizhi.core.application.context.ContextHolder;
+import com.yizhi.core.application.context.RequestContext;
+import com.yizhi.application.mapper.AssignmentMapper;
+import com.yizhi.util.application.num.NumUtil;
+import com.yizhi.assignment.application.vo.MinimbaAssignmentVO;
+import com.yizhi.assignment.application.vo.MinimbaStudyRecordVO;
+import com.yizhi.assignment.application.vo.MinimbaUserDetailParamVO;
+import com.yizhi.assignment.application.vo.MinimbaUserDetailVO;
+import org.apache.commons.collections.CollectionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author: ding
+ * @Date: 2019/10/24
+ */
+@RequestMapping("/assignment/minimba")
+@RestController(value = "MinimbaControllerRemote")
+public class MinimbaController {
+
+    private static final Logger logger = LoggerFactory.getLogger(MinimbaController.class);
+
+    @Autowired
+    private AssignmentMapper assignmentMapper;
+
+
+    @PostMapping("/userDetails")
+    public MinimbaUserDetailVO getUserDetails(@RequestBody MinimbaUserDetailParamVO paramVO) {
+        paramVO.getIsRealTime();
+        RequestContext context = ContextHolder.get();
+
+        MinimbaUserDetailVO vo = assignmentMapper.userDetail(paramVO, context.getSiteId(), context.getCompanyId(), context.getAccountId());
+        int allNum = assignmentMapper.selectCountAllPlan(paramVO);
+        int finishedNum = assignmentMapper.selectCountFinishedPlan(context.getAccountId(), paramVO);
+        String percentage = NumUtil.getPercentage(finishedNum, allNum, 0);
+        int res = Integer.parseInt(percentage.replace("%", ""));
+        vo.setPercentage(res);
+        return vo;
+    }
+
+    @GetMapping("/studyingRecords")
+    public List<MinimbaStudyRecordVO> getProjectStudyingRecords(Long projectId) {
+        List<MinimbaStudyRecordVO> vos = assignmentMapper.getMinimbaStudyRecordVO(projectId);
+        List<MinimbaStudyRecordVO> resultList = new ArrayList<>();
+
+        RequestContext res = ContextHolder.get();
+        if (CollectionUtils.isNotEmpty(vos)) {
+            vos.forEach(vo -> {
+//                vo.setCourseScore(assignmentMapper.selectScore(vo.getCourseId()));
+//                vo.setCourseStudyDuration(String.valueOf(assignmentMapper.selectSeconds(vo.getCourseId())));
+                List<MinimbaAssignmentVO> assignmentVOList = assignmentMapper.getMinimbaAssignmentVO(vo.getPlanId(), res.getAccountId());
+                Long examId = assignmentMapper.getPlanExamId(vo.getPlanId());
+                vo.setExamId(examId);
+                if (CollectionUtils.isNotEmpty(assignmentVOList)) {
+                    vo.setAssignmentAnswerList(assignmentVOList);
+                    resultList.add(vo);
+                }
+            });
+        }
+        return resultList;
+    }
+}
+

cloud-assignment/src/main/java/com/yizhi/application/controller/remote/MinimbaController.java

+package com.yizhi.application.controller.remote;
+
+import com.yizhi.core.application.context.ContextHolder;
+import com.yizhi.core.application.context.RequestContext;
+import com.yizhi.util.application.num.NumUtil;
+import com.yizhi.application.mapper.AssignmentMapper;
+import com.yizhi.assignment.application.vo.MinimbaAssignmentVO;
+import com.yizhi.assignment.application.vo.MinimbaStudyRecordVO;
+import com.yizhi.assignment.application.vo.MinimbaUserDetailParamVO;
+import com.yizhi.assignment.application.vo.MinimbaUserDetailVO;
+import org.apache.commons.collections.CollectionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author: ding
+ * @Date: 2019/10/24
+ */
+@RequestMapping("/remote/assignment/minimba")
+@RestController
+public class MinimbaController {
+
+    private static final Logger logger = LoggerFactory.getLogger(MinimbaController.class);
+
+    @Autowired
+    private AssignmentMapper assignmentMapper;
+
+
+    @PostMapping("/userDetails")
+    public MinimbaUserDetailVO getUserDetails(@RequestBody MinimbaUserDetailParamVO paramVO) {
+        paramVO.getIsRealTime();
+        RequestContext context = ContextHolder.get();
+
+        MinimbaUserDetailVO vo = assignmentMapper.userDetail(paramVO, context.getSiteId(), context.getCompanyId(), context.getAccountId());
+        int allNum = assignmentMapper.selectCountAllPlan(paramVO);
+        int finishedNum = assignmentMapper.selectCountFinishedPlan(context.getAccountId(), paramVO);
+        String percentage = NumUtil.getPercentage(finishedNum, allNum, 0);
+        int res = Integer.parseInt(percentage.replace("%", ""));
+        vo.setPercentage(res);
+        return vo;
+    }
+
+    @GetMapping("/studyingRecords")
+    public List<MinimbaStudyRecordVO> getProjectStudyingRecords(Long projectId) {
+        List<MinimbaStudyRecordVO> vos = assignmentMapper.getMinimbaStudyRecordVO(projectId);
+        List<MinimbaStudyRecordVO> resultList = new ArrayList<>();
+
+        RequestContext res = ContextHolder.get();
+        if (CollectionUtils.isNotEmpty(vos)) {
+            vos.forEach(vo -> {
+//                vo.setCourseScore(assignmentMapper.selectScore(vo.getCourseId()));
+//                vo.setCourseStudyDuration(String.valueOf(assignmentMapper.selectSeconds(vo.getCourseId())));
+                List<MinimbaAssignmentVO> assignmentVOList = assignmentMapper.getMinimbaAssignmentVO(vo.getPlanId(), res.getAccountId());
+                Long examId = assignmentMapper.getPlanExamId(vo.getPlanId());
+                vo.setExamId(examId);
+                if (CollectionUtils.isNotEmpty(assignmentVOList)) {
+                    vo.setAssignmentAnswerList(assignmentVOList);
+                    resultList.add(vo);
+                }
+            });
+        }
+        return resultList;
+    }
+}
+

cloud-assignment/src/main/java/com/yizhi/application/entity/Assignment.java

+package com.yizhi.application.entity;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.FieldFill;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 老师布置作业的主表
+ * </p>
+ *
+ * @author 王飞达123
+ * @since 2018-03-08
+ */
+@Data
+
+@TableName("assignment")
+public class Assignment extends Model<Assignment> {
+
+    private static final long serialVersionUID = 1L;
+
+
+    
+    private Long id;
+
+    
+    @TableField("training_project_id")
+    private Long trainingProjectId;
+
+    
+    @TableField("training_project_name")
+    private String trainingProjectName;
+
+    
+    @TableField("serial_num")
+    private Long serialNum;
+
+    
+    private String name;
+
+    
+    @TableField("enable_remind")
+    private Integer enableRemind;
+
+    
+    private Integer amendable;
+
+    
+    @TableField("visible_range")
+    private Integer visibleRange;
+    
+
+    
+    @TableField("finish_time")
+    private Date finishTime;
+
+    
+    private Integer status;
+
+    
+    private Integer count;
+    
+    
+    @TableField("pass_score")
+    private Integer passScore;
+    
+    
+    
+    
+	private Integer type;
+    
+
+    
+    @TableField("added_time")
+    private Date addedTime;
+
+
+    
+    @TableField("company_id")
+    private Long companyId;
+
+    
+    @TableField("site_id")
+    private Long siteId;
+
+    
+    @TableField("org_id")
+    private Long orgId;
+
+    
+    @TableField(value = "create_by_id", fill = FieldFill.INSERT)
+    private Long createById;
+
+    
+    @TableField(value = "create_by_name", fill = FieldFill.INSERT)
+    private String createByName;
+
+    
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    
+    @TableField(value = "update_by_id", fill = FieldFill.INSERT)
+    private Long updateById;
+
+    
+    @TableField(value = "update_by_name", fill = FieldFill.INSERT)
+    private String updateByName;
+
+    
+    @TableField(value = "update_time", fill = FieldFill.INSERT)
+    private Date updateTime;
+
+    
+    @TableField("answer_charater_num_min")
+    private Integer answerCharaterNumMin;
+
+    
+    @TableField("answer_charater_num_max")
+    private Integer answerCharaterNumMax;
+
+    
+    @TableField("answer_attachment_num_min")
+    private Integer answerAttachmentNumMin;
+
+    
+    @TableField("answer_attachment_num_max")
+    private Integer answerAttachmentNumMax;
+
+    
+    @TableField("show_res")
+    private Integer showRes;
+
+    
+    @TableField("enable_exercise_book")
+    private Integer enableExerciseBook;
+
+    
+    @TableField("keywords")
+    private String keywords;
+
+    
+    private String image;
+
+    
+    @TableField("enable_task")
+    private Integer enableTask;
+
+    
+    @TableField("task_start_date")
+    private Date taskStartDate;
+
+    
+    @TableField("task_end_date")
+    private Date taskEndDate;
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

cloud-assignment/src/main/java/com/yizhi/application/entity/AssignmentAnswer.java

+package com.yizhi.application.entity;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.FieldFill;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 学员对作业的对应关系
+ * <p>
+ * </p>
+ *
+ * @author 王飞达123
+ * @since 2018-03-08
+ */
+@Data
+
+@TableName("assignment_answer")
+public class AssignmentAnswer extends Model<AssignmentAnswer> {
+
+    private static final long serialVersionUID = 1L;
+
+
+    
+    private Long id;
+
+    
+    @TableField("assignment_id")
+    private Long assignmentId;
+
+    
+    @TableField("real_name")
+    private String realName;
+
+    
+    @TableField("account_id")
+    private Long accountId;
+    
+    
+    
+    @TableField("account_name")
+    private String accountName;
+    
+    
+    private String content;
+   
+
+    
+    private Integer score;
+    
+    
+    
+	@TableField("point")
+	private Integer Point;
+
+   
+
+    
+    @TableField("auditor_id")
+    private Long auditorId;
+    
+    
+    @TableField("auditor_time")
+    private Date auditorTime;
+    
+    
+    
+    private Integer status;
+    
+    
+    
+    @TableField("source")
+    private Integer source;
+    
+    
+    @TableField("company_id")
+    private Long companyId;
+
+   
+
+    
+    @TableField("site_id")
+    private Long siteId;
+
+    
+    @TableField("org_id")
+    private Long orgId;
+
+    
+    @TableField(value = "create_by_id", fill = FieldFill.INSERT)
+    private Long createById;
+
+    
+    @TableField(value = "create_by_name", fill = FieldFill.INSERT)
+    private String createByName;
+
+    
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    
+    @TableField(value = "update_by_id", fill = FieldFill.INSERT)
+    private Long updateById;
+
+    
+    @TableField(value = "update_by_name", fill = FieldFill.INSERT)
+    private String updateByName;
+
+    
+    @TableField(value = "update_time", fill = FieldFill.INSERT)
+    private Date updateTime;
+    
+    
+    @TableField(value="answer_file_zip")
+    private String answerFileZip;
+
+    
+    @TableField("is_down")
+    private Integer isDown;
+
+    
+    private Integer deleted;
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}