成绩报告

distributed-print/src/main/java/com/qmth/distributed/print/api/mark/MarkArchiveController.java

@@ -6,6 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.qmth.boot.api.constant.ApiConstant;
@@ -14,6 +15,7 @@ import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.mark.bean.archivescore.ArchiveScoreQuery;
 import com.qmth.teachcloud.mark.bean.archivescore.ArchiveStudentQuery;
+import com.qmth.teachcloud.mark.bean.archivescore.ScoreReportVo;
 import com.qmth.teachcloud.mark.service.MarkPaperService;
 import com.qmth.teachcloud.mark.service.MarkStudentService;
 
@@ -55,4 +57,10 @@ public class MarkArchiveController {
 	public void scoreExport(@Validated ArchiveStudentQuery query, HttpServletResponse response) {
 		markStudentService.scoreExport(query, response);
 	}
+	
+	@ApiOperation(value = "成绩报告")
+	@RequestMapping(value = "score/report", method = RequestMethod.POST)
+	public ScoreReportVo scoreReport(@RequestParam Long examId,@RequestParam String paperNumber) {
+		return markStudentService.scoreReport(examId, paperNumber);
+	}
 }

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/bean/archivescore/ClassVo.java

@@ -0,0 +1,63 @@
+package com.qmth.teachcloud.mark.bean.archivescore;
+
+public class ClassVo {
+	private String className;
+	private Double avgScore;
+	private Double maxScore;
+	private Double minScore;
+	private Integer passCount;
+	private String passRate;
+	private Integer excellentCount;
+	private String excellentRate;
+	
+	
+	public String getClassName() {
+		return className;
+	}
+	public void setClassName(String className) {
+		this.className = className;
+	}
+	public Double getAvgScore() {
+		return avgScore;
+	}
+	public void setAvgScore(Double avgScore) {
+		this.avgScore = avgScore;
+	}
+	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 Integer getPassCount() {
+		return passCount;
+	}
+	public void setPassCount(Integer passCount) {
+		this.passCount = passCount;
+	}
+	public String getPassRate() {
+		return passRate;
+	}
+	public void setPassRate(String passRate) {
+		this.passRate = passRate;
+	}
+	public Integer getExcellentCount() {
+		return excellentCount;
+	}
+	public void setExcellentCount(Integer excellentCount) {
+		this.excellentCount = excellentCount;
+	}
+	public String getExcellentRate() {
+		return excellentRate;
+	}
+	public void setExcellentRate(String excellentRate) {
+		this.excellentRate = excellentRate;
+	}
+	
+}

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/bean/archivescore/CollegeVo.java

@@ -0,0 +1,61 @@
+package com.qmth.teachcloud.mark.bean.archivescore;
+
+public class CollegeVo {
+	private String college;
+	private Double avgScore;
+	private Double maxScore;
+	private Double minScore;
+	private Integer passCount;
+	private String passRate;
+	private Integer excellentCount;
+	private String excellentRate;
+	public String getCollege() {
+		return college;
+	}
+	public void setCollege(String college) {
+		this.college = college;
+	}
+	public Double getAvgScore() {
+		return avgScore;
+	}
+	public void setAvgScore(Double avgScore) {
+		this.avgScore = avgScore;
+	}
+	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 Integer getPassCount() {
+		return passCount;
+	}
+	public void setPassCount(Integer passCount) {
+		this.passCount = passCount;
+	}
+	public String getPassRate() {
+		return passRate;
+	}
+	public void setPassRate(String passRate) {
+		this.passRate = passRate;
+	}
+	public Integer getExcellentCount() {
+		return excellentCount;
+	}
+	public void setExcellentCount(Integer excellentCount) {
+		this.excellentCount = excellentCount;
+	}
+	public String getExcellentRate() {
+		return excellentRate;
+	}
+	public void setExcellentRate(String excellentRate) {
+		this.excellentRate = excellentRate;
+	}
+	
+}

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/bean/archivescore/OverViewVo.java

