Ver código fonte

阅卷中间件调用阅卷后端工程的调用方式更改

nikang 6 anos atrás
pai
commit
4d3bb0b2f2
32 arquivos alterados com 1621 adições e 71 exclusões
  1. 40 0
      examcloud-core-marking-api-client/src/main/java/cn/com/qmth/examcloud/marking/api/client/MarkItemCloudServiceClient.java
  2. 50 0
      examcloud-core-marking-api-client/src/main/java/cn/com/qmth/examcloud/marking/api/client/MarkTaskCloudServiceClient.java
  3. 53 0
      examcloud-core-marking-api-client/src/main/java/cn/com/qmth/examcloud/marking/api/client/MarkWorkCloudServiceClient.java
  4. 9 0
      examcloud-core-marking-api-client/src/main/java/cn/com/qmth/examcloud/marking/api/client/StudentPaperCloudServiceClient.java
  5. 22 0
      examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/MarkItemCloudService.java
  6. 34 0
      examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/MarkTaskCloudService.java
  7. 33 0
      examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/MarkWorkCloudService.java
  8. 7 0
      examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/StudentPaperCloudService.java
  9. 215 0
      examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/bean/MarkItemBean.java
  10. 242 0
      examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/bean/MarkTaskBean.java
  11. 180 0
      examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/bean/MarkWorkBean.java
  12. 146 64
      examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/bean/StudentPaperBean.java
  13. 91 0
      examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/request/GetMarkResultReq.java
  14. 41 0
      examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/request/GetMarkTaskReq.java
  15. 27 0
      examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/request/GetMarkWorkReq.java
  16. 20 6
      examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/request/GetStudentPaperReq.java
  17. 44 0
      examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/request/SaveMarkItemReq.java
  18. 24 0
      examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/request/SaveMarkTaskReq.java
  19. 27 0
      examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/request/SaveMarkWorkReq.java
  20. 41 0
      examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/request/SaveStudentPaperReq.java
  21. 24 0
      examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/request/UpdateMarkTaskReq.java
  22. 28 0
      examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/request/UpdateMarkWorkReq.java
  23. 1 1
      examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/response/GetMarkResultResp.java
  24. 26 0
      examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/response/GetMarkTaskResp.java
  25. 29 0
      examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/response/GetMarkWorkResp.java
  26. 59 0
      examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/response/PageInfo.java
  27. 14 0
      examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/response/SaveMarkItemResp.java
  28. 14 0
      examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/response/SaveMarkTaskResp.java
  29. 24 0
      examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/response/SaveMarkWorkResp.java
  30. 14 0
      examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/response/SaveStudentPaperResp.java
  31. 14 0
      examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/response/UpdateMarkTaskResp.java
  32. 28 0
      examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/response/UpdateMarkWorkResp.java

+ 40 - 0
examcloud-core-marking-api-client/src/main/java/cn/com/qmth/examcloud/marking/api/client/MarkItemCloudServiceClient.java

@@ -0,0 +1,40 @@
+package cn.com.qmth.examcloud.marking.api.client;
+
+import cn.com.qmth.examcloud.commons.web.redis.RedisClient;
+import cn.com.qmth.examcloud.marking.api.MarkItemCloudService;
+import cn.com.qmth.examcloud.marking.api.request.SaveMarkItemReq;
+import cn.com.qmth.examcloud.marking.api.request.SaveMarkWorkReq;
+import cn.com.qmth.examcloud.marking.api.response.SaveMarkItemResp;
+import cn.com.qmth.examcloud.marking.api.response.SaveMarkWorkResp;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+/**
+ * @ClassName MarkItemCloudServiceClient
+ * @Description TODO
+ * @Author nikang
+ * @Date 2018/11/27 11:17
+ * @Version 3.0
+ */
+@Service
+public class MarkItemCloudServiceClient extends BasicCloudClientSupport implements MarkItemCloudService {
+    @Autowired
+    private RestTemplate restTemplate;
+    @Autowired
+    private RedisClient redisClient;
+    @Override
+    protected RestTemplate getRestTemplate() {
+        return this.restTemplate;
+    }
+
+    @Override
+    protected RedisClient getRedisClient() {
+        return this.redisClient;
+    }
+
+    @Override
+    public SaveMarkItemResp saveMarkWork(SaveMarkItemReq req) {
+        return post("markItem/saveMarkItemList",req, SaveMarkItemResp.class);
+    }
+}

+ 50 - 0
examcloud-core-marking-api-client/src/main/java/cn/com/qmth/examcloud/marking/api/client/MarkTaskCloudServiceClient.java

@@ -0,0 +1,50 @@
+package cn.com.qmth.examcloud.marking.api.client;
+
+import cn.com.qmth.examcloud.commons.web.redis.RedisClient;
+import cn.com.qmth.examcloud.marking.api.MarkTaskCloudService;
+import cn.com.qmth.examcloud.marking.api.request.GetMarkTaskReq;
+import cn.com.qmth.examcloud.marking.api.request.SaveMarkTaskReq;
+import cn.com.qmth.examcloud.marking.api.request.UpdateMarkTaskReq;
+import cn.com.qmth.examcloud.marking.api.response.GetMarkTaskResp;
+import cn.com.qmth.examcloud.marking.api.response.SaveMarkTaskResp;
+import cn.com.qmth.examcloud.marking.api.response.UpdateMarkTaskResp;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.client.RestTemplate;
+
+/**
+ * @ClassName MarkTaskCloudServiceClient
+ * @Description TODO
+ * @Author nikang
+ * @Date 2018/11/27 17:21
+ * @Version 3.0
+ */
+public class MarkTaskCloudServiceClient extends BasicCloudClientSupport implements MarkTaskCloudService {
+    @Autowired
+    private RestTemplate restTemplate;
+    @Autowired
+    private RedisClient redisClient;
+    @Override
+    protected RestTemplate getRestTemplate() {
+        return this.restTemplate;
+    }
+
+    @Override
+    protected RedisClient getRedisClient() {
+        return this.redisClient;
+    }
+
+    @Override
+    public GetMarkTaskResp getMarkTask(GetMarkTaskReq req) {
+        return post("markTask/getMarkTask",req,GetMarkTaskResp.class);
+    }
+
+    @Override
+    public SaveMarkTaskResp saveMarkTask(SaveMarkTaskReq req) {
+        return post("markTask/saveMarkTask",req,SaveMarkTaskResp.class);
+    }
+
+    @Override
+    public UpdateMarkTaskResp updateMarkTask(UpdateMarkTaskReq req) {
+        return post("markTask/updateMarkTask",req,UpdateMarkTaskResp.class);
+    }
+}

+ 53 - 0
examcloud-core-marking-api-client/src/main/java/cn/com/qmth/examcloud/marking/api/client/MarkWorkCloudServiceClient.java

