|
@@ -1,5 +1,6 @@
|
|
|
package com.ruoyi.common.utils.dz;
|
|
package com.ruoyi.common.utils.dz;
|
|
|
|
|
|
|
|
|
|
+import com.fasterxml.jackson.annotation.JsonValue;
|
|
|
import com.ruoyi.common.enums.SubjectType;
|
|
import com.ruoyi.common.enums.SubjectType;
|
|
|
import io.swagger.annotations.ApiModel;
|
|
import io.swagger.annotations.ApiModel;
|
|
|
import io.swagger.annotations.ApiModelProperty;
|
|
import io.swagger.annotations.ApiModelProperty;
|
|
@@ -12,27 +13,27 @@ import java.lang.reflect.InvocationTargetException;
|
|
|
@ApiModel("分科成绩")
|
|
@ApiModel("分科成绩")
|
|
|
public class SubjectScore {
|
|
public class SubjectScore {
|
|
|
@ApiModelProperty(value = "物理", example = "80")
|
|
@ApiModelProperty(value = "物理", example = "80")
|
|
|
- String physics;
|
|
|
|
|
|
|
+ Double physics;
|
|
|
@ApiModelProperty(value = "历史", example = "80")
|
|
@ApiModelProperty(value = "历史", example = "80")
|
|
|
- String history;
|
|
|
|
|
|
|
+ Double history;
|
|
|
@ApiModelProperty(value = "化学", example = "80")
|
|
@ApiModelProperty(value = "化学", example = "80")
|
|
|
- String chemistry;
|
|
|
|
|
|
|
+ Double chemistry;
|
|
|
@ApiModelProperty(value = "生物", example = "80")
|
|
@ApiModelProperty(value = "生物", example = "80")
|
|
|
- String biology;
|
|
|
|
|
|
|
+ Double biology;
|
|
|
@ApiModelProperty(value = "地理", example = "80")
|
|
@ApiModelProperty(value = "地理", example = "80")
|
|
|
- String geography;
|
|
|
|
|
|
|
+ Double geography;
|
|
|
@ApiModelProperty(value = "政治", example = "80")
|
|
@ApiModelProperty(value = "政治", example = "80")
|
|
|
- String political;
|
|
|
|
|
|
|
+ Double political;
|
|
|
@ApiModelProperty(value = "语文", example = "80")
|
|
@ApiModelProperty(value = "语文", example = "80")
|
|
|
- String chinese;
|
|
|
|
|
|
|
+ Double chinese;
|
|
|
@ApiModelProperty(value = "数学", example = "80")
|
|
@ApiModelProperty(value = "数学", example = "80")
|
|
|
- String mathematics;
|
|
|
|
|
|
|
+ Double mathematics;
|
|
|
@ApiModelProperty(value = "英语", example = "80")
|
|
@ApiModelProperty(value = "英语", example = "80")
|
|
|
- String english;
|
|
|
|
|
|
|
+ Double english;
|
|
|
@ApiModelProperty(value = "外语", example = "80")
|
|
@ApiModelProperty(value = "外语", example = "80")
|
|
|
- String foreign;
|
|
|
|
|
|
|
+ Double foreign;
|
|
|
@ApiModelProperty(value = "技能", example = "80")
|
|
@ApiModelProperty(value = "技能", example = "80")
|
|
|
- String skill;
|
|
|
|
|
|
|
+ Double skill;
|
|
|
|
|
|
|
|
/** 物化生历政地 语数英外 **/
|
|
/** 物化生历政地 语数英外 **/
|
|
|
public Double getSelectScore(String name) {
|
|
public Double getSelectScore(String name) {
|