@@ -0,0 +1,105 @@
+package com.qmth.teachcloud.mark.bean.archivescore;
+
+public class OverViewVo {
+
+	private Integer studentCount;
+	private Integer actualCount;
+	private Integer absentCount;
+	private Integer breachCount;
+	private Double avgScore;
+	private Double maxScore;
+	private Double minScore;
+	private Integer passCount;
+	private String passRate;
+	private Integer excellentCount;
+	private String excellentRate;
+
+	public Integer getStudentCount() {
+		return studentCount;
+	}
+
+	public void setStudentCount(Integer studentCount) {
+		this.studentCount = studentCount;
+	}
+
+	public Integer getActualCount() {
+		return actualCount;
+	}
+
+	public void setActualCount(Integer actualCount) {
+		this.actualCount = actualCount;
+	}
+
+	public Integer getAbsentCount() {
+		return absentCount;
+	}
+
+	public void setAbsentCount(Integer absentCount) {
+		this.absentCount = absentCount;
+	}
+
+	public Integer getBreachCount() {
+		return breachCount;
+	}
+
+	public void setBreachCount(Integer breachCount) {
+		this.breachCount = breachCount;
+	}
+
+	public Double getAvgScore() {
+		return avgScore;
+	}
+
+	public void setAvgScore(Double avgScore) {
+		this.avgScore = avgScore;
+	}
+
+	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 Integer getPassCount() {
+		return passCount;
+	}
+
+	public void setPassCount(Integer passCount) {
+		this.passCount = passCount;
+	}
+
+	public String getPassRate() {
+		return passRate;
+	}
+
+	public void setPassRate(String passRate) {
+		this.passRate = passRate;
+	}
+
+	public Integer getExcellentCount() {
+		return excellentCount;
+	}
+
+	public void setExcellentCount(Integer excellentCount) {
+		this.excellentCount = excellentCount;
+	}
+
+	public String getExcellentRate() {
+		return excellentRate;
+	}
+
+	public void setExcellentRate(String excellentRate) {
+		this.excellentRate = excellentRate;
+	}
+
+}

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/bean/archivescore/QuestionVo.java

@@ -0,0 +1,55 @@
+package com.qmth.teachcloud.mark.bean.archivescore;
+
+public class QuestionVo {
+	private String title;
+	private Integer mainNumber;
+	private String subNumber;
+	private Double score;
+	private Double avgScore;
+	private Double socreRate;
+	private Double fullScoreRate;
+	public String getTitle() {
+		return title;
+	}
+	public void setTitle(String title) {
+		this.title = title;
+	}
+	public Integer getMainNumber() {
+		return mainNumber;
+	}
+	public void setMainNumber(Integer mainNumber) {
+		this.mainNumber = mainNumber;
+	}
+	public String getSubNumber() {
+		return subNumber;
+	}
+	public void setSubNumber(String subNumber) {
+		this.subNumber = subNumber;
+	}
+	public Double getScore() {
+		return score;
+	}
+	public void setScore(Double score) {
+		this.score = score;
+	}
+	public Double getAvgScore() {
+		return avgScore;
+	}
+	public void setAvgScore(Double avgScore) {
+		this.avgScore = avgScore;
+	}
+	public Double getSocreRate() {
+		return socreRate;
+	}
+	public void setSocreRate(Double socreRate) {
+		this.socreRate = socreRate;
+	}
+	public Double getFullScoreRate() {
+		return fullScoreRate;
+	}
+	public void setFullScoreRate(Double fullScoreRate) {
+		this.fullScoreRate = fullScoreRate;
+	}
+	
+	
+}

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/bean/archivescore/ScoreRangeVo.java

@@ -0,0 +1,33 @@
+package com.qmth.teachcloud.mark.bean.archivescore;
+
+public class ScoreRangeVo {
+	private Integer studentCount;
+	private Double minScore;
+	private Double maxScore;
+	private Double rate;
+	public Integer getStudentCount() {
+		return studentCount;
+	}
+	public void setStudentCount(Integer studentCount) {
+		this.studentCount = studentCount;
+	}
+	public Double getMinScore() {
+		return minScore;
+	}
+	public void setMinScore(Double minScore) {
+		this.minScore = minScore;
+	}
+	public Double getMaxScore() {
+		return maxScore;
+	}
+	public void setMaxScore(Double maxScore) {
+		this.maxScore = maxScore;
+	}
+	public Double getRate() {
+		return rate;
+	}
+	public void setRate(Double rate) {
+		this.rate = rate;
+	}
+	
+}

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/bean/archivescore/ScoreReportVo.java