@@ -0,0 +1,53 @@
+package cn.com.qmth.examcloud.marking.api.client;
+
+import cn.com.qmth.examcloud.commons.web.redis.RedisClient;
+import cn.com.qmth.examcloud.marking.api.MarkWorkCloudService;
+import cn.com.qmth.examcloud.marking.api.request.GetMarkWorkReq;
+import cn.com.qmth.examcloud.marking.api.request.SaveMarkWorkReq;
+import cn.com.qmth.examcloud.marking.api.request.UpdateMarkWorkReq;
+import cn.com.qmth.examcloud.marking.api.response.GetMarkWorkResp;
+import cn.com.qmth.examcloud.marking.api.response.SaveMarkWorkResp;
+import cn.com.qmth.examcloud.marking.api.response.UpdateMarkWorkResp;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+/**
+ * @ClassName MarkWorkCloudServiceClient
+ * @Description TODO
+ * @Author nikang
+ * @Date 2018/11/26 13:45
+ * @Version 3.0
+ */
+@Service
+public class MarkWorkCloudServiceClient extends BasicCloudClientSupport implements MarkWorkCloudService {
+    @Autowired
+    RestTemplate restTemplate;
+
+    @Autowired
+    private RedisClient redisClient;
+    @Override
+    protected RestTemplate getRestTemplate() {
+        return restTemplate;
+    }
+
+    @Override
+    protected RedisClient getRedisClient() {
+        return redisClient;
+    }
+
+    @Override
+    public GetMarkWorkResp getMarkWork(GetMarkWorkReq req) {
+        return post("markWorks/getAll",req, GetMarkWorkResp.class);
+    }
+
+    @Override
+    public SaveMarkWorkResp saveMarkWork(SaveMarkWorkReq req) {
+        return post("markWorks/saveMarkWork",req, SaveMarkWorkResp.class);
+    }
+
+    @Override
+    public UpdateMarkWorkResp updateMarkWork(UpdateMarkWorkReq req) {
+        return post("markWorks/updateMarkWork",req, UpdateMarkWorkResp.class);
+    }
+}

+ 9 - 0
examcloud-core-marking-api-client/src/main/java/cn/com/qmth/examcloud/marking/api/client/StudentPaperCloudServiceClient.java

@@ -3,8 +3,11 @@ package cn.com.qmth.examcloud.marking.api.client;
 import cn.com.qmth.examcloud.commons.web.redis.RedisClient;
 import cn.com.qmth.examcloud.marking.api.StudentPaperCloudService;
 import cn.com.qmth.examcloud.marking.api.request.GetStudentPaperReq;
+import cn.com.qmth.examcloud.marking.api.request.SaveStudentPaperReq;
 import cn.com.qmth.examcloud.marking.api.response.GetStudentPaperResp;
+import cn.com.qmth.examcloud.marking.api.response.SaveStudentPaperResp;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
 /**
@@ -14,6 +17,7 @@ import org.springframework.web.client.RestTemplate;
  * @Date 2018/9/20 18:25
  * @Version 3.0
  */
+@Service
 public class StudentPaperCloudServiceClient extends BasicCloudClientSupport implements StudentPaperCloudService {
 
     private static final long serialVersionUID = -8711706052966399720L;
@@ -38,4 +42,9 @@ public class StudentPaperCloudServiceClient extends BasicCloudClientSupport impl
     public GetStudentPaperResp getStudentPaper(GetStudentPaperReq req) {
         return post("studentPaper/getPaper",req,GetStudentPaperResp.class);
     }
+
+    @Override
+    public SaveStudentPaperResp saveStudentPaper(SaveStudentPaperReq req) {
+        return post("studentPaper/savePaperList",req,SaveStudentPaperResp.class);
+    }
 }

+ 22 - 0
examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/MarkItemCloudService.java

@@ -0,0 +1,22 @@
+package cn.com.qmth.examcloud.marking.api;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.CloudService;
+import cn.com.qmth.examcloud.marking.api.request.SaveMarkItemReq;
+import cn.com.qmth.examcloud.marking.api.request.SaveMarkWorkReq;
+import cn.com.qmth.examcloud.marking.api.response.SaveMarkItemResp;
+import cn.com.qmth.examcloud.marking.api.response.SaveMarkWorkResp;
+
+/**
+ * @ClassName MarkItemCloudService
+ * @Description TODO
+ * @Author nikang
+ * @Date 2018/11/27 11:16
+ * @Version 3.0
+ */
+public interface MarkItemCloudService extends CloudService {
+
+    /**
+     * 批量保存评分项
+     */
+    SaveMarkItemResp saveMarkWork(SaveMarkItemReq req);
+}

+ 34 - 0
examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/MarkTaskCloudService.java

@@ -0,0 +1,34 @@
+package cn.com.qmth.examcloud.marking.api;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.CloudService;
+import cn.com.qmth.examcloud.marking.api.request.GetMarkTaskReq;
+import cn.com.qmth.examcloud.marking.api.request.SaveMarkTaskReq;
+import cn.com.qmth.examcloud.marking.api.request.UpdateMarkTaskReq;
+import cn.com.qmth.examcloud.marking.api.response.GetMarkTaskResp;
+import cn.com.qmth.examcloud.marking.api.response.SaveMarkTaskResp;
+import cn.com.qmth.examcloud.marking.api.response.UpdateMarkTaskResp;
+
+/**
+ * @ClassName MarkTaskCloudService
+ * @Description TODO
+ * @Author nikang
+ * @Date 2018/11/27 17:12
+ * @Version 3.0
+ */
+public interface MarkTaskCloudService extends CloudService {
+    /**
+     * 获取评卷任务集
+     */
+    GetMarkTaskResp getMarkTask(GetMarkTaskReq req);
+
+    /**
+     * 导入评卷任务时新增评卷任务数据
+     */
+    SaveMarkTaskResp saveMarkTask(SaveMarkTaskReq req);
+
+    /**
+     * 更新评卷任务:
+     * 后台操作逻辑包括:save,update,delete操作,详情看具体服务
+     */
+    UpdateMarkTaskResp updateMarkTask(UpdateMarkTaskReq req);
+}

+ 33 - 0
examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/MarkWorkCloudService.java

