Merge remote-tracking branch 'origin/master'

examcloud-core-reports-api-client/src/main/java/org/examcloud/core/reports/api/client/ExamCourseDataReportCloudServiceClient.java

@@ -1,7 +1,9 @@
 package org.examcloud.core.reports.api.client;
 
 import org.examcloud.core.reports.api.ExamCourseDataReportCloudService;
+import org.examcloud.core.reports.api.request.DeleteExamCourseDataReportByProjectReq;
 import org.examcloud.core.reports.api.request.SaveExamCourseDataReportListReq;
+import org.examcloud.core.reports.api.response.DeleteExamCourseDataReportByProjectResp;
 import org.examcloud.core.reports.api.response.SaveExamCourseDataReportListResp;
 import org.springframework.stereotype.Service;
 
@@ -19,4 +21,10 @@ public class ExamCourseDataReportCloudServiceClient extends AbstractCloudClientS
 		return post("examCourseDataReport/saveList", req, SaveExamCourseDataReportListResp.class);
 	}
 
+	@Override
+	public DeleteExamCourseDataReportByProjectResp deleteExamCourseDataReportByProject(
+			DeleteExamCourseDataReportByProjectReq req) {
+		return post("examCourseDataReport/deleteByProject", req, DeleteExamCourseDataReportByProjectResp.class);
+	}
+
 }

examcloud-core-reports-api-client/src/main/java/org/examcloud/core/reports/api/client/ExamOrgReportCloudServiceClient.java

@@ -1,7 +1,9 @@
 package org.examcloud.core.reports.api.client;
 
 import org.examcloud.core.reports.api.ExamOrgReportCloudService;
+import org.examcloud.core.reports.api.request.DeleteExamOrgReportByProjectReq;
 import org.examcloud.core.reports.api.request.SaveExamOrgReportListReq;
+import org.examcloud.core.reports.api.response.DeleteExamOrgReportByProjectResp;
 import org.examcloud.core.reports.api.response.SaveExamOrgReportListResp;
 import org.springframework.stereotype.Service;
 
@@ -18,4 +20,9 @@ public class ExamOrgReportCloudServiceClient extends AbstractCloudClientSupport
 		return post("examOrgReport/saveList", req, SaveExamOrgReportListResp.class);
 	}
 
+	@Override
+	public DeleteExamOrgReportByProjectResp deleteExamOrgReportByProject(DeleteExamOrgReportByProjectReq req) {
+		return post("examOrgReport/deleteByProject", req, DeleteExamOrgReportByProjectResp.class);
+	}
+
 }

examcloud-core-reports-api-client/src/main/java/org/examcloud/core/reports/api/client/ProjectCloudServiceClient.java

@@ -1,7 +1,9 @@
 package org.examcloud.core.reports.api.client;
 
 import org.examcloud.core.reports.api.ProjectCloudService;
+import org.examcloud.core.reports.api.request.GetProjectInfoBeanReq;
 import org.examcloud.core.reports.api.request.UpdateProjectStatusReq;
+import org.examcloud.core.reports.api.response.GetProjectInfoBeanResp;
 import org.examcloud.core.reports.api.response.UpdateProjectStatusResp;
 import org.springframework.stereotype.Service;
 
@@ -19,4 +21,9 @@ public class ProjectCloudServiceClient extends AbstractCloudClientSupport implem
 		return post("project/updateStatus", req, UpdateProjectStatusResp.class);
 	}
 
+	@Override
+	public GetProjectInfoBeanResp getProjectBean(GetProjectInfoBeanReq req) {
+		return post("project/getProjectBean", req, GetProjectInfoBeanResp.class);
+	}
+
 }

examcloud-core-reports-api/src/main/java/org/examcloud/core/reports/api/ExamCourseDataReportCloudService.java

@@ -1,10 +1,13 @@
 package org.examcloud.core.reports.api;
 
+import org.examcloud.core.reports.api.request.DeleteExamCourseDataReportByProjectReq;
 import org.examcloud.core.reports.api.request.SaveExamCourseDataReportListReq;
+import org.examcloud.core.reports.api.response.DeleteExamCourseDataReportByProjectResp;
 import org.examcloud.core.reports.api.response.SaveExamCourseDataReportListResp;
 
 import cn.com.qmth.examcloud.api.commons.CloudService;
 
 public interface ExamCourseDataReportCloudService extends CloudService {
 	SaveExamCourseDataReportListResp saveExamCourseDataReportList(SaveExamCourseDataReportListReq req);
+	DeleteExamCourseDataReportByProjectResp deleteExamCourseDataReportByProject(DeleteExamCourseDataReportByProjectReq req);
 }

examcloud-core-reports-api/src/main/java/org/examcloud/core/reports/api/ExamOrgReportCloudService.java

@@ -1,10 +1,13 @@
 package org.examcloud.core.reports.api;
 
+import org.examcloud.core.reports.api.request.DeleteExamOrgReportByProjectReq;
 import org.examcloud.core.reports.api.request.SaveExamOrgReportListReq;