@@ -0,0 +1,81 @@
+package com.qmth.teachcloud.mark.bean.archivescore;
+
+import java.util.List;
+
+public class ScoreReportVo {
+	
+	private OverViewVo overview;
+
+	private List<ScoreRangeVo> scoreRange;
+	
+	private List<CollegeVo> collegeVo;
+	
+	private List<ClassVo> classData;
+	
+	private List<TeacherVo> teacher;
+	
+	private List<QuestionVo> objective;
+	
+	private List<QuestionVo> subjective;
+
+	public OverViewVo getOverview() {
+		return overview;
+	}
+
+	public void setOverview(OverViewVo overview) {
+		this.overview = overview;
+	}
+
+	public List<ScoreRangeVo> getScoreRange() {
+		return scoreRange;
+	}
+
+	public void setScoreRange(List<ScoreRangeVo> scoreRange) {
+		this.scoreRange = scoreRange;
+	}
+
+	public List<CollegeVo> getCollegeVo() {
+		return collegeVo;
+	}
+
+	public void setCollegeVo(List<CollegeVo> collegeVo) {
+		this.collegeVo = collegeVo;
+	}
+
+	public List<ClassVo> getClassData() {
+		return classData;
+	}
+
+	public void setClassData(List<ClassVo> classData) {
+		this.classData = classData;
+	}
+
+	public List<TeacherVo> getTeacher() {
+		return teacher;
+	}
+
+	public void setTeacher(List<TeacherVo> teacher) {
+		this.teacher = teacher;
+	}
+
+	public List<QuestionVo> getObjective() {
+		return objective;
+	}
+
+	public void setObjective(List<QuestionVo> objective) {
+		this.objective = objective;
+	}
+
+	public List<QuestionVo> getSubjective() {
+		return subjective;
+	}
+
+	public void setSubjective(List<QuestionVo> subjective) {
+		this.subjective = subjective;
+	}
+	
+	
+	
+}
+
+

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/bean/archivescore/TeacherVo.java

@@ -0,0 +1,63 @@
+package com.qmth.teachcloud.mark.bean.archivescore;
+
+public class TeacherVo {
+	private String teacher;
+	private Double avgScore;
+	private Double maxScore;
+	private Double minScore;
+	private Integer passCount;
+	private String passRate;
+	private Integer excellentCount;
+	private String excellentRate;
+	
+	
+	public String getTeacher() {
+		return teacher;
+	}
+	public void setTeacher(String teacher) {
+		this.teacher = teacher;
+	}
+	public Double getAvgScore() {
+		return avgScore;
+	}
+	public void setAvgScore(Double avgScore) {
+		this.avgScore = avgScore;
+	}
+	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 Integer getPassCount() {
+		return passCount;
+	}
+	public void setPassCount(Integer passCount) {
+		this.passCount = passCount;
+	}
+	public String getPassRate() {
+		return passRate;
+	}
+	public void setPassRate(String passRate) {
+		this.passRate = passRate;
+	}
+	public Integer getExcellentCount() {
+		return excellentCount;
+	}
+	public void setExcellentCount(Integer excellentCount) {
+		this.excellentCount = excellentCount;
+	}
+	public String getExcellentRate() {
+		return excellentRate;
+	}
+	public void setExcellentRate(String excellentRate) {
+		this.excellentRate = excellentRate;
+	}
+	
+}

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/entity/MarkSubjectiveScore.java

@@ -1,7 +1,6 @@
 package com.qmth.teachcloud.mark.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/MarkStudentService.java

@@ -13,6 +13,7 @@ import com.qmth.teachcloud.common.enums.mark.SubjectiveStatus;
 import com.qmth.teachcloud.mark.bean.UpdateTimeVo;
 import com.qmth.teachcloud.mark.bean.archivescore.ArchiveStudentQuery;
 import com.qmth.teachcloud.mark.bean.archivescore.ArchiveStudentVo;
+import com.qmth.teachcloud.mark.bean.archivescore.ScoreReportVo;
 import com.qmth.teachcloud.mark.bean.omredit.OmrEditDomain;
 import com.qmth.teachcloud.mark.bean.scananswer.AnswerQueryDomain;
 import com.qmth.teachcloud.mark.bean.scananswer.AnswerQueryVo;
@@ -106,4 +107,6 @@ public interface MarkStudentService extends IService<MarkStudent> {
 	List<ArchiveStudentVo> studentList(ArchiveStudentQuery query);
 
 	void scoreExport(ArchiveStudentQuery query, HttpServletResponse response);
+
+	ScoreReportVo scoreReport(Long examId, String paperNumber);
 }

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/MarkStudentServiceImpl.java

@@ -41,6 +41,7 @@ import com.qmth.teachcloud.mark.bean.UpdateTimeVo;
 import com.qmth.teachcloud.mark.bean.archivescore.ArchiveStudentQuery;
 import com.qmth.teachcloud.mark.bean.archivescore.ArchiveStudentVo;
 import com.qmth.teachcloud.mark.bean.archivescore.ScanPaperPageVo;
+import com.qmth.teachcloud.mark.bean.archivescore.ScoreReportVo;
 import com.qmth.teachcloud.mark.bean.omredit.OmrEditDomain;
 import com.qmth.teachcloud.mark.bean.omredit.OmrEditPaper;
 import com.qmth.teachcloud.mark.bean.scananswer.AnswerPageVo;
@@ -800,4 +801,10 @@ public class MarkStudentServiceImpl extends ServiceImpl<MarkStudentMapper, MarkS
 			throw new RuntimeException(e);
 		}
 	}
+
+	@Override
+	public ScoreReportVo scoreReport(Long examId, String paperNumber) {
+		// TODO Auto-generated method stub
+		return null;
+	}
 }