Merge remote-tracking branch 'origin/master'

examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/bean/MarkResultBean.java

@@ -4,7 +4,6 @@ import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
 
 /**
  * @ClassName MarkResultBean
- * @Description TODO
  * @Author nikang
  * @Date 2018/9/27 9:12
  * @Version 3.0
@@ -15,6 +14,8 @@ public class MarkResultBean implements JsonSerializable {
     //评卷结果表主键Id
     private Long id;
 
+    private String identityNumber;
+    
     private Long userId;
 
     private Long markRangeId;
@@ -289,4 +290,14 @@ public class MarkResultBean implements JsonSerializable {
     public void setStudentPaper(StudentPaperBean studentPaper) {
         this.studentPaper = studentPaper;
     }
+
+	public String getIdentityNumber() {
+		return identityNumber;
+	}
+
+	public void setIdentityNumber(String identityNumber) {
+		this.identityNumber = identityNumber;
+	}
+    
+    
 }

examcloud-core-reports-api-client/src/main/java/cn/com/qmth/examcloud/core/reports/api/client/ProjectCloudServiceClient.java

@@ -5,9 +5,11 @@ import org.springframework.stereotype.Service;
 import cn.com.qmth.examcloud.core.reports.api.ProjectCloudService;
 import cn.com.qmth.examcloud.core.reports.api.request.GetProjectInfoBeanReq;
 import cn.com.qmth.examcloud.core.reports.api.request.UpdateProjectCourseOrgCountReq;
+import cn.com.qmth.examcloud.core.reports.api.request.UpdateProjectStatusByIdsReq;
 import cn.com.qmth.examcloud.core.reports.api.request.UpdateProjectStatusReq;
 import cn.com.qmth.examcloud.core.reports.api.response.GetProjectInfoBeanResp;
 import cn.com.qmth.examcloud.core.reports.api.response.UpdateProjectCourseOrgCountResp;
+import cn.com.qmth.examcloud.core.reports.api.response.UpdateProjectStatusByIdsResp;
 import cn.com.qmth.examcloud.core.reports.api.response.UpdateProjectStatusResp;
 
 @Service
@@ -34,4 +36,9 @@ public class ProjectCloudServiceClient extends AbstractCloudClientSupport implem
 		return post("project/updateCourseOrgCount", req, UpdateProjectCourseOrgCountResp.class);
 	}
 
+	@Override
+	public UpdateProjectStatusByIdsResp updateProjectStatusByIds(UpdateProjectStatusByIdsReq req) {
+		return post("project/updateStatusByIds", req, UpdateProjectStatusByIdsResp.class);
+	}
+
 }

examcloud-core-reports-api/src/main/java/cn/com/qmth/examcloud/core/reports/api/ProjectCloudService.java

@@ -3,16 +3,20 @@ package cn.com.qmth.examcloud.core.reports.api;
 import cn.com.qmth.examcloud.api.commons.CloudService;
 import cn.com.qmth.examcloud.core.reports.api.request.GetProjectInfoBeanReq;
 import cn.com.qmth.examcloud.core.reports.api.request.UpdateProjectCourseOrgCountReq;
+import cn.com.qmth.examcloud.core.reports.api.request.UpdateProjectStatusByIdsReq;
 import cn.com.qmth.examcloud.core.reports.api.request.UpdateProjectStatusReq;
 import cn.com.qmth.examcloud.core.reports.api.response.GetProjectInfoBeanResp;
 import cn.com.qmth.examcloud.core.reports.api.response.UpdateProjectCourseOrgCountResp;
+import cn.com.qmth.examcloud.core.reports.api.response.UpdateProjectStatusByIdsResp;
 import cn.com.qmth.examcloud.core.reports.api.response.UpdateProjectStatusResp;
 
 public interface ProjectCloudService extends CloudService {
-	
+
 	UpdateProjectStatusResp updateProjectStatus(UpdateProjectStatusReq req);
-	
+
+	UpdateProjectStatusByIdsResp updateProjectStatusByIds(UpdateProjectStatusByIdsReq req);
+
 	GetProjectInfoBeanResp getProjectBean(GetProjectInfoBeanReq req);
-	
+
 	UpdateProjectCourseOrgCountResp updateProjectCourseOrgCount(UpdateProjectCourseOrgCountReq req);
 }

examcloud-core-reports-api/src/main/java/cn/com/qmth/examcloud/core/reports/api/request/UpdateProjectStatusByIdsReq.java

@@ -0,0 +1,36 @@
+package cn.com.qmth.examcloud.core.reports.api.request;
+
+import java.util.List;
+
+import cn.com.qmth.examcloud.api.commons.exchange.BaseRequest;
+
+public class UpdateProjectStatusByIdsReq extends BaseRequest {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -5602419757764001050L;
+
+	private List<Long> computingProjectIds;
+	
+	private List<Long> stopingProjectIds;
+
+	public List<Long> getComputingProjectIds() {
+		return computingProjectIds;
+	}
+
+	public void setComputingProjectIds(List<Long> computingProjectIds) {
+		this.computingProjectIds = computingProjectIds;
+	}
+
+	public List<Long> getStopingProjectIds() {
+		return stopingProjectIds;
+	}
+
+	public void setStopingProjectIds(List<Long> stopingProjectIds) {
+		this.stopingProjectIds = stopingProjectIds;
+	}
+	
+	
+	
+}

examcloud-core-reports-api/src/main/java/cn/com/qmth/examcloud/core/reports/api/response/UpdateProjectStatusByIdsResp.java

@@ -0,0 +1,14 @@
+package cn.com.qmth.examcloud.core.reports.api.response;
+
+import cn.com.qmth.examcloud.api.commons.exchange.BaseResponse;
+
+public class UpdateProjectStatusByIdsResp extends BaseResponse {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -5670791308176861846L;
+
+
+
+}