diff --git a/src/main/java/com/sztzjy/fund_investment/entity/TeaClassScore.java b/src/main/java/com/sztzjy/fund_investment/entity/TeaClassScore.java index 5eb94ff..27f6fa7 100644 --- a/src/main/java/com/sztzjy/fund_investment/entity/TeaClassScore.java +++ b/src/main/java/com/sztzjy/fund_investment/entity/TeaClassScore.java @@ -3,7 +3,10 @@ package com.sztzjy.fund_investment.entity; import java.math.BigDecimal; import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; +import org.springframework.format.annotation.DateTimeFormat; + /** * * @author xcj @@ -12,18 +15,38 @@ import io.swagger.annotations.ApiModelProperty; public class TeaClassScore { private String id; - @ApiModelProperty("流程ID") - private String flowId; - - @ApiModelProperty("得分表ID") - private String scoreId; + @ApiModelProperty("学校ID") + private String schoolId; @ApiModelProperty("班级ID") private String classId; + @ApiModelProperty("班级名称") + private String className; + + @ApiModelProperty("优秀人数") + private Integer excellentCount; + + @ApiModelProperty("良好人数") + private Integer goodCount; + + @ApiModelProperty("一般人数") + private Integer generalCount; + + @ApiModelProperty("不及格人数") + private Integer failCount; + + @ApiModelProperty("班级最高分") + private BigDecimal classMaxScore; + + @ApiModelProperty("班级最低分") + private BigDecimal classMinScore; + @ApiModelProperty("班级平均分") private BigDecimal classAverageScore; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") @ApiModelProperty("得分日期") private Date startTime; @@ -35,20 +58,12 @@ public class TeaClassScore { this.id = id == null ? null : id.trim(); } - public String getFlowId() { - return flowId; - } - - public void setFlowId(String flowId) { - this.flowId = flowId == null ? null : flowId.trim(); + public String getSchoolId() { + return schoolId; } - public String getScoreId() { - return scoreId; - } - - public void setScoreId(String scoreId) { - this.scoreId = scoreId == null ? null : scoreId.trim(); + public void setSchoolId(String schoolId) { + this.schoolId = schoolId == null ? null : schoolId.trim(); } public String getClassId() { @@ -59,6 +74,62 @@ public class TeaClassScore { this.classId = classId == null ? null : classId.trim(); } + public String getClassName() { + return className; + } + + public void setClassName(String className) { + this.className = className == null ? null : className.trim(); + } + + public Integer getExcellentCount() { + return excellentCount; + } + + public void setExcellentCount(Integer excellentCount) { + this.excellentCount = excellentCount; + } + + public Integer getGoodCount() { + return goodCount; + } + + public void setGoodCount(Integer goodCount) { + this.goodCount = goodCount; + } + + public Integer getGeneralCount() { + return generalCount; + } + + public void setGeneralCount(Integer generalCount) { + this.generalCount = generalCount; + } + + public Integer getFailCount() { + return failCount; + } + + public void setFailCount(Integer failCount) { + this.failCount = failCount; + } + + public BigDecimal getClassMaxScore() { + return classMaxScore; + } + + public void setClassMaxScore(BigDecimal classMaxScore) { + this.classMaxScore = classMaxScore; + } + + public BigDecimal getClassMinScore() { + return classMinScore; + } + + public void setClassMinScore(BigDecimal classMinScore) { + this.classMinScore = classMinScore; + } + public BigDecimal getClassAverageScore() { return classAverageScore; }