@@ -0,0 +1,33 @@
+package cn.com.qmth.examcloud.marking.api;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.CloudService;
+import cn.com.qmth.examcloud.marking.api.request.GetMarkWorkReq;
+import cn.com.qmth.examcloud.marking.api.request.SaveMarkWorkReq;
+import cn.com.qmth.examcloud.marking.api.request.UpdateMarkWorkReq;
+import cn.com.qmth.examcloud.marking.api.response.GetMarkWorkResp;
+import cn.com.qmth.examcloud.marking.api.response.SaveMarkWorkResp;
+import cn.com.qmth.examcloud.marking.api.response.UpdateMarkWorkResp;
+
+/**
+ * @ClassName MarkWorkCloudService
+ * @Description TODO
+ * @Author nikang
+ * @Date 2018/11/26 13:41
+ * @Version 3.0
+ */
+public interface MarkWorkCloudService extends CloudService {
+    /**
+     * 获取评卷工作集
+     */
+    GetMarkWorkResp getMarkWork(GetMarkWorkReq req);
+
+    /**
+     * 保存阅卷工作
+     */
+    SaveMarkWorkResp saveMarkWork(SaveMarkWorkReq req);
+
+    /**
+     * 更新阅卷工作
+     */
+    UpdateMarkWorkResp updateMarkWork(UpdateMarkWorkReq req);
+}

+ 7 - 0
examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/StudentPaperCloudService.java

@@ -2,7 +2,9 @@ package cn.com.qmth.examcloud.marking.api;
 
 import cn.com.qmth.examcloud.commons.web.cloud.api.CloudService;
 import cn.com.qmth.examcloud.marking.api.request.GetStudentPaperReq;
+import cn.com.qmth.examcloud.marking.api.request.SaveStudentPaperReq;
 import cn.com.qmth.examcloud.marking.api.response.GetStudentPaperResp;
+import cn.com.qmth.examcloud.marking.api.response.SaveStudentPaperResp;
 
 /**
  * @ClassName StudentPaperCloudService
@@ -16,4 +18,9 @@ public interface StudentPaperCloudService extends CloudService {
      * 获取下一张待评试卷(或获取指定答卷)
      */
     GetStudentPaperResp getStudentPaper(GetStudentPaperReq req);
+
+    /**
+     * 批量保存考生
+     */
+    SaveStudentPaperResp saveStudentPaper(SaveStudentPaperReq req);
 }

+ 215 - 0
examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/bean/MarkItemBean.java

@@ -0,0 +1,215 @@
+package cn.com.qmth.examcloud.marking.api.bean;
+
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
+
+/**
+ * @ClassName MarkItemBean
+ * @Description TODO
+ * @Author nikang
+ * @Date 2018/11/27 11:07
+ * @Version 3.0
+ */
+public class MarkItemBean implements JsonSerializable {
+    private static final long serialVersionUID = -7730711644410595809L;
+    private long id;
+    enum ScoringType{
+        /**
+         * 根据给分间隔
+         */
+        INTERVAL,
+        /**
+         * 人工指定给分列表
+         */
+        MANUAL
+    }
+
+    private String basePaperId;
+
+    private Long workId;
+
+    private Long markRangeId;
+
+    /**
+     * 大题号
+     */
+    private int mainNumber;
+
+    /**
+     * 小题号
+     */
+    private int subNumber;
+
+    /**
+     * 全卷范围内排序
+     */
+    private int orders;
+
+    /**
+     * 分值
+     */
+    private double maxScore;
+
+    /**
+     * 题Id
+     */
+    private String questionId;
+
+    /**
+     * 给分方式
+     */
+    private MarkItemBean.ScoringType scoringType;
+
+    /**
+     * 给分间隔
+     */
+    private Double scoreInterval;
+
+    /**
+     * 给分列表
+     */
+    private String socreList;
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getBasePaperId() {
+        return basePaperId;
+    }
+
+    public void setBasePaperId(String basePaperId) {
+        this.basePaperId = basePaperId;
+    }
+
+    public Long getWorkId() {
+        return workId;
+    }
+
+    public void setWorkId(Long workId) {
+        this.workId = workId;
+    }
+
+    public Long getMarkRangeId() {
+        return markRangeId;
+    }
+
+    public void setMarkRangeId(Long markRangeId) {
+        this.markRangeId = markRangeId;
+    }
+
+    public int getMainNumber() {
+        return mainNumber;
+    }
+
+    public void setMainNumber(int mainNumber) {
+        this.mainNumber = mainNumber;
+    }
+
+    public int getSubNumber() {
+        return subNumber;
+    }
+
+    public void setSubNumber(int subNumber) {
+        this.subNumber = subNumber;
+    }
+
+    public int getOrders() {
+        return orders;
+    }
+
+    public void setOrders(int orders) {
+        this.orders = orders;
+    }
+
+    public double getMaxScore() {
+        return maxScore;
+    }
+
+    public void setMaxScore(double maxScore) {
+        this.maxScore = maxScore;
+    }
+
+    public String getQuestionId() {
+        return questionId;
+    }
+
+    public void setQuestionId(String questionId) {
+        this.questionId = questionId;
+    }
+
+    public ScoringType getScoringType() {
+        return scoringType;
+    }
+
+    public void setScoringType(ScoringType scoringType) {
+        this.scoringType = scoringType;
+    }
+
+    public Double getScoreInterval() {
+        return scoreInterval;
+    }
+
+    public void setScoreInterval(Double scoreInterval) {
+        this.scoreInterval = scoreInterval;
+    }
+
+    public String getSocreList() {
+        return socreList;
+    }
+
+    public void setSocreList(String socreList) {
+        this.socreList = socreList;
+    }
+
+    public MarkItemBean() {
+    }
+
+    public MarkItemBean(String basePaperId, int mainNumber, int subNumber, double maxScore, Double scoreInterval, int orders, String questionId) {
+        this.basePaperId = basePaperId;
+        this.mainNumber = mainNumber;
+        this.subNumber = subNumber;
+        this.maxScore = maxScore;
+        this.scoreInterval = scoreInterval == null ? 1 : scoreInterval;
+        this.scoringType = MarkItemBean.ScoringType.INTERVAL;
+        this.orders = orders;
+        this.questionId = questionId;
+    }
+
+    public MarkItemBean(String basePaperId, int mainNumber,int subNumber,double maxScore,String socreList) {
+        this.basePaperId = basePaperId;
+        this.mainNumber = mainNumber;
+        this.subNumber = subNumber;
+        this.maxScore = maxScore;
+        this.socreList = socreList == null ? String.valueOf(this.maxScore) : socreList;
+        this.scoringType = MarkItemBean.ScoringType.MANUAL;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        MarkItemBean markItem = (MarkItemBean) o;
+
+        if (getMainNumber() != markItem.getMainNumber()) return false;
+        if (getSubNumber() != markItem.getSubNumber()) return false;
+        if (getBasePaperId() != null ? !getBasePaperId().equals(markItem.getBasePaperId()) : markItem.getBasePaperId() != null)
+            return false;
+        return getWorkId() != null ? getWorkId().equals(markItem.getWorkId()) : markItem.getWorkId() == null;
+
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getBasePaperId() != null ? getBasePaperId().hashCode() : 0;
+        result = 31 * result + (getWorkId() != null ? getWorkId().hashCode() : 0);
+        result = 31 * result + getMainNumber();
+        result = 31 * result + getSubNumber();
+        return result;
+    }
+}

+ 242 - 0
examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/bean/MarkTaskBean.java