+import org.examcloud.core.reports.api.response.DeleteExamOrgReportByProjectResp;
 import org.examcloud.core.reports.api.response.SaveExamOrgReportListResp;
 
 import cn.com.qmth.examcloud.api.commons.CloudService;
 
 public interface ExamOrgReportCloudService extends CloudService {
 	SaveExamOrgReportListResp saveExamOrgReportList(SaveExamOrgReportListReq req);
+	DeleteExamOrgReportByProjectResp deleteExamOrgReportByProject(DeleteExamOrgReportByProjectReq req);
 }

examcloud-core-reports-api/src/main/java/org/examcloud/core/reports/api/ProjectCloudService.java

@@ -1,10 +1,15 @@
 package org.examcloud.core.reports.api;
 
+import org.examcloud.core.reports.api.request.GetProjectInfoBeanReq;
 import org.examcloud.core.reports.api.request.UpdateProjectStatusReq;
+import org.examcloud.core.reports.api.response.GetProjectInfoBeanResp;
 import org.examcloud.core.reports.api.response.UpdateProjectStatusResp;
 
 import cn.com.qmth.examcloud.api.commons.CloudService;
 
 public interface ProjectCloudService extends CloudService {
+	
 	UpdateProjectStatusResp updateProjectStatus(UpdateProjectStatusReq req);
+	
+	GetProjectInfoBeanResp getProjectBean(GetProjectInfoBeanReq req);
 }

examcloud-core-reports-api/src/main/java/org/examcloud/core/reports/api/bean/ExamCourseDataReportBean.java

@@ -1,5 +1,6 @@
 package org.examcloud.core.reports.api.bean;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
@@ -48,6 +49,7 @@ public class ExamCourseDataReportBean implements JsonSerializable {
     private Long passCount;
     //分段人数数据
 	private List<Long> partitionData;
+	
 	public Long getProjectId() {
 		return projectId;
 	}
@@ -168,5 +170,22 @@ public class ExamCourseDataReportBean implements JsonSerializable {
 	public void setExamCode(String examCode) {
 		this.examCode = examCode;
 	}
-	
+	public void init(int partitionCount) {
+		this.setTotalScore(0.0);
+		this.setMaxScore(0.0);
+		this.setMinScore(null);
+		this.setAvgScore(0.0);
+		this.setStd(0.0);
+		this.setAvgDifficultyDegree(0.0);
+		this.setCdi(0.0);
+		this.setParticipantCount(0l);
+		this.setFullCount(0l);
+		this.setZeroCount(0l);
+		this.setPassCount(0l);
+		List<Long> partitionData=new ArrayList<Long>();
+		for(int i=0;i<partitionCount;i++) {
+			partitionData.add(0l);
+		}
+		this.setPartitionData(partitionData);
+	}
 }

examcloud-core-reports-api/src/main/java/org/examcloud/core/reports/api/bean/ExamOrgReportBean.java

@@ -1,5 +1,6 @@
 package org.examcloud.core.reports.api.bean;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
@@ -99,5 +100,15 @@ public class ExamOrgReportBean implements JsonSerializable {
 		this.orgId = orgId;
 	}
 	
+	public void init(int partitionCount) {
+		this.setSignCount(0l);
+		this.setParticipantCount(0l);
+		this.setPassCount(0l);
+		List<Long> partitionData=new ArrayList<Long>();
+		for(int i=0;i<partitionCount;i++) {
+			partitionData.add(0l);
+		}
+		this.setPartitionData(partitionData);
+	}
 	
 }

examcloud-core-reports-api/src/main/java/org/examcloud/core/reports/api/bean/ProjectInfoBean.java

@@ -0,0 +1,188 @@
+package org.examcloud.core.reports.api.bean;
+
+import java.util.List;
+
+import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
+
+
+public class ProjectInfoBean implements JsonSerializable {
+
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 7971467651517420431L;
+
+	private Long id;
+	
+    private String name;
+    
+    private Long rootOrgId;
+    
+    //分析类型
+    private String analyseType;
+    
+    //数据来源
+    private String dataOrigin;
+    
+    private Integer sampleCount;
+    
+    //所选考试id
+    private String examIds;
+    
+    //备注
+    private String remarks;
+    
+    private Boolean enable;
+    
+    //报表状态
+    private String reportStatus;
+    
+    //中心数量
+    private Integer orgCount;
+    
+    //课程数量
+    private Integer courseCount;
+    
+    //及格分数
+    private Double passScore;
+    
+    //满分分数
+    private Double totalScore;
+    
+    //分数段数量
+    private Integer partitionCount;
+    
+    //分数段详情
+    private List<Double> partitionDetails;
+
+	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 Long getRootOrgId() {
+		return rootOrgId;
+	}
+
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
+
+	public String getAnalyseType() {
+		return analyseType;
+	}
+
+	public void setAnalyseType(String analyseType) {
+		this.analyseType = analyseType;
+	}
+
+	public String getDataOrigin() {
+		return dataOrigin;
+	}
+
+	public void setDataOrigin(String dataOrigin) {
+		this.dataOrigin = dataOrigin;
+	}
+
+	public Integer getSampleCount() {
+		return sampleCount;
+	}
+
+	public void setSampleCount(Integer sampleCount) {
+		this.sampleCount = sampleCount;
+	}
+
+	public String getExamIds() {
+		return examIds;
+	}
+
+	public void setExamIds(String examIds) {
+		this.examIds = examIds;
+	}
+
+	public String getRemarks() {
+		return remarks;
+	}
+
+	public void setRemarks(String remarks) {
+		this.remarks = remarks;
+	}
+
+	public Boolean getEnable() {
+		return enable;
+	}
+
+	public void setEnable(Boolean enable) {
+		this.enable = enable;
+	}
+
+	public String getReportStatus() {
+		return reportStatus;
+	}
+
+	public void setReportStatus(String reportStatus) {
+		this.reportStatus = reportStatus;
+	}
+
+	public Integer getOrgCount() {
+		return orgCount;
+	}
+
+	public void setOrgCount(Integer orgCount) {
+		this.orgCount = orgCount;
+	}
+
+	public Integer getCourseCount() {
+		return courseCount;
+	}
+
+	public void setCourseCount(Integer courseCount) {
+		this.courseCount = courseCount;
+	}
+
+	public Double getPassScore() {
+		return passScore;
+	}
+
+	public void setPassScore(Double passScore) {
+		this.passScore = passScore;
+	}
+
+	public Double getTotalScore() {
+		return totalScore;
+	}
+
+	public void setTotalScore(Double totalScore) {
+		this.totalScore = totalScore;
+	}
+
+	public Integer getPartitionCount() {
+		return partitionCount;
+	}
+
+	public void setPartitionCount(Integer partitionCount) {
+		this.partitionCount = partitionCount;
+	}
+
+	public List<Double> getPartitionDetails() {
+		return partitionDetails;
+	}
+
+	public void setPartitionDetails(List<Double> partitionDetails) {
+		this.partitionDetails = partitionDetails;
+	}
+
+    
+}

examcloud-core-reports-api/src/main/java/org/examcloud/core/reports/api/request/DeleteExamCourseDataReportByProjectReq.java

@@ -0,0 +1,26 @@
+package org.examcloud.core.reports.api.request;
+
+import cn.com.qmth.examcloud.api.commons.exchange.BaseRequest;
+
+public class DeleteExamCourseDataReportByProjectReq extends BaseRequest {
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1975785323548414096L;
+	private Long rootOrgId;
+	private Long projectId;
+	public Long getRootOrgId() {
+		return rootOrgId;
+	}
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
+	public Long getProjectId() {
+		return projectId;
+	}
+	public void setProjectId(Long projectId) {
+		this.projectId = projectId;
+	}
+	
+	
+}

examcloud-core-reports-api/src/main/java/org/examcloud/core/reports/api/request/DeleteExamOrgReportByProjectReq.java

@@ -0,0 +1,26 @@
+package org.examcloud.core.reports.api.request;
+
+import cn.com.qmth.examcloud.api.commons.exchange.BaseRequest;
+
+public class DeleteExamOrgReportByProjectReq extends BaseRequest {
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -6826496205775748396L;
+	private Long rootOrgId;
+	private Long projectId;
+	public Long getRootOrgId() {
+		return rootOrgId;
+	}
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
+	public Long getProjectId() {
+		return projectId;
+	}
+	public void setProjectId(Long projectId) {
+		this.projectId = projectId;
+	}
+	
+	
+}

examcloud-core-reports-api/src/main/java/org/examcloud/core/reports/api/request/GetProjectInfoBeanReq.java

@@ -0,0 +1,22 @@
+package org.examcloud.core.reports.api.request;
+
+import cn.com.qmth.examcloud.api.commons.exchange.BaseRequest;
+
+public class GetProjectInfoBeanReq extends BaseRequest {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -2168710080873457679L;
+	private Long projectId;
+
+	public Long getProjectId() {
+		return projectId;
+	}
+
+	public void setProjectId(Long projectId) {
+		this.projectId = projectId;
+	}
+	
+	
+}

examcloud-core-reports-api/src/main/java/org/examcloud/core/reports/api/response/DeleteExamCourseDataReportByProjectResp.java

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

examcloud-core-reports-api/src/main/java/org/examcloud/core/reports/api/response/DeleteExamOrgReportByProjectResp.java

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

examcloud-core-reports-api/src/main/java/org/examcloud/core/reports/api/response/GetProjectInfoBeanResp.java

@@ -0,0 +1,25 @@
+package org.examcloud.core.reports.api.response;
+
+import org.examcloud.core.reports.api.bean.ProjectInfoBean;
+
+import cn.com.qmth.examcloud.api.commons.exchange.BaseResponse;
+
+public class GetProjectInfoBeanResp extends BaseResponse {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1005582497599640937L;
+
+	private ProjectInfoBean bean;
+
+	public ProjectInfoBean getBean() {
+		return bean;
+	}
+
+	public void setBean(ProjectInfoBean bean) {
+		this.bean = bean;
+	}
+	
+	
+}