@@ -0,0 +1,242 @@
+package cn.com.qmth.examcloud.marking.api.bean;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
+
+/**
+ * @ClassName MarkTaskBean
+ * @Description TODO
+ * @Author nikang
+ * @Date 2018/11/27 17:03
+ * @Version 3.0
+ */
+public class MarkTaskBean implements JsonSerializable {
+
+    private static final long serialVersionUID = -5290322662893858995L;
+
+    private Long id;
+    private Long userId;
+    private String userName;
+    private String userLoginName;
+    private Long workId;
+    private Long examId;
+    private Long markRangeId;
+    private String markRangeName;
+    private String basePaperId;
+    private String basePaperName;
+    private String paperType;
+    private String courseName;
+    private String courseCode;
+    private Long courseId;
+    /**
+     * 限制数量
+     */
+    private Long limitCount;
+
+    private Long markedCount;
+    private Long leftCount;
+    private Long totalCount;
+
+    private Long[] userIds;
+
+    private Double maxScore;
+    private Double minScore;
+    private Double avgScore;
+    private Double stdDev;
+
+    private Long rootOrgId;
+
+    public MarkTaskBean() {
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getUserLoginName() {
+        return userLoginName;
+    }
+
+    public void setUserLoginName(String userLoginName) {
+        this.userLoginName = userLoginName;
+    }
+
+    public Long getWorkId() {
+        return workId;
+    }
+
+    public void setWorkId(Long workId) {
+        this.workId = workId;
+    }
+
+    public Long getExamId() {
+        return examId;
+    }
+
+    public void setExamId(Long examId) {
+        this.examId = examId;
+    }
+
+    public Long getMarkRangeId() {
+        return markRangeId;
+    }
+
+    public void setMarkRangeId(Long markRangeId) {
+        this.markRangeId = markRangeId;
+    }
+
+    public String getMarkRangeName() {
+        return markRangeName;
+    }
+
+    public void setMarkRangeName(String markRangeName) {
+        this.markRangeName = markRangeName;
+    }
+
+    public String getBasePaperId() {
+        return basePaperId;
+    }
+
+    public void setBasePaperId(String basePaperId) {
+        this.basePaperId = basePaperId;
+    }
+
+    public String getBasePaperName() {
+        return basePaperName;
+    }
+
+    public void setBasePaperName(String basePaperName) {
+        this.basePaperName = basePaperName;
+    }
+
+    public String getPaperType() {
+        return paperType;
+    }
+
+    public void setPaperType(String paperType) {
+        this.paperType = paperType;
+    }
+
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
+
+    public String getCourseCode() {
+        return courseCode;
+    }
+
+    public void setCourseCode(String courseCode) {
+        this.courseCode = courseCode;
+    }
+
+    public Long getCourseId() {
+        return courseId;
+    }
+
+    public void setCourseId(Long courseId) {
+        this.courseId = courseId;
+    }
+
+    public Long getLimitCount() {
+        return limitCount;
+    }
+
+    public void setLimitCount(Long limitCount) {
+        this.limitCount = limitCount;
+    }
+
+    public Long getMarkedCount() {
+        return markedCount;
+    }
+
+    public void setMarkedCount(Long markedCount) {
+        this.markedCount = markedCount;
+    }
+
+    public Long getLeftCount() {
+        return leftCount;
+    }
+
+    public void setLeftCount(Long leftCount) {
+        this.leftCount = leftCount;
+    }
+
+    public Long getTotalCount() {
+        return totalCount;
+    }
+
+    public void setTotalCount(Long totalCount) {
+        this.totalCount = totalCount;
+    }
+
+    public Long[] getUserIds() {
+        return userIds;
+    }
+
+    public void setUserIds(Long[] userIds) {
+        this.userIds = userIds;
+    }
+
+    public Double getMaxScore() {
+        return maxScore;
+    }
+
+    public void setMaxScore(Double maxScore) {
+        this.maxScore = maxScore;
+    }
+
+    public Double getMinScore() {
+        return minScore;
+    }
+
+    public void setMinScore(Double minScore) {
+        this.minScore = minScore;
+    }
+
+    public Double getAvgScore() {
+        return avgScore;
+    }
+
+    public void setAvgScore(Double avgScore) {
+        this.avgScore = avgScore;
+    }
+
+    public Double getStdDev() {
+        return stdDev;
+    }
+
+    public void setStdDev(Double stdDev) {
+        this.stdDev = stdDev;
+    }
+
+    public Long getRootOrgId() {
+        return rootOrgId;
+    }
+
+    public void setRootOrgId(Long rootOrgId) {
+        this.rootOrgId = rootOrgId;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+}

+ 180 - 0
examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/bean/MarkWorkBean.java

@@ -0,0 +1,180 @@
+package cn.com.qmth.examcloud.marking.api.bean;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @ClassName MarkWorkBean
+ * @Description TODO
+ * @Author nikang
+ * @Date 2018/11/26 11:32
+ * @Version 3.0
+ */
+public class MarkWorkBean implements JsonSerializable {
+    private static final long serialVersionUID = -4913141821109915639L;
+    private Long id;
+
+    private String name;
+
+    private Date createdOn;
+
+    private String examId;
+
+    private String remark;
+
+    private Long totalStudentPaper;
+
+    private Long markedStudentPaper;
+
+    private Long totalCourse;
+
+    private Long markedCourse;
+
+    private Long totalMarkItem;
+
+    private double progress;
+
+    private int status;
+
+    private Long rootOrgId;
+
+    private Long userId;
+
+    private String examName;
+
+    private String examType;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Date getCreatedOn() {
+        return createdOn;
+    }
+
+    public void setCreatedOn(Date createdOn) {
+        this.createdOn = createdOn;
+    }
+
+    public String getExamId() {
+        return examId;
+    }
+
+    public void setExamId(String examId) {
+        this.examId = examId;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public Long getTotalStudentPaper() {
+        return totalStudentPaper;
+    }
+
+    public void setTotalStudentPaper(Long totalStudentPaper) {
+        this.totalStudentPaper = totalStudentPaper;
+    }
+
+    public Long getMarkedStudentPaper() {
+        return markedStudentPaper;
+    }
+
+    public void setMarkedStudentPaper(Long markedStudentPaper) {
+        this.markedStudentPaper = markedStudentPaper;
+    }
+
+    public Long getTotalCourse() {
+        return totalCourse;
+    }
+
+    public void setTotalCourse(Long totalCourse) {
+        this.totalCourse = totalCourse;
+    }
+
+    public Long getMarkedCourse() {
+        return markedCourse;
+    }
+
+    public void setMarkedCourse(Long markedCourse) {
+        this.markedCourse = markedCourse;
+    }
+
+    public Long getTotalMarkItem() {
+        return totalMarkItem;
+    }
+
+    public void setTotalMarkItem(Long totalMarkItem) {
+        this.totalMarkItem = totalMarkItem;
+    }
+
+    public double getProgress() {
+        return progress;
+    }
+
+    public void setProgress(double progress) {
+        this.progress = progress;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public Long getRootOrgId() {
+        return rootOrgId;
+    }
+
+    public void setRootOrgId(Long rootOrgId) {
+        this.rootOrgId = rootOrgId;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public String getExamName() {
+        return examName;
+    }
+
+    public void setExamName(String examName) {
+        this.examName = examName;
+    }
+
+    public String getExamType() {
+        return examType;
+    }
+
+    public void setExamType(String examType) {
+        this.examType = examType;
+    }
+
+    public MarkWorkBean() {
+
+    }
+}

+ 146 - 64
examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/bean/StudentPaperBean.java

@@ -2,6 +2,7 @@ package cn.com.qmth.examcloud.marking.api.bean;
 
 import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
 
+
 /**
  * @ClassName StudentPaperBean
  * @Description TODO
@@ -12,86 +13,156 @@ import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
 public class StudentPaperBean implements JsonSerializable {
     private static final long serialVersionUID = 4537371984439448611L;
 
-    private long id;
-
-    private String paperId;
-
-    private String studentId;
+    private Long id;
+    //阅卷ec_oe_exam_record_4_marking主键
+    private Long examRecordMarkingPk;
+    //考生ID
+    private Long examStudentId;
+    //学生姓名
+    private String studentName;
+    //学号
+    private String studentCode;
+    //课程名称
+    private String courseName;
 
     private Long workId;
 
-    private String studentCode;
+    private String orgCode;
 
-    private String studentName;
+    private String identityNumber;
+
+    //基础试卷ID
+    private String basePaperId;
 
+    //课程Code
     private String courseCode;
 
-    private String courseName;
+    //课程Id
+    private Long courseId;
 
-    private String orgCode;
+    //考试记录Id
+    private Long examRecordDataId;
 
-    private String identityNumber;
+    //客观分
+    private Double objectiveScore;
 
+    //试卷类型
+    private String paperType;
+
+    //学生专业
     private String specialtyName;
 
-    private String specialtyCode;
+    /**
+     * 学生答卷的主观题HTML
+     */
+    private String studentSubjectiveHtml;
 
-    public StudentPaperBean() {
-    }
-    public StudentPaperBean(Long workId, String paperId, String studentId,
-                        String studentCode,String studentName,String courseCode,String courseName,
-                        String orgCode,String identityNumber, String specialtyName, String specialtyCode) {
-        this.paperId = paperId;
-        this.studentId = studentId;
-        this.workId = workId;
-        this.studentCode = studentCode;
+    public StudentPaperBean(){}
+
+    public StudentPaperBean(Long examRecordMarkingPk, Long examStudentId, String studentName, String studentCode, String courseName, Long workId, String orgCode, String identityNumber, String basePaperId, String courseCode, Long courseId, Long examRecordDataId, Double objectiveScore, String paperType, String specialtyName) {
+        this.examRecordMarkingPk = examRecordMarkingPk;
+        this.examStudentId = examStudentId;
         this.studentName = studentName;
-        this.courseCode = courseCode;
+        this.studentCode = studentCode;
         this.courseName = courseName;
+        this.workId = workId;
         this.orgCode = orgCode;
         this.identityNumber = identityNumber;
-        this.specialtyCode = specialtyCode;
+        this.basePaperId = basePaperId;
+        this.courseCode = courseCode;
+        this.courseId = courseId;
+        this.examRecordDataId = examRecordDataId;
+        this.objectiveScore = objectiveScore;
+        this.paperType = paperType;
         this.specialtyName = specialtyName;
     }
 
-    public long getId() {
-        return id;
+    public Long getWorkId() {
+        return workId;
     }
 
-    public void setId(long id) {
-        this.id = id;
+    public void setWorkId(Long workId) {
+        this.workId = workId;
     }
 
-    public String getPaperId() {
-        return paperId;
+    public String getCourseCode() {
+        return courseCode;
     }
 
-    public void setPaperId(String paperId) {
-        this.paperId = paperId;
+    public void setCourseCode(String courseCode) {
+        this.courseCode = courseCode;
     }
 
-    public String getStudentId() {
-        return studentId;
+    public String getOrgCode() {
+        return orgCode;
     }
 
-    public void setStudentId(String studentId) {
-        this.studentId = studentId;
+    public void setOrgCode(String orgCode) {
+        this.orgCode = orgCode;
     }
 
-    public Long getWorkId() {
-        return workId;
+    public String getIdentityNumber() {
+        return identityNumber;
     }
 
-    public void setWorkId(Long workId) {
-        this.workId = workId;
+    public void setIdentityNumber(String identityNumber) {
+        this.identityNumber = identityNumber;
     }
 
-    public String getStudentCode() {
-        return studentCode;
+    public Long getExamRecordDataId() {
+        return examRecordDataId;
     }
 
-    public void setStudentCode(String studentCode) {
-        this.studentCode = studentCode;
+    public void setExamRecordDataId(Long examRecordDataId) {
+        this.examRecordDataId = examRecordDataId;
+    }
+
+    public Double getObjectiveScore() {
+        return objectiveScore;
+    }
+
+    public void setObjectiveScore(Double objectiveScore) {
+        this.objectiveScore = objectiveScore;
+    }
+
+    public String getPaperType() {
+        return paperType;
+    }
+
+    public void setPaperType(String paperType) {
+        this.paperType = paperType;
+    }
+
+    public Long getExamStudentId() {
+        return examStudentId;
+    }
+
+    public void setExamStudentId(Long examStudentId) {
+        this.examStudentId = examStudentId;
+    }
+
+    public String getBasePaperId() {
+        return basePaperId;
+    }
+
+    public void setBasePaperId( String basePaperId) {
+        this.basePaperId = basePaperId;
+    }
+
+    public Long getCourseId() {
+        return courseId;
+    }
+
+    public void setCourseId(Long courseId) {
+        this.courseId = courseId;
+    }
+
+    public Long getExamRecordMarkingPk() {
+        return examRecordMarkingPk;
+    }
+
+    public void setExamRecordMarkingPk(Long examRecordMarkingPk) {
+        this.examRecordMarkingPk = examRecordMarkingPk;
     }
 
     public String getStudentName() {
@@ -102,12 +173,12 @@ public class StudentPaperBean implements JsonSerializable {
         this.studentName = studentName;
     }
 
-    public String getCourseCode() {
-        return courseCode;
+    public String getStudentCode() {
+        return studentCode;
     }
 
-    public void setCourseCode(String courseCode) {
-        this.courseCode = courseCode;
+    public void setStudentCode(String studentCode) {
+        this.studentCode = studentCode;
     }
 
     public String getCourseName() {
@@ -118,35 +189,46 @@ public class StudentPaperBean implements JsonSerializable {
         this.courseName = courseName;
     }
 
-    public String getOrgCode() {
-        return orgCode;
-    }
-
-    public void setOrgCode(String orgCode) {
-        this.orgCode = orgCode;
+    public String getSpecialtyName() {
+        return specialtyName;
     }
 
-    public String getIdentityNumber() {
-        return identityNumber;
+    public void setSpecialtyName(String specialtyName) {
+        this.specialtyName = specialtyName;
     }
 
-    public void setIdentityNumber(String identityNumber) {
-        this.identityNumber = identityNumber;
+    public String getStudentSubjectiveHtml() {
+        return studentSubjectiveHtml;
     }
 
-    public String getSpecialtyName() {
-        return specialtyName;
+    public void setStudentSubjectiveHtml(String studentSubjectiveHtml) {
+        this.studentSubjectiveHtml = studentSubjectiveHtml;
     }
 
-    public void setSpecialtyName(String specialtyName) {
-        this.specialtyName = specialtyName;
+    public Long getId() {
+        return id;
     }
 
-    public String getSpecialtyCode() {
-        return specialtyCode;
+    public void setId(Long id) {
+        this.id = id;
     }
 
-    public void setSpecialtyCode(String specialtyCode) {
-        this.specialtyCode = specialtyCode;
+    public StudentPaperBean(Long workId, Long examRecordMarkingPk, String basePaperId, Long examStudentId, Long courseId,
+                            String orgCode, Long examRecordId, Double objectiveScore, String paperType, String courseCode, String identityNumber, String studentName, String studentCode, String courseName, String specialtyName) {
+        this.examRecordMarkingPk = examRecordMarkingPk;
+        this.basePaperId = basePaperId;
+        this.examStudentId = examStudentId;
+        this.workId = workId;
+        this.orgCode = orgCode;
+        this.examRecordDataId = examRecordId;
+        this.objectiveScore = objectiveScore;
+        this.paperType = paperType;
+        this.courseId = courseId;
+        this.courseCode = courseCode;
+        this.identityNumber = identityNumber;
+        this.studentName = studentName;
+        this.studentCode = studentCode;
+        this.courseName = courseName;
+        this.specialtyName = specialtyName;
     }
 }

+ 91 - 0
examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/request/GetMarkResultReq.java

@@ -14,6 +14,25 @@ public class GetMarkResultReq extends BaseRequest {
     //考生Id
     private Long examStudentId;
 
+    private Long workId;
+
+    private String orgCode;
+
+    private String courseCode;
+
+    private String tag;
+
+    private String studentCode;
+
+    private String studentName;
+
+    private Long userId;
+
+    private Integer curPage;
+
+    private Integer pageSize;
+
+
     public GetMarkResultReq() {
     }
 
@@ -24,4 +43,76 @@ public class GetMarkResultReq extends BaseRequest {
     public void setExamStudentId(Long examStudentId) {
         this.examStudentId = examStudentId;
     }
+
+    public Long getWorkId() {
+        return workId;
+    }
+
+    public void setWorkId(Long workId) {
+        this.workId = workId;
+    }
+
+    public String getOrgCode() {
+        return orgCode;
+    }
+
+    public void setOrgCode(String orgCode) {
+        this.orgCode = orgCode;
+    }
+
+    public String getCourseCode() {
+        return courseCode;
+    }
+
+    public void setCourseCode(String courseCode) {
+        this.courseCode = courseCode;
+    }
+
+    public String getTag() {
+        return tag;
+    }
+
+    public void setTag(String tag) {
+        this.tag = tag;
+    }
+
+    public String getStudentCode() {
+        return studentCode;
+    }
+
+    public void setStudentCode(String studentCode) {
+        this.studentCode = studentCode;
+    }
+
+    public String getStudentName() {
+        return studentName;
+    }
+
+    public void setStudentName(String studentName) {
+        this.studentName = studentName;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public Integer getCurPage() {
+        return curPage;
+    }
+
+    public void setCurPage(Integer curPage) {
+        this.curPage = curPage;
+    }
+
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
 }

+ 41 - 0
examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/request/GetMarkTaskReq.java

@@ -0,0 +1,41 @@
+package cn.com.qmth.examcloud.marking.api.request;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+
+/**
+ * @ClassName GetMarkTaskReq
+ * @Description TODO
+ * @Author nikang
+ * @Date 2018/11/27 17:07
+ * @Version 3.0
+ */
+public class GetMarkTaskReq extends BaseRequest {
+    private static final long serialVersionUID = 8360867457944678312L;
+    private Long workId;
+    private Long userId;
+    private String courseCode;
+
+    public Long getWorkId() {
+        return workId;
+    }
+
+    public void setWorkId(Long workId) {
+        this.workId = workId;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public String getCourseCode() {
+        return courseCode;
+    }
+
+    public void setCourseCode(String courseCode) {
+        this.courseCode = courseCode;
+    }
+}

+ 27 - 0
examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/request/GetMarkWorkReq.java

@@ -0,0 +1,27 @@
+package cn.com.qmth.examcloud.marking.api.request;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+import cn.com.qmth.examcloud.marking.api.bean.MarkWorkBean;
+
+/**
+ * @ClassName GetMarkWorkReq
+ * @Description TODO
+ * @Author nikang
+ * @Date 2018/11/26 13:36
+ * @Version 3.0
+ */
+public class GetMarkWorkReq extends BaseRequest {
+    private static final long serialVersionUID = -9154173403760764631L;
+    private MarkWorkBean markWorkBean;
+
+    public MarkWorkBean getMarkWorkBean() {
+        return markWorkBean;
+    }
+
+    public void setMarkWorkBean(MarkWorkBean markWorkBean) {
+        this.markWorkBean = markWorkBean;
+    }
+
+    public GetMarkWorkReq() {
+    }
+}

+ 20 - 6
examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/request/GetStudentPaperReq.java

@@ -16,26 +16,40 @@ public class GetStudentPaperReq extends BaseRequest {
     /**
      * 阅卷任务表ID---ecs_marking_mark_task
      */
-    private long markTaskId;
+    private Long markTaskId;
 
     /**
      * 待阅卷的考卷信息表ID---ecs_marking_student_paper
      */
-    private long studentPaperId;
+    private Long studentPaperId;
 
-    public long getMarkTaskId() {
+    /**
+     * 考试类型
+     * @return
+     */
+    private String examType;
+
+    public Long getMarkTaskId() {
         return markTaskId;
     }
 
-    public void setMarkTaskId(long markTaskId) {
+    public void setMarkTaskId(Long markTaskId) {
         this.markTaskId = markTaskId;
     }
 
-    public long getStudentPaperId() {
+    public Long getStudentPaperId() {
         return studentPaperId;
     }
 
-    public void setStudentPaperId(long studentPaperId) {
+    public void setStudentPaperId(Long studentPaperId) {
         this.studentPaperId = studentPaperId;
     }
+
+    public String getExamType() {
+        return examType;
+    }
+
+    public void setExamType(String examType) {
+        this.examType = examType;
+    }
 }

+ 44 - 0
examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/request/SaveMarkItemReq.java

@@ -0,0 +1,44 @@
+package cn.com.qmth.examcloud.marking.api.request;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+import cn.com.qmth.examcloud.marking.api.bean.MarkItemBean;
+
+import java.util.List;
+
+/**
+ * @ClassName SaveMarkItemReq
+ * @Description TODO
+ * @Author nikang
+ * @Date 2018/11/27 11:10
+ * @Version 3.0
+ */
+public class SaveMarkItemReq extends BaseRequest {
+
+    /**
+     * 评卷工作Id
+     */
+    private Long workId;
+
+    public Long getWorkId() {
+        return workId;
+    }
+
+    public void setWorkId(Long workId) {
+        this.workId = workId;
+    }
+
+    /**
+     * 评分项集合
+     */
+
+
+    private List<MarkItemBean> markItemBeanList;
+
+    public List<MarkItemBean> getMarkItemBeanList() {
+        return markItemBeanList;
+    }
+
+    public void setMarkItemBeanList(List<MarkItemBean> markItemBeanList) {
+        this.markItemBeanList = markItemBeanList;
+    }
+}

+ 24 - 0
examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/request/SaveMarkTaskReq.java

@@ -0,0 +1,24 @@
+package cn.com.qmth.examcloud.marking.api.request;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+import cn.com.qmth.examcloud.marking.api.bean.MarkTaskBean;
+
+/**
+ * @ClassName SaveMarkTaskReq
+ * @Description TODO
+ * @Author nikang
+ * @Date 2018/11/27 17:14
+ * @Version 3.0
+ */
+public class SaveMarkTaskReq extends BaseRequest {
+    private static final long serialVersionUID = 536110341609790082L;
+    private MarkTaskBean markTaskBean;
+
+    public MarkTaskBean getMarkTaskBean() {
+        return markTaskBean;
+    }
+
+    public void setMarkTaskBean(MarkTaskBean markTaskBean) {
+        this.markTaskBean = markTaskBean;
+    }
+}

+ 27 - 0
examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/request/SaveMarkWorkReq.java

@@ -0,0 +1,27 @@
+package cn.com.qmth.examcloud.marking.api.request;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+import cn.com.qmth.examcloud.marking.api.bean.MarkWorkBean;
+
+/**
+ * @ClassName SaveMarkWorkReq
+ * @Description TODO
+ * @Author nikang
+ * @Date 2018/11/26 15:25
+ * @Version 3.0
+ */
+public class SaveMarkWorkReq extends BaseRequest {
+    private static final long serialVersionUID = 5952633153643698692L;
+    private MarkWorkBean markWorkBean;
+
+    public SaveMarkWorkReq() {
+    }
+
+    public MarkWorkBean getMarkWorkBean() {
+        return markWorkBean;
+    }
+
+    public void setMarkWorkBean(MarkWorkBean markWorkBean) {
+        this.markWorkBean = markWorkBean;
+    }
+}

+ 41 - 0
examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/request/SaveStudentPaperReq.java

@@ -0,0 +1,41 @@
+package cn.com.qmth.examcloud.marking.api.request;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+import cn.com.qmth.examcloud.marking.api.bean.StudentPaperBean;
+
+import java.util.List;
+
+/**
+ * @ClassName SaveStudentPaperReq
+ * @Description TODO
+ * @Author nikang
+ * @Date 2018/11/27 11:23
+ * @Version 3.0
+ */
+public class SaveStudentPaperReq extends BaseRequest {
+    private static final long serialVersionUID = 3629938126322995669L;
+    /**
+     * 评卷工作Id
+     */
+    private Long workId;
+    /**
+     * 考生集合
+     */
+    List<StudentPaperBean> studentPaperBeanList;
+
+    public Long getWorkId() {
+        return workId;
+    }
+
+    public void setWorkId(Long workId) {
+        this.workId = workId;
+    }
+
+    public List<StudentPaperBean> getStudentPaperBeanList() {
+        return studentPaperBeanList;
+    }
+
+    public void setStudentPaperBeanList(List<StudentPaperBean> studentPaperBeanList) {
+        this.studentPaperBeanList = studentPaperBeanList;
+    }
+}

+ 24 - 0
examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/request/UpdateMarkTaskReq.java

@@ -0,0 +1,24 @@
+package cn.com.qmth.examcloud.marking.api.request;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+import cn.com.qmth.examcloud.marking.api.bean.MarkTaskBean;
+
+/**
+ * @ClassName UpdateMarkTaskReq
+ * @Description TODO
+ * @Author nikang
+ * @Date 2018/11/27 17:15
+ * @Version 3.0
+ */
+public class UpdateMarkTaskReq extends BaseRequest {
+    private static final long serialVersionUID = 5911296448886020998L;
+    private MarkTaskBean markTaskBean;
+
+    public MarkTaskBean getMarkTaskBean() {
+        return markTaskBean;
+    }
+
+    public void setMarkTaskBean(MarkTaskBean markTaskBean) {
+        this.markTaskBean = markTaskBean;
+    }
+}

+ 28 - 0
examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/request/UpdateMarkWorkReq.java

@@ -0,0 +1,28 @@
+package cn.com.qmth.examcloud.marking.api.request;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+import cn.com.qmth.examcloud.marking.api.bean.MarkWorkBean;
+
+/**
+ * @ClassName UpdateMarkWorkReq
+ * @Description TODO
+ * @Author nikang
+ * @Date 2018/11/26 15:33
+ * @Version 3.0
+ */
+public class UpdateMarkWorkReq extends BaseRequest {
+    private static final long serialVersionUID = 2589023055968985565L;
+    MarkWorkBean markWorkBean;
+
+    public MarkWorkBean getMarkWorkBean() {
+        return markWorkBean;
+    }
+
+    public void setMarkWorkBean(MarkWorkBean markWorkBean) {
+        this.markWorkBean = markWorkBean;
+    }
+
+    public UpdateMarkWorkReq() {
+
+    }
+}

+ 1 - 1
examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/response/GetMarkResultResp.java

@@ -10,7 +10,7 @@ import cn.com.qmth.examcloud.marking.api.bean.MarkResultBean;
  * @Date 2018/9/27 9:09
  * @Version 3.0
  */
-public class GetMarkResultResp extends BaseResponse {
+public class GetMarkResultResp extends PageInfo {
 
     private static final long serialVersionUID = 4892486776787678144L;
 

+ 26 - 0
examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/response/GetMarkTaskResp.java

@@ -0,0 +1,26 @@
+package cn.com.qmth.examcloud.marking.api.response;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
+import cn.com.qmth.examcloud.marking.api.bean.MarkTaskBean;
+
+import java.util.List;
+
+/**
+ * @ClassName GetMarkTaskResp
+ * @Description TODO
+ * @Author nikang
+ * @Date 2018/11/27 17:10
+ * @Version 3.0
+ */
+public class GetMarkTaskResp extends BaseResponse {
+    private static final long serialVersionUID = 7559730943549702375L;
+    private List<MarkTaskBean> markTaskBeanList;
+
+    public List<MarkTaskBean> getMarkTaskBeanList() {
+        return markTaskBeanList;
+    }
+
+    public void setMarkTaskBeanList(List<MarkTaskBean> markTaskBeanList) {
+        this.markTaskBeanList = markTaskBeanList;
+    }
+}

+ 29 - 0
examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/response/GetMarkWorkResp.java

@@ -0,0 +1,29 @@
+package cn.com.qmth.examcloud.marking.api.response;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
+import cn.com.qmth.examcloud.marking.api.bean.MarkWorkBean;
+
+import java.util.List;
+
+/**
+ * @ClassName GetMarkWorkResp
+ * @Description TODO
+ * @Author nikang
+ * @Date 2018/11/26 13:37
+ * @Version 3.0
+ */
+public class GetMarkWorkResp extends BaseResponse {
+    private static final long serialVersionUID = -5728231681623086518L;
+    private List<MarkWorkBean> markWorkBeanList;
+
+    public GetMarkWorkResp() {
+    }
+
+    public List<MarkWorkBean> getMarkWorkBeanList() {
+        return markWorkBeanList;
+    }
+
+    public void setMarkWorkBeanList(List<MarkWorkBean> markWorkBeanList) {
+        this.markWorkBeanList = markWorkBeanList;
+    }
+}

+ 59 - 0
examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/response/PageInfo.java

@@ -0,0 +1,59 @@
+package cn.com.qmth.examcloud.marking.api.response;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
+
+/**
+ * @ClassName PageInfo
+ * @Description TODO
+ * @Author nikang
+ * @Date 2018/11/27 9:36
+ * @Version 3.0
+ */
+public class PageInfo extends BaseResponse {
+    private long size;
+    private long totalElements;
+    private long totalPages;
+    private long page;
+
+    public PageInfo() {
+    }
+
+    public PageInfo(long size, long totalElements, long totalPages, long page) {
+        this.size = size;
+        this.totalElements = totalElements;
+        this.totalPages = totalPages;
+        this.page = page;
+    }
+
+    public long getSize() {
+        return size;
+    }
+
+    public void setSize(long size) {
+        this.size = size;
+    }
+
+    public long getTotalElements() {
+        return totalElements;
+    }
+
+    public void setTotalElements(long totalElements) {
+        this.totalElements = totalElements;
+    }
+
+    public long getTotalPages() {
+        return totalPages;
+    }
+
+    public void setTotalPages(long totalPages) {
+        this.totalPages = totalPages;
+    }
+
+    public long getPage() {
+        return page;
+    }
+
+    public void setPage(long page) {
+        this.page = page;
+    }
+}

+ 14 - 0
examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/response/SaveMarkItemResp.java

@@ -0,0 +1,14 @@
+package cn.com.qmth.examcloud.marking.api.response;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
+
+/**
+ * @ClassName SaveMarkItemResp
+ * @Description TODO
+ * @Author nikang
+ * @Date 2018/11/27 11:14
+ * @Version 3.0
+ */
+public class SaveMarkItemResp extends BaseResponse {
+    private static final long serialVersionUID = -8161112446232887688L;
+}

+ 14 - 0
examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/response/SaveMarkTaskResp.java

@@ -0,0 +1,14 @@
+package cn.com.qmth.examcloud.marking.api.response;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
+
+/**
+ * @ClassName SaveMarkTaskResp
+ * @Description TODO
+ * @Author nikang
+ * @Date 2018/11/27 17:16
+ * @Version 3.0
+ */
+public class SaveMarkTaskResp extends BaseResponse {
+    private static final long serialVersionUID = -4913046451544944935L;
+}

+ 24 - 0
examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/response/SaveMarkWorkResp.java

@@ -0,0 +1,24 @@
+package cn.com.qmth.examcloud.marking.api.response;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
+import cn.com.qmth.examcloud.marking.api.bean.MarkWorkBean;
+
+/**
+ * @ClassName SaveMarkWorkResp
+ * @Description TODO
+ * @Author nikang
+ * @Date 2018/11/26 15:28
+ * @Version 3.0
+ */
+public class SaveMarkWorkResp extends BaseResponse {
+    private static final long serialVersionUID = -7808123653932150098L;
+    private MarkWorkBean markWorkBean;
+
+    public MarkWorkBean getMarkWorkBean() {
+        return markWorkBean;
+    }
+
+    public void setMarkWorkBean(MarkWorkBean markWorkBean) {
+        this.markWorkBean = markWorkBean;
+    }
+}

+ 14 - 0
examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/response/SaveStudentPaperResp.java

@@ -0,0 +1,14 @@
+package cn.com.qmth.examcloud.marking.api.response;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
+
+/**
+ * @ClassName SaveStudentPaperResp
+ * @Description TODO
+ * @Author nikang
+ * @Date 2018/11/27 11:24
+ * @Version 3.0
+ */
+public class SaveStudentPaperResp extends BaseResponse {
+    private static final long serialVersionUID = 8978057711958157144L;
+}

+ 14 - 0
examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/response/UpdateMarkTaskResp.java

@@ -0,0 +1,14 @@
+package cn.com.qmth.examcloud.marking.api.response;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
+
+/**
+ * @ClassName UpdateMarkTaskResp
+ * @Description TODO
+ * @Author nikang
+ * @Date 2018/11/27 17:16
+ * @Version 3.0
+ */
+public class UpdateMarkTaskResp extends BaseResponse {
+    private static final long serialVersionUID = 4570410933900113212L;
+}

+ 28 - 0
examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/response/UpdateMarkWorkResp.java

@@ -0,0 +1,28 @@
+package cn.com.qmth.examcloud.marking.api.response;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
+import cn.com.qmth.examcloud.marking.api.bean.MarkWorkBean;
+
+/**
+ * @ClassName UpdateMarkWorkResp
+ * @Description TODO
+ * @Author nikang
+ * @Date 2018/11/26 15:34
+ * @Version 3.0
+ */
+public class UpdateMarkWorkResp extends BaseResponse {
+    private static final long serialVersionUID = 1741258511357718601L;
+    MarkWorkBean markWorkBean;
+
+    public UpdateMarkWorkResp() {
+
+    }
+
+    public MarkWorkBean getMarkWorkBean() {
+        return markWorkBean;
+    }
+
+    public void setMarkWorkBean(MarkWorkBean markWorkBean) {
+        this.markWorkBean = markWorkBean;
+    }
+}