学习成绩模块权重设置

src/main/java/com/sztzjy/trade/controller/stu/StuCommonModuleController.java

@@ -0,0 +1,55 @@
+package com.sztzjy.trade.controller.stu;
+
+import com.alibaba.fastjson.JSONObject;
+import com.sztzjy.trade.annotation.AnonymousAccess;
+import com.sztzjy.trade.entity.StuAssessmentQuestionDetailsDTO;
+import com.sztzjy.trade.entity.StuScoreDetails;
+import com.sztzjy.trade.entity.dto.StuLearningAssessmentScoreDTO;
+import com.sztzjy.trade.service.StuCommonModuleService;
+import com.sztzjy.trade.util.ResultDataEntity;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author tz
+ * @date 2024/12/17 17:22
+ */
+@RequestMapping("api/stu/commonModule")
+@RestController
+@Api(tags = "公共模块")
+public class StuCommonModuleController {
+    @Resource
+    StuCommonModuleService stuCommonModuleService;
+
+
+
+    @PostMapping("/hashLearningAssessmentScore")
+//    @AnonymousAccess
+    @ApiOperation("哈希函数学习测评计分")
+    public ResultDataEntity<StuScoreDetails> hashLearningAssessmentScore(@RequestBody JSONObject jsonObject){
+        StuLearningAssessmentScoreDTO stuLearningAssessmentScoreDTO = jsonObject.getObject("stuLearningAssessmentScoreDTO", StuLearningAssessmentScoreDTO.class);
+        stuCommonModuleService.hashLearningAssessmentScore(stuLearningAssessmentScoreDTO);
+        return new ResultDataEntity<>(HttpStatus.OK);
+    }
+
+    @PostMapping("/getLearningAssessment")
+    @AnonymousAccess
+    @ApiOperation("学习测评查看")
+    public ResultDataEntity<List<StuAssessmentQuestionDetailsDTO>> getLearningAssessment(@ApiParam("归属模块") String module, @ApiParam("用户ID") String userId) {
+        if (module.isEmpty()) {
+            return new ResultDataEntity<>(HttpStatus.NO_CONTENT, "参数为空");
+        }
+        List<StuAssessmentQuestionDetailsDTO> list = stuCommonModuleService.getLearningAssessment(module,userId);
+        return new ResultDataEntity<>(HttpStatus.OK, list);
+    }
+
+}

src/main/java/com/sztzjy/trade/entity/StuAssessmentQuestionDetails.java

@@ -0,0 +1,75 @@
+package com.sztzjy.trade.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+/**
+ *
+ * @author whb
+ * stu_assessment_question_details
+ */
+public class StuAssessmentQuestionDetails {
+    @ApiModelProperty(notes = "详情ID")
+    private Integer detailsId;
+
+    @ApiModelProperty(notes = "题目ID")
+    private String topicId;
+
+    @ApiModelProperty(notes = "学生选择答案")
+    private String studentAnswer;
+
+    @ApiModelProperty(notes = "学生ID")
+    private String userId;
+
+    @ApiModelProperty(notes = "是否正确")
+    private String rightOrWrong;
+
+    @ApiModelProperty(notes = "归属模块")
+    private String module;
+
+    public Integer getDetailsId() {
+        return detailsId;
+    }
+
+    public void setDetailsId(Integer detailsId) {
+        this.detailsId = detailsId;
+    }
+
+    public String getTopicId() {
+        return topicId;
+    }
+
+    public void setTopicId(String topicId) {
+        this.topicId = topicId == null ? null : topicId.trim();
+    }
+
+    public String getStudentAnswer() {
+        return studentAnswer;
+    }
+
+    public void setStudentAnswer(String studentAnswer) {
+        this.studentAnswer = studentAnswer == null ? null : studentAnswer.trim();
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId == null ? null : userId.trim();
+    }
+
+    public String getRightOrWrong() {
+        return rightOrWrong;
+    }
+
+    public void setRightOrWrong(String rightOrWrong) {
+        this.rightOrWrong = rightOrWrong == null ? null : rightOrWrong.trim();
+    }
+
+    public String getModule() {
+        return module;
+    }
+
+    public void setModule(String module) {
+        this.module = module == null ? null : module.trim();
+    }
+}

src/main/java/com/sztzjy/trade/entity/StuAssessmentQuestionDetailsDTO.java

@@ -0,0 +1,54 @@
+package com.sztzjy.trade.entity;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author tz
+ * @date 2023/10/26 10:46
+ */
+@Data
+public class StuAssessmentQuestionDetailsDTO {
+    private String topicId;
+
+    private String topicName;
+
+    private String topicType;
+
+    private String topicDifficultyLevel;
+
+    private BigDecimal topicScore;
+
+    private Integer topicNumber;
+
+    private String optionA;
+
+    private String optionB;
+
+    private String optionC;
+
+    private String optionD;
+
+    private String optionE;
+
+    private String optionF;
+
+    private String answer;
+
+    private String studentAnswer;
+
+    private String questionAnswer;
+
+    private String module;
+
+    private Integer logic;
+
+    private Integer state;
+
+    private String reason;
+
+    private String optionImg;
+
+    private String rightOrWrong;
+}

src/main/java/com/sztzjy/trade/entity/StuAssessmentQuestionDetailsExample.java

@@ -0,0 +1,609 @@
+package com.sztzjy.trade.entity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class StuAssessmentQuestionDetailsExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public StuAssessmentQuestionDetailsExample() {
+        oredCriteria = new ArrayList<>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andDetailsIdIsNull() {
+            addCriterion("details_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDetailsIdIsNotNull() {
+            addCriterion("details_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDetailsIdEqualTo(Integer value) {
+            addCriterion("details_id =", value, "detailsId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDetailsIdNotEqualTo(Integer value) {
+            addCriterion("details_id <>", value, "detailsId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDetailsIdGreaterThan(Integer value) {
+            addCriterion("details_id >", value, "detailsId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDetailsIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("details_id >=", value, "detailsId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDetailsIdLessThan(Integer value) {
+            addCriterion("details_id <", value, "detailsId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDetailsIdLessThanOrEqualTo(Integer value) {
+            addCriterion("details_id <=", value, "detailsId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDetailsIdIn(List<Integer> values) {
+            addCriterion("details_id in", values, "detailsId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDetailsIdNotIn(List<Integer> values) {
+            addCriterion("details_id not in", values, "detailsId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDetailsIdBetween(Integer value1, Integer value2) {
+            addCriterion("details_id between", value1, value2, "detailsId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDetailsIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("details_id not between", value1, value2, "detailsId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTopicIdIsNull() {
+            addCriterion("topic_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTopicIdIsNotNull() {
+            addCriterion("topic_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTopicIdEqualTo(String value) {
+            addCriterion("topic_id =", value, "topicId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTopicIdNotEqualTo(String value) {
+            addCriterion("topic_id <>", value, "topicId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTopicIdGreaterThan(String value) {
+            addCriterion("topic_id >", value, "topicId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTopicIdGreaterThanOrEqualTo(String value) {
+            addCriterion("topic_id >=", value, "topicId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTopicIdLessThan(String value) {
+            addCriterion("topic_id <", value, "topicId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTopicIdLessThanOrEqualTo(String value) {
+            addCriterion("topic_id <=", value, "topicId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTopicIdLike(String value) {
+            addCriterion("topic_id like", value, "topicId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTopicIdNotLike(String value) {
+            addCriterion("topic_id not like", value, "topicId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTopicIdIn(List<String> values) {
+            addCriterion("topic_id in", values, "topicId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTopicIdNotIn(List<String> values) {
+            addCriterion("topic_id not in", values, "topicId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTopicIdBetween(String value1, String value2) {
+            addCriterion("topic_id between", value1, value2, "topicId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTopicIdNotBetween(String value1, String value2) {
+            addCriterion("topic_id not between", value1, value2, "topicId");
+            return (Criteria) this;
+        }
+
+        public Criteria andStudentAnswerIsNull() {
+            addCriterion("student_answer is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStudentAnswerIsNotNull() {
+            addCriterion("student_answer is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStudentAnswerEqualTo(String value) {
+            addCriterion("student_answer =", value, "studentAnswer");
+            return (Criteria) this;
+        }
+
+        public Criteria andStudentAnswerNotEqualTo(String value) {
+            addCriterion("student_answer <>", value, "studentAnswer");
+            return (Criteria) this;
+        }
+
+        public Criteria andStudentAnswerGreaterThan(String value) {
+            addCriterion("student_answer >", value, "studentAnswer");
+            return (Criteria) this;
+        }
+
+        public Criteria andStudentAnswerGreaterThanOrEqualTo(String value) {
+            addCriterion("student_answer >=", value, "studentAnswer");
+            return (Criteria) this;
+        }
+
+        public Criteria andStudentAnswerLessThan(String value) {
+            addCriterion("student_answer <", value, "studentAnswer");
+            return (Criteria) this;
+        }
+
+        public Criteria andStudentAnswerLessThanOrEqualTo(String value) {
+            addCriterion("student_answer <=", value, "studentAnswer");
+            return (Criteria) this;
+        }
+
+        public Criteria andStudentAnswerLike(String value) {
+            addCriterion("student_answer like", value, "studentAnswer");
+            return (Criteria) this;
+        }
+
+        public Criteria andStudentAnswerNotLike(String value) {
+            addCriterion("student_answer not like", value, "studentAnswer");
+            return (Criteria) this;
+        }
+
+        public Criteria andStudentAnswerIn(List<String> values) {
+            addCriterion("student_answer in", values, "studentAnswer");
+            return (Criteria) this;
+        }
+
+        public Criteria andStudentAnswerNotIn(List<String> values) {
+            addCriterion("student_answer not in", values, "studentAnswer");
+            return (Criteria) this;
+        }
+
+        public Criteria andStudentAnswerBetween(String value1, String value2) {
+            addCriterion("student_answer between", value1, value2, "studentAnswer");
+            return (Criteria) this;
+        }
+
+        public Criteria andStudentAnswerNotBetween(String value1, String value2) {
+            addCriterion("student_answer not between", value1, value2, "studentAnswer");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdIsNull() {
+            addCriterion("user_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdIsNotNull() {
+            addCriterion("user_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdEqualTo(String value) {
+            addCriterion("user_id =", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotEqualTo(String value) {
+            addCriterion("user_id <>", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdGreaterThan(String value) {
+            addCriterion("user_id >", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdGreaterThanOrEqualTo(String value) {
+            addCriterion("user_id >=", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdLessThan(String value) {
+            addCriterion("user_id <", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdLessThanOrEqualTo(String value) {
+            addCriterion("user_id <=", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdLike(String value) {
+            addCriterion("user_id like", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotLike(String value) {
+            addCriterion("user_id not like", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdIn(List<String> values) {
+            addCriterion("user_id in", values, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotIn(List<String> values) {
+            addCriterion("user_id not in", values, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdBetween(String value1, String value2) {
+            addCriterion("user_id between", value1, value2, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotBetween(String value1, String value2) {
+            addCriterion("user_id not between", value1, value2, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRightOrWrongIsNull() {
+            addCriterion("right_or_wrong is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRightOrWrongIsNotNull() {
+            addCriterion("right_or_wrong is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRightOrWrongEqualTo(String value) {
+            addCriterion("right_or_wrong =", value, "rightOrWrong");
+            return (Criteria) this;
+        }
+
+        public Criteria andRightOrWrongNotEqualTo(String value) {
+            addCriterion("right_or_wrong <>", value, "rightOrWrong");
+            return (Criteria) this;
+        }
+
+        public Criteria andRightOrWrongGreaterThan(String value) {
+            addCriterion("right_or_wrong >", value, "rightOrWrong");
+            return (Criteria) this;
+        }
+
+        public Criteria andRightOrWrongGreaterThanOrEqualTo(String value) {
+            addCriterion("right_or_wrong >=", value, "rightOrWrong");
+            return (Criteria) this;
+        }
+
+        public Criteria andRightOrWrongLessThan(String value) {
+            addCriterion("right_or_wrong <", value, "rightOrWrong");
+            return (Criteria) this;
+        }
+
+        public Criteria andRightOrWrongLessThanOrEqualTo(String value) {
+            addCriterion("right_or_wrong <=", value, "rightOrWrong");
+            return (Criteria) this;
+        }
+
+        public Criteria andRightOrWrongLike(String value) {
+            addCriterion("right_or_wrong like", value, "rightOrWrong");
+            return (Criteria) this;
+        }
+
+        public Criteria andRightOrWrongNotLike(String value) {
+            addCriterion("right_or_wrong not like", value, "rightOrWrong");
+            return (Criteria) this;
+        }
+
+        public Criteria andRightOrWrongIn(List<String> values) {
+            addCriterion("right_or_wrong in", values, "rightOrWrong");
+            return (Criteria) this;
+        }
+
+        public Criteria andRightOrWrongNotIn(List<String> values) {
+            addCriterion("right_or_wrong not in", values, "rightOrWrong");
+            return (Criteria) this;
+        }
+
+        public Criteria andRightOrWrongBetween(String value1, String value2) {
+            addCriterion("right_or_wrong between", value1, value2, "rightOrWrong");
+            return (Criteria) this;
+        }
+
+        public Criteria andRightOrWrongNotBetween(String value1, String value2) {
+            addCriterion("right_or_wrong not between", value1, value2, "rightOrWrong");
+            return (Criteria) this;
+        }
+
+        public Criteria andModuleIsNull() {
+            addCriterion("module is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andModuleIsNotNull() {
+            addCriterion("module is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andModuleEqualTo(String value) {
+            addCriterion("module =", value, "module");
+            return (Criteria) this;
+        }
+
+        public Criteria andModuleNotEqualTo(String value) {
+            addCriterion("module <>", value, "module");
+            return (Criteria) this;
+        }
+
+        public Criteria andModuleGreaterThan(String value) {
+            addCriterion("module >", value, "module");
+            return (Criteria) this;
+        }
+
+        public Criteria andModuleGreaterThanOrEqualTo(String value) {
+            addCriterion("module >=", value, "module");
+            return (Criteria) this;
+        }
+
+        public Criteria andModuleLessThan(String value) {
+            addCriterion("module <", value, "module");
+            return (Criteria) this;
+        }
+
+        public Criteria andModuleLessThanOrEqualTo(String value) {
+            addCriterion("module <=", value, "module");
+            return (Criteria) this;
+        }
+
+        public Criteria andModuleLike(String value) {
+            addCriterion("module like", value, "module");
+            return (Criteria) this;
+        }
+
+        public Criteria andModuleNotLike(String value) {
+            addCriterion("module not like", value, "module");
+            return (Criteria) this;
+        }
+
+        public Criteria andModuleIn(List<String> values) {
+            addCriterion("module in", values, "module");
+            return (Criteria) this;
+        }
+
+        public Criteria andModuleNotIn(List<String> values) {
+            addCriterion("module not in", values, "module");
+            return (Criteria) this;
+        }
+
+        public Criteria andModuleBetween(String value1, String value2) {
+            addCriterion("module between", value1, value2, "module");
+            return (Criteria) this;
+        }
+
+        public Criteria andModuleNotBetween(String value1, String value2) {
+            addCriterion("module not between", value1, value2, "module");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

src/main/java/com/sztzjy/trade/entity/TchDigitalTradeWeight.java

@@ -13,7 +13,7 @@ public class TchDigitalTradeWeight {
     @ApiModelProperty(notes = "学校ID")
     private String schoolId;
 
-    @ApiModelProperty(notes = "考勤成绩权重(考勤成绩权重设置)")
+    @ApiModelProperty(notes = "满勤得分标准")
     private BigDecimal weightOfAttendanceScoresSmall;
 
     @ApiModelProperty(notes = "考勤成绩权重（权重设置）")
@@ -58,6 +58,47 @@ public class TchDigitalTradeWeight {
     @ApiModelProperty(notes = "实验报告权重")
     private BigDecimal weightExperimentalReport;
 
+    @ApiModelProperty(notes = "理实项目一权重")
+    private BigDecimal weightOne;
+
+    @ApiModelProperty(notes = "理实项目二权重")
+    private BigDecimal weightTwo;
+
+    @ApiModelProperty(notes = "理实项目三权重")
+    private BigDecimal weightThree;
+
+    @ApiModelProperty(notes = "理实项目四权重")
+    private BigDecimal weightFour;
+
+    @ApiModelProperty(notes = "理实项目五权重")
+    private BigDecimal weightFive;
+
+    @ApiModelProperty(notes = "理实项目六权重")
+    private BigDecimal weightSix;
+
+    @ApiModelProperty(notes = "理实项目七权重")
+    private BigDecimal weightSven;
+
+    @ApiModelProperty(notes = "理实项目八权重")
+    private BigDecimal weightEight;
+
+    @ApiModelProperty(notes = "理实项目久权重")
+    private BigDecimal weightNine;
+
+    @ApiModelProperty(notes = "理实项目十权重")
+    private BigDecimal weightTen;
+
+    @ApiModelProperty(notes = "理实项目十一权重")
+    private BigDecimal weightEleven;
+
+    @ApiModelProperty(notes = "理实项目十二权重")
+    private BigDecimal weightTwelve;
+
+    @ApiModelProperty(notes = "理实项目十三权重")
+    private BigDecimal weightThirteen;
+
+
+
     public TchDigitalTradeWeight(String schoolId){
         this.schoolId=schoolId;
         this.weightOfAttendanceScoresSmall=new BigDecimal("0.1");
@@ -73,6 +114,19 @@ public class TchDigitalTradeWeight {
         this.weightStudyEvaluation=new BigDecimal("0.2");
         this.weightExperimentalTraining=new BigDecimal("0.4");
         this.weightExperimentalReport=new BigDecimal("0.1");
+        this.weightOne=new BigDecimal("0.05");
+        this.weightTwo=new BigDecimal("0.05");
+        this.weightThree=new BigDecimal("0.05");
+        this.weightFour=new BigDecimal("0.15");
+        this.weightFive=new BigDecimal("0.1");
+        this.weightSix=new BigDecimal("0.05");
+        this.weightSven=new BigDecimal("0.15");
+        this.weightEight=new BigDecimal("0.05");
+        this.weightNine=new BigDecimal("0.1");
+        this.weightTen=new BigDecimal("0.05");
+        this.weightEleven=new BigDecimal("0.1");
+        this.weightTwelve=new BigDecimal("0.05");
+        this.weightOne=new BigDecimal("0.05");
     }
 
     public String getSchoolId() {
@@ -202,4 +256,108 @@ public class TchDigitalTradeWeight {
     public void setWeightExperimentalReport(BigDecimal weightExperimentalReport) {
         this.weightExperimentalReport = weightExperimentalReport;
     }
+
+    public BigDecimal getWeightOne() {
+        return weightOne;
+    }
+
+    public void setWeightOne(BigDecimal weightOne) {
+        this.weightOne = weightOne;
+    }
+
+    public BigDecimal getWeightTwo() {
+        return weightTwo;
+    }
+
+    public void setWeightTwo(BigDecimal weightTwo) {
+        this.weightTwo = weightTwo;
+    }
+
+    public BigDecimal getWeightThree() {
+        return weightThree;
+    }
+
+    public void setWeightThree(BigDecimal weightThree) {
+        this.weightThree = weightThree;
+    }
+
+    public BigDecimal getWeightFour() {
+        return weightFour;
+    }
+
+    public void setWeightFour(BigDecimal weightFour) {
+        this.weightFour = weightFour;
+    }
+
+    public BigDecimal getWeightFive() {
+        return weightFive;
+    }
+
+    public void setWeightFive(BigDecimal weightFive) {
+        this.weightFive = weightFive;
+    }
+
+    public BigDecimal getWeightSix() {
+        return weightSix;
+    }
+
+    public void setWeightSix(BigDecimal weightSix) {
+        this.weightSix = weightSix;
+    }
+
+    public BigDecimal getWeightSven() {
+        return weightSven;
+    }
+
+    public void setWeightSven(BigDecimal weightSven) {
+        this.weightSven = weightSven;
+    }
+
+    public BigDecimal getWeightEight() {
+        return weightEight;
+    }
+
+    public void setWeightEight(BigDecimal weightEight) {
+        this.weightEight = weightEight;
+    }
+
+    public BigDecimal getWeightNine() {
+        return weightNine;
+    }
+
+    public void setWeightNine(BigDecimal weightNine) {
+        this.weightNine = weightNine;
+    }
+
+    public BigDecimal getWeightTen() {
+        return weightTen;
+    }
+
+    public void setWeightTen(BigDecimal weightTen) {
+        this.weightTen = weightTen;
+    }
+
+    public BigDecimal getWeightEleven() {
+        return weightEleven;
+    }
+
+    public void setWeightEleven(BigDecimal weightEleven) {
+        this.weightEleven = weightEleven;
+    }
+
+    public BigDecimal getWeightTwelve() {
+        return weightTwelve;
+    }
+
+    public void setWeightTwelve(BigDecimal weightTwelve) {
+        this.weightTwelve = weightTwelve;
+    }
+
+    public BigDecimal getWeightThirteen() {
+        return weightThirteen;
+    }
+
+    public void setWeightThirteen(BigDecimal weightThirteen) {
+        this.weightThirteen = weightThirteen;
+    }
 }

src/main/java/com/sztzjy/trade/entity/TchDigitalTradeWeightExample.java

@@ -1075,6 +1075,786 @@ public class TchDigitalTradeWeightExample {
             addCriterion("weight_experimental_report not between", value1, value2, "weightExperimentalReport");
             return (Criteria) this;
         }
+
+        public Criteria andWeightOneIsNull() {
+            addCriterion("weight_one is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightOneIsNotNull() {
+            addCriterion("weight_one is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightOneEqualTo(BigDecimal value) {
+            addCriterion("weight_one =", value, "weightOne");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightOneNotEqualTo(BigDecimal value) {
+            addCriterion("weight_one <>", value, "weightOne");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightOneGreaterThan(BigDecimal value) {
+            addCriterion("weight_one >", value, "weightOne");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightOneGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("weight_one >=", value, "weightOne");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightOneLessThan(BigDecimal value) {
+            addCriterion("weight_one <", value, "weightOne");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightOneLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("weight_one <=", value, "weightOne");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightOneIn(List<BigDecimal> values) {
+            addCriterion("weight_one in", values, "weightOne");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightOneNotIn(List<BigDecimal> values) {
+            addCriterion("weight_one not in", values, "weightOne");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightOneBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("weight_one between", value1, value2, "weightOne");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightOneNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("weight_one not between", value1, value2, "weightOne");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightTwoIsNull() {
+            addCriterion("weight_two is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightTwoIsNotNull() {
+            addCriterion("weight_two is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightTwoEqualTo(BigDecimal value) {
+            addCriterion("weight_two =", value, "weightTwo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightTwoNotEqualTo(BigDecimal value) {
+            addCriterion("weight_two <>", value, "weightTwo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightTwoGreaterThan(BigDecimal value) {
+            addCriterion("weight_two >", value, "weightTwo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightTwoGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("weight_two >=", value, "weightTwo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightTwoLessThan(BigDecimal value) {
+            addCriterion("weight_two <", value, "weightTwo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightTwoLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("weight_two <=", value, "weightTwo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightTwoIn(List<BigDecimal> values) {
+            addCriterion("weight_two in", values, "weightTwo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightTwoNotIn(List<BigDecimal> values) {
+            addCriterion("weight_two not in", values, "weightTwo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightTwoBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("weight_two between", value1, value2, "weightTwo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightTwoNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("weight_two not between", value1, value2, "weightTwo");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightThreeIsNull() {
+            addCriterion("weight_three is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightThreeIsNotNull() {
+            addCriterion("weight_three is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightThreeEqualTo(BigDecimal value) {
+            addCriterion("weight_three =", value, "weightThree");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightThreeNotEqualTo(BigDecimal value) {
+            addCriterion("weight_three <>", value, "weightThree");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightThreeGreaterThan(BigDecimal value) {
+            addCriterion("weight_three >", value, "weightThree");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightThreeGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("weight_three >=", value, "weightThree");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightThreeLessThan(BigDecimal value) {
+            addCriterion("weight_three <", value, "weightThree");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightThreeLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("weight_three <=", value, "weightThree");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightThreeIn(List<BigDecimal> values) {
+            addCriterion("weight_three in", values, "weightThree");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightThreeNotIn(List<BigDecimal> values) {
+            addCriterion("weight_three not in", values, "weightThree");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightThreeBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("weight_three between", value1, value2, "weightThree");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightThreeNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("weight_three not between", value1, value2, "weightThree");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightFourIsNull() {
+            addCriterion("weight_four is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightFourIsNotNull() {
+            addCriterion("weight_four is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightFourEqualTo(BigDecimal value) {
+            addCriterion("weight_four =", value, "weightFour");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightFourNotEqualTo(BigDecimal value) {
+            addCriterion("weight_four <>", value, "weightFour");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightFourGreaterThan(BigDecimal value) {
+            addCriterion("weight_four >", value, "weightFour");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightFourGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("weight_four >=", value, "weightFour");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightFourLessThan(BigDecimal value) {
+            addCriterion("weight_four <", value, "weightFour");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightFourLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("weight_four <=", value, "weightFour");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightFourIn(List<BigDecimal> values) {
+            addCriterion("weight_four in", values, "weightFour");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightFourNotIn(List<BigDecimal> values) {
+            addCriterion("weight_four not in", values, "weightFour");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightFourBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("weight_four between", value1, value2, "weightFour");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightFourNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("weight_four not between", value1, value2, "weightFour");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightFiveIsNull() {
+            addCriterion("weight_five is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightFiveIsNotNull() {
+            addCriterion("weight_five is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightFiveEqualTo(BigDecimal value) {
+            addCriterion("weight_five =", value, "weightFive");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightFiveNotEqualTo(BigDecimal value) {
+            addCriterion("weight_five <>", value, "weightFive");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightFiveGreaterThan(BigDecimal value) {
+            addCriterion("weight_five >", value, "weightFive");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightFiveGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("weight_five >=", value, "weightFive");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightFiveLessThan(BigDecimal value) {
+            addCriterion("weight_five <", value, "weightFive");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightFiveLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("weight_five <=", value, "weightFive");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightFiveIn(List<BigDecimal> values) {
+            addCriterion("weight_five in", values, "weightFive");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightFiveNotIn(List<BigDecimal> values) {
+            addCriterion("weight_five not in", values, "weightFive");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightFiveBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("weight_five between", value1, value2, "weightFive");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightFiveNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("weight_five not between", value1, value2, "weightFive");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightSixIsNull() {
+            addCriterion("weight_six is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightSixIsNotNull() {
+            addCriterion("weight_six is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightSixEqualTo(BigDecimal value) {
+            addCriterion("weight_six =", value, "weightSix");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightSixNotEqualTo(BigDecimal value) {
+            addCriterion("weight_six <>", value, "weightSix");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightSixGreaterThan(BigDecimal value) {
+            addCriterion("weight_six >", value, "weightSix");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightSixGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("weight_six >=", value, "weightSix");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightSixLessThan(BigDecimal value) {
+            addCriterion("weight_six <", value, "weightSix");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightSixLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("weight_six <=", value, "weightSix");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightSixIn(List<BigDecimal> values) {
+            addCriterion("weight_six in", values, "weightSix");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightSixNotIn(List<BigDecimal> values) {
+            addCriterion("weight_six not in", values, "weightSix");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightSixBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("weight_six between", value1, value2, "weightSix");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightSixNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("weight_six not between", value1, value2, "weightSix");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightSvenIsNull() {
+            addCriterion("weight_sven is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightSvenIsNotNull() {
+            addCriterion("weight_sven is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightSvenEqualTo(BigDecimal value) {
+            addCriterion("weight_sven =", value, "weightSven");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightSvenNotEqualTo(BigDecimal value) {
+            addCriterion("weight_sven <>", value, "weightSven");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightSvenGreaterThan(BigDecimal value) {
+            addCriterion("weight_sven >", value, "weightSven");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightSvenGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("weight_sven >=", value, "weightSven");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightSvenLessThan(BigDecimal value) {
+            addCriterion("weight_sven <", value, "weightSven");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightSvenLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("weight_sven <=", value, "weightSven");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightSvenIn(List<BigDecimal> values) {
+            addCriterion("weight_sven in", values, "weightSven");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightSvenNotIn(List<BigDecimal> values) {
+            addCriterion("weight_sven not in", values, "weightSven");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightSvenBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("weight_sven between", value1, value2, "weightSven");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightSvenNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("weight_sven not between", value1, value2, "weightSven");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightEightIsNull() {
+            addCriterion("weight_eight is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightEightIsNotNull() {
+            addCriterion("weight_eight is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightEightEqualTo(BigDecimal value) {
+            addCriterion("weight_eight =", value, "weightEight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightEightNotEqualTo(BigDecimal value) {
+            addCriterion("weight_eight <>", value, "weightEight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightEightGreaterThan(BigDecimal value) {
+            addCriterion("weight_eight >", value, "weightEight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightEightGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("weight_eight >=", value, "weightEight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightEightLessThan(BigDecimal value) {
+            addCriterion("weight_eight <", value, "weightEight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightEightLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("weight_eight <=", value, "weightEight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightEightIn(List<BigDecimal> values) {
+            addCriterion("weight_eight in", values, "weightEight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightEightNotIn(List<BigDecimal> values) {
+            addCriterion("weight_eight not in", values, "weightEight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightEightBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("weight_eight between", value1, value2, "weightEight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightEightNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("weight_eight not between", value1, value2, "weightEight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightNineIsNull() {
+            addCriterion("weight_nine is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightNineIsNotNull() {
+            addCriterion("weight_nine is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightNineEqualTo(BigDecimal value) {
+            addCriterion("weight_nine =", value, "weightNine");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightNineNotEqualTo(BigDecimal value) {
+            addCriterion("weight_nine <>", value, "weightNine");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightNineGreaterThan(BigDecimal value) {
+            addCriterion("weight_nine >", value, "weightNine");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightNineGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("weight_nine >=", value, "weightNine");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightNineLessThan(BigDecimal value) {
+            addCriterion("weight_nine <", value, "weightNine");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightNineLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("weight_nine <=", value, "weightNine");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightNineIn(List<BigDecimal> values) {
+            addCriterion("weight_nine in", values, "weightNine");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightNineNotIn(List<BigDecimal> values) {
+            addCriterion("weight_nine not in", values, "weightNine");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightNineBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("weight_nine between", value1, value2, "weightNine");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightNineNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("weight_nine not between", value1, value2, "weightNine");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightTenIsNull() {
+            addCriterion("weight_ten is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightTenIsNotNull() {
+            addCriterion("weight_ten is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightTenEqualTo(BigDecimal value) {
+            addCriterion("weight_ten =", value, "weightTen");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightTenNotEqualTo(BigDecimal value) {
+            addCriterion("weight_ten <>", value, "weightTen");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightTenGreaterThan(BigDecimal value) {
+            addCriterion("weight_ten >", value, "weightTen");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightTenGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("weight_ten >=", value, "weightTen");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightTenLessThan(BigDecimal value) {
+            addCriterion("weight_ten <", value, "weightTen");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightTenLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("weight_ten <=", value, "weightTen");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightTenIn(List<BigDecimal> values) {
+            addCriterion("weight_ten in", values, "weightTen");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightTenNotIn(List<BigDecimal> values) {
+            addCriterion("weight_ten not in", values, "weightTen");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightTenBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("weight_ten between", value1, value2, "weightTen");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightTenNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("weight_ten not between", value1, value2, "weightTen");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightElevenIsNull() {
+            addCriterion("weight_eleven is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightElevenIsNotNull() {
+            addCriterion("weight_eleven is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightElevenEqualTo(BigDecimal value) {
+            addCriterion("weight_eleven =", value, "weightEleven");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightElevenNotEqualTo(BigDecimal value) {
+            addCriterion("weight_eleven <>", value, "weightEleven");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightElevenGreaterThan(BigDecimal value) {
+            addCriterion("weight_eleven >", value, "weightEleven");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightElevenGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("weight_eleven >=", value, "weightEleven");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightElevenLessThan(BigDecimal value) {
+            addCriterion("weight_eleven <", value, "weightEleven");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightElevenLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("weight_eleven <=", value, "weightEleven");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightElevenIn(List<BigDecimal> values) {
+            addCriterion("weight_eleven in", values, "weightEleven");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightElevenNotIn(List<BigDecimal> values) {
+            addCriterion("weight_eleven not in", values, "weightEleven");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightElevenBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("weight_eleven between", value1, value2, "weightEleven");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightElevenNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("weight_eleven not between", value1, value2, "weightEleven");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightTwelveIsNull() {
+            addCriterion("weight_twelve is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightTwelveIsNotNull() {
+            addCriterion("weight_twelve is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightTwelveEqualTo(BigDecimal value) {
+            addCriterion("weight_twelve =", value, "weightTwelve");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightTwelveNotEqualTo(BigDecimal value) {
+            addCriterion("weight_twelve <>", value, "weightTwelve");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightTwelveGreaterThan(BigDecimal value) {
+            addCriterion("weight_twelve >", value, "weightTwelve");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightTwelveGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("weight_twelve >=", value, "weightTwelve");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightTwelveLessThan(BigDecimal value) {
+            addCriterion("weight_twelve <", value, "weightTwelve");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightTwelveLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("weight_twelve <=", value, "weightTwelve");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightTwelveIn(List<BigDecimal> values) {
+            addCriterion("weight_twelve in", values, "weightTwelve");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightTwelveNotIn(List<BigDecimal> values) {
+            addCriterion("weight_twelve not in", values, "weightTwelve");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightTwelveBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("weight_twelve between", value1, value2, "weightTwelve");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightTwelveNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("weight_twelve not between", value1, value2, "weightTwelve");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightThirteenIsNull() {
+            addCriterion("weight_thirteen is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightThirteenIsNotNull() {
+            addCriterion("weight_thirteen is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightThirteenEqualTo(BigDecimal value) {
+            addCriterion("weight_thirteen =", value, "weightThirteen");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightThirteenNotEqualTo(BigDecimal value) {
+            addCriterion("weight_thirteen <>", value, "weightThirteen");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightThirteenGreaterThan(BigDecimal value) {
+            addCriterion("weight_thirteen >", value, "weightThirteen");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightThirteenGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("weight_thirteen >=", value, "weightThirteen");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightThirteenLessThan(BigDecimal value) {
+            addCriterion("weight_thirteen <", value, "weightThirteen");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightThirteenLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("weight_thirteen <=", value, "weightThirteen");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightThirteenIn(List<BigDecimal> values) {
+            addCriterion("weight_thirteen in", values, "weightThirteen");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightThirteenNotIn(List<BigDecimal> values) {
+            addCriterion("weight_thirteen not in", values, "weightThirteen");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightThirteenBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("weight_thirteen between", value1, value2, "weightThirteen");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightThirteenNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("weight_thirteen not between", value1, value2, "weightThirteen");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

src/main/java/com/sztzjy/trade/entity/dto/StuLearningAssessmentDTO.java

@@ -0,0 +1,52 @@
+package com.sztzjy.trade.entity.dto;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author tz
+ * @date 2023/9/4 11:52
+ */
+@Data
+public class StuLearningAssessmentDTO {
+    private String topicId;
+
+    private String topicName;
+
+    private String topicType;
+
+    private String topicDifficultyLevel;
+
+    private BigDecimal topicScore;
+
+    private Integer topicNumber;
+
+    private String optionA;
+
+    private String optionB;
+
+    private String optionC;
+
+    private String optionD;
+
+    private String optionE;
+
+    private String optionF;
+
+    private String answer;
+
+    private String[] studentAnswer;
+
+    private String questionAnswer;
+
+    private String module;
+
+    private Integer logic;
+
+    private Integer state;
+
+    private String reason;
+
+    private String optionImg;
+}

src/main/java/com/sztzjy/trade/entity/dto/StuLearningAssessmentScoreDTO.java

@@ -0,0 +1,18 @@
+package com.sztzjy.trade.entity.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author tz
+ * @date 2023/9/4 14:50
+ */
+@Data
+public class StuLearningAssessmentScoreDTO {
+    private String module;
+    private String userId;
+    private String learningProjects;
+    private String assessmentItems;
+    private List<StuLearningAssessmentDTO> stuLearningAssessmentDTOS;
+}

src/main/java/com/sztzjy/trade/mapper/StuAssessmentQuestionDetailsMapper.java

@@ -0,0 +1,30 @@
+package com.sztzjy.trade.mapper;
+
+import com.sztzjy.trade.entity.StuAssessmentQuestionDetails;
+import com.sztzjy.trade.entity.StuAssessmentQuestionDetailsExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface StuAssessmentQuestionDetailsMapper {
+    long countByExample(StuAssessmentQuestionDetailsExample example);
+
+    int deleteByExample(StuAssessmentQuestionDetailsExample example);
+
+    int deleteByPrimaryKey(Integer detailsId);
+
+    int insert(StuAssessmentQuestionDetails record);
+
+    int insertSelective(StuAssessmentQuestionDetails record);
+
+    List<StuAssessmentQuestionDetails> selectByExample(StuAssessmentQuestionDetailsExample example);
+
+    StuAssessmentQuestionDetails selectByPrimaryKey(Integer detailsId);
+
+    int updateByExampleSelective(@Param("record") StuAssessmentQuestionDetails record, @Param("example") StuAssessmentQuestionDetailsExample example);
+
+    int updateByExample(@Param("record") StuAssessmentQuestionDetails record, @Param("example") StuAssessmentQuestionDetailsExample example);
+
+    int updateByPrimaryKeySelective(StuAssessmentQuestionDetails record);
+
+    int updateByPrimaryKey(StuAssessmentQuestionDetails record);
+}

src/main/java/com/sztzjy/trade/service/StuCommonModuleService.java

@@ -0,0 +1,17 @@
+package com.sztzjy.trade.service;
+
+import com.sztzjy.trade.entity.StuAssessmentQuestionDetailsDTO;
+import com.sztzjy.trade.entity.dto.StuLearningAssessmentScoreDTO;
+
+import java.util.List;
+
+/**
+ * @author tz
+ * @date 2024/12/17 17:24
+ */
+public interface StuCommonModuleService {
+
+    List<StuAssessmentQuestionDetailsDTO> getLearningAssessment(String module, String userId);
+
+    void hashLearningAssessmentScore(StuLearningAssessmentScoreDTO stuLearningAssessmentScoreDTO);
+}

src/main/java/com/sztzjy/trade/service/impl/StuAcademicRecordServiceImpl.java

@@ -116,8 +116,65 @@ public class StuAcademicRecordServiceImpl implements StuAcademicRecordService {
                 stuScoreDetailsDTO.setProjectName(modules[i]);
                 stuScoreDetailsDTO.setScore(score);
 
+                //计算乘权重后得分
+                double weight = this.getWeight(i, tchDigitalTradeWeight);
+                stuScoreDetailsDTO.setWeight(new BigDecimal(weight));
+                stuScoreDetailsDTO.setWeightedScore(bigDecimalUtils.mul(weight,score));
+
+                scoreDetailsDTOS.add(stuScoreDetailsDTO);
             }
         }
-        return null;
+        stuAcademicRecordDTO.setScoreDetailsDTOS(scoreDetailsDTOS);
+        return stuAcademicRecordDTO;
+    }
+
+
+    /**
+     * 返回对应的权重信息
+     * @param i
+     * @param tchDigitalTradeWeight
+     * @return
+     */
+    public double getWeight(int i,TchDigitalTradeWeight tchDigitalTradeWeight){
+        if(i==0){
+            return Double.parseDouble(String.valueOf(tchDigitalTradeWeight.getWeightOne()));
+        }
+        if(i==1){
+            return Double.parseDouble(String.valueOf(tchDigitalTradeWeight.getWeightTwo()));
+        }
+        if(i==2){
+            return Double.parseDouble(String.valueOf(tchDigitalTradeWeight.getWeightThree()));
+        }
+        if(i==3){
+            return Double.parseDouble(String.valueOf(tchDigitalTradeWeight.getWeightFour()));
+        }
+        if(i==4){
+            return Double.parseDouble(String.valueOf(tchDigitalTradeWeight.getWeightFive()));
+        }
+        if(i==5){
+            return Double.parseDouble(String.valueOf(tchDigitalTradeWeight.getWeightSix()));
+        }
+        if(i==6){
+            return Double.parseDouble(String.valueOf(tchDigitalTradeWeight.getWeightSven()));
+        }
+        if(i==7){
+            return Double.parseDouble(String.valueOf(tchDigitalTradeWeight.getWeightEight()));
+        }
+        if(i==8){
+            return Double.parseDouble(String.valueOf(tchDigitalTradeWeight.getWeightNine()));
+        }
+        if(i==9){
+            return Double.parseDouble(String.valueOf(tchDigitalTradeWeight.getWeightTen()));
+        }
+        if(i==10){
+            return Double.parseDouble(String.valueOf(tchDigitalTradeWeight.getWeightEleven()));
+        }
+        if(i==11){
+            return Double.parseDouble(String.valueOf(tchDigitalTradeWeight.getWeightTwelve()));
+        }
+        if(i==12){
+            return Double.parseDouble(String.valueOf(tchDigitalTradeWeight.getWeightThirteen()));
+        }
+        return 0;
     }
 }

src/main/java/com/sztzjy/trade/service/impl/StuCommonModuleServiceImpl.java

@@ -0,0 +1,203 @@
+package com.sztzjy.trade.service.impl;
+
+import com.sztzjy.trade.config.exception.handler.ServiceException;
+import com.sztzjy.trade.entity.*;
+import com.sztzjy.trade.entity.dto.StuLearningAssessmentDTO;
+import com.sztzjy.trade.entity.dto.StuLearningAssessmentScoreDTO;
+import com.sztzjy.trade.mapper.*;
+import com.sztzjy.trade.service.StuCommonModuleService;
+import com.sztzjy.trade.util.ConvertUtil;
+import com.sztzjy.trade.util.compute.ScoringUtil;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.UUID;
+
+/**
+ * @author tz
+ * @date 2024/12/17 17:24
+ */
+@Service
+public class StuCommonModuleServiceImpl implements StuCommonModuleService {
+
+    @Resource
+    StuAssessmentQuestionDetailsMapper stuAssessmentQuestionDetailsMapper;
+    @Resource
+    StuLearningAssessmentMapper stuLearningAssessmentMapper;
+    @Resource
+    ConvertUtil convertUtil;
+    @Resource
+    StuUserMapper stuUserMapper;
+    @Resource
+    TchDigitalTradeWeightMapper digitalTradeWeightMapper;
+    @Resource
+    ScoringUtil scoringUtil;
+    @Resource
+    StuScoreDetailsMapper stuScoreDetailsMapper;
+
+    /**
+     * 学习测评查看
+     *
+     * @param module 所属模块
+     * @return
+     */
+    @Override
+    public List<StuAssessmentQuestionDetailsDTO> getLearningAssessment(String module, String userId) {
+        StuAssessmentQuestionDetailsExample detailsExample=new StuAssessmentQuestionDetailsExample();
+        detailsExample.createCriteria().andUserIdEqualTo(userId).andModuleEqualTo(module);
+        List<StuAssessmentQuestionDetails> stuAssessmentQuestionDetails = stuAssessmentQuestionDetailsMapper.selectByExample(detailsExample);
+
+        StuLearningAssessmentExample example = new StuLearningAssessmentExample();
+        StuLearningAssessmentExample.Criteria criteria = example.createCriteria();
+        criteria.andAttributionChapterEqualTo(module).andLogicEqualTo(1);
+        List<StuLearningAssessment> stuLearningAssessments = stuLearningAssessmentMapper.selectByExample(example);
+        List<StuAssessmentQuestionDetailsDTO> stuAssessmentQuestionDetailsDTOS = convertUtil.entityToDTOList(stuLearningAssessments, StuAssessmentQuestionDetailsDTO.class);
+        if(stuAssessmentQuestionDetails.size()!=0){
+            for (int i = 0; i < stuAssessmentQuestionDetails.size(); i++) {
+                for (int j = 0; j < stuAssessmentQuestionDetailsDTOS.size(); j++) {
+                    if(stuAssessmentQuestionDetails.get(i).getTopicId().equals(stuLearningAssessments.get(j).getTopicId())){
+                        String rightOrWrong = stuAssessmentQuestionDetails.get(i).getRightOrWrong();
+                        String studentAnswer = stuAssessmentQuestionDetails.get(i).getStudentAnswer();
+                        stuAssessmentQuestionDetailsDTOS.get(j).setRightOrWrong(rightOrWrong);
+                        stuAssessmentQuestionDetailsDTOS.get(j).setStudentAnswer(studentAnswer);
+                    }
+                }
+            }
+            return stuAssessmentQuestionDetailsDTOS;
+        }
+        for (int i = 0; i < stuAssessmentQuestionDetailsDTOS.size(); i++) {
+            stuAssessmentQuestionDetailsDTOS.get(i).setAnswer(null);
+        }
+        return stuAssessmentQuestionDetailsDTOS;
+    }
+
+
+
+    /**
+     * 学习测评计分
+     *
+     * @param stuLearningAssessmentScoreDTO 学习测评DTO
+     */
+    @Override
+    public void hashLearningAssessmentScore(StuLearningAssessmentScoreDTO stuLearningAssessmentScoreDTO) {
+        StuAssessmentQuestionDetailsExample detailsExample = new StuAssessmentQuestionDetailsExample();
+        detailsExample.createCriteria().andUserIdEqualTo(stuLearningAssessmentScoreDTO.getUserId()).andModuleEqualTo(stuLearningAssessmentScoreDTO.getModule());
+        List<StuAssessmentQuestionDetails> stuAssessmentQuestionDetails = stuAssessmentQuestionDetailsMapper.selectByExample(detailsExample);
+        if (stuAssessmentQuestionDetails.size() != 0) {
+            StuLearningAssessmentExample example1 = new StuLearningAssessmentExample();
+            StuLearningAssessmentExample.Criteria criteria1 = example1.createCriteria();
+            criteria1.andAttributionChapterEqualTo(stuLearningAssessmentScoreDTO.getModule());
+            List<StuLearningAssessment> stuLearningAssessments = stuLearningAssessmentMapper.selectByExample(example1);
+
+            List<StuLearningAssessmentDTO> stuLearningAssessmentDTOS = stuLearningAssessmentScoreDTO.getStuLearningAssessmentDTOS();
+            for (int i = 0; i < stuLearningAssessmentDTOS.size(); i++) {
+                for (int j = 0; j < stuLearningAssessments.size(); j++) {
+                    if (stuLearningAssessmentDTOS.get(i).getTopicId().equals(stuLearningAssessments.get(j).getTopicId())) {
+                        String[] studentAnswer = stuLearningAssessmentDTOS.get(i).getStudentAnswer();
+                        String saw = "";
+                        for (int k = 0; k < studentAnswer.length; k++) {
+                            if (studentAnswer.length - 1 == k) {
+                                saw += studentAnswer[k];
+                            } else {
+                                saw += studentAnswer[k] + ",";
+                            }
+                        }
+                        String string = stuLearningAssessments.get(j).getAnswer();
+                        for (int k = 0; k < stuAssessmentQuestionDetails.size(); k++) {
+                            if (stuAssessmentQuestionDetails.get(k).getTopicId().equals(stuLearningAssessmentDTOS.get(i).getTopicId())) {
+                                StuAssessmentQuestionDetails assessmentQuestionDetails = stuAssessmentQuestionDetails.get(k);
+                                assessmentQuestionDetails.setStudentAnswer(saw);
+                                assessmentQuestionDetails.setUserId(stuLearningAssessmentScoreDTO.getUserId());
+                                if (saw.equals(string)) {
+                                    assessmentQuestionDetails.setRightOrWrong("正确");
+                                } else {
+                                    assessmentQuestionDetails.setRightOrWrong("错误");
+                                }
+                                stuAssessmentQuestionDetailsMapper.updateByPrimaryKey(assessmentQuestionDetails);
+                            }
+                        }
+                    }
+                }
+            }
+        } else {
+            StuUserExample stuUserExample = new StuUserExample();
+            stuUserExample.createCriteria().andUserIdEqualTo(stuLearningAssessmentScoreDTO.getUserId());
+            List<StuUser> stuUsers = stuUserMapper.selectByExample(stuUserExample);
+            StuUser stuUser = stuUsers.get(0);
+
+            TchDigitalTradeWeight tchDigitalTradeWeight = digitalTradeWeightMapper.selectByPrimaryKey(stuUser.getSchoolId());
+            if(tchDigitalTradeWeight==null){
+                TchDigitalTradeWeight tchDigitalTradeWeight1=new TchDigitalTradeWeight(stuUser.getSchoolId());
+                tchDigitalTradeWeight=tchDigitalTradeWeight1;
+            }
+
+            BigDecimal learningAssessmentScore = tchDigitalTradeWeight.getScoringCriteriaForStudyEvaluation();
+
+            StuLearningAssessmentExample example1 = new StuLearningAssessmentExample();
+            StuLearningAssessmentExample.Criteria criteria1 = example1.createCriteria();
+            criteria1.andAttributionChapterEqualTo(stuLearningAssessmentScoreDTO.getModule());
+            List<StuLearningAssessment> stuLearningAssessments = stuLearningAssessmentMapper.selectByExample(example1);
+
+            List<StuLearningAssessmentDTO> stuLearningAssessmentDTOS = stuLearningAssessmentScoreDTO.getStuLearningAssessmentDTOS();
+            int count = 0;
+            for (int i = 0; i < stuLearningAssessmentDTOS.size(); i++) {
+                for (int j = 0; j < stuLearningAssessments.size(); j++) {
+                    if (stuLearningAssessmentDTOS.get(i).getTopicId().equals(stuLearningAssessments.get(j).getTopicId())) {
+                        String[] studentAnswer = stuLearningAssessmentDTOS.get(i).getStudentAnswer();
+                        String saw = "";
+                        for (int k = 0; k < studentAnswer.length; k++) {
+                            if (studentAnswer.length - 1 == k) {
+                                saw += studentAnswer[k];
+                            } else {
+                                saw += studentAnswer[k] + ",";
+                            }
+                        }
+                        String string = stuLearningAssessments.get(j).getAnswer();
+                        StuAssessmentQuestionDetails details = new StuAssessmentQuestionDetails();
+                        int uuid = UUID.randomUUID().hashCode();
+                        if (uuid < 0) {
+                            uuid = -uuid;
+                        }
+                        details.setDetailsId(uuid);
+                        details.setStudentAnswer(saw);
+                        details.setTopicId(stuLearningAssessmentDTOS.get(i).getTopicId());
+                        details.setUserId(stuLearningAssessmentScoreDTO.getUserId());
+                        details.setModule(stuLearningAssessmentScoreDTO.getModule());
+                        if (saw.equals(string)) {
+                            details.setRightOrWrong("正确");
+                        } else {
+                            details.setRightOrWrong("错误");
+                            count++;
+                        }
+                        stuAssessmentQuestionDetailsMapper.insert(details);
+                    }
+                }
+            }
+            double stuLearningAssessmentScoring = scoringUtil.getStuLearningAssessmentScoring(count, Double.parseDouble(String.valueOf(learningAssessmentScore)));
+            StuScoreDetails stuScoreDetails = convertUtil.DTOToEntity(stuLearningAssessmentScoreDTO, StuScoreDetails.class);
+            stuScoreDetails.setScoreProject(stuLearningAssessmentScoring);
+            stuScoreDetails.setScoringCriteria(String.valueOf(learningAssessmentScore));
+            stuScoreDetails.setScoreWeight(Double.parseDouble(String.valueOf(tchDigitalTradeWeight.getWeightStudyEvaluation())));
+            stuScoreDetails.setSerialNumber(3);
+            stuScoreDetails.setSchedule(1.0);
+            stuScoreDetails.setCompletionStatus(String.valueOf(count));
+
+
+            StuScoreDetailsExample stuScoreDetailsExample = new StuScoreDetailsExample();
+            stuScoreDetailsExample.createCriteria().andUserIdEqualTo(stuLearningAssessmentScoreDTO.getUserId()).
+                    andModuleEqualTo(stuLearningAssessmentScoreDTO.getModule()).
+                    andLearningProjectsEqualTo(stuLearningAssessmentScoreDTO.getLearningProjects());
+            List<StuScoreDetails> scoreDetailsList = stuScoreDetailsMapper.selectByExample(stuScoreDetailsExample);
+
+            if (scoreDetailsList.size() != 0) {
+                throw new ServiceException(HttpStatus.SEE_OTHER, "已完成过答题");
+            } else {
+                stuScoreDetails.setId(UUID.randomUUID().toString());
+                stuScoreDetailsMapper.insert(stuScoreDetails);
+            }
+        }
+    }
+}

src/main/resources/mappers/StuAssessmentQuestionDetailsMapper.xml

@@ -0,0 +1,228 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sztzjy.trade.mapper.StuAssessmentQuestionDetailsMapper">
+  <resultMap id="BaseResultMap" type="com.sztzjy.trade.entity.StuAssessmentQuestionDetails">
+    <id column="details_id" jdbcType="INTEGER" property="detailsId" />
+    <result column="topic_id" jdbcType="VARCHAR" property="topicId" />
+    <result column="student_answer" jdbcType="VARCHAR" property="studentAnswer" />
+    <result column="user_id" jdbcType="VARCHAR" property="userId" />
+    <result column="right_or_wrong" jdbcType="VARCHAR" property="rightOrWrong" />
+    <result column="module" jdbcType="VARCHAR" property="module" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    details_id, topic_id, student_answer, user_id, right_or_wrong, module
+  </sql>
+  <select id="selectByExample" parameterType="com.sztzjy.trade.entity.StuAssessmentQuestionDetailsExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from stu_assessment_question_details
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from stu_assessment_question_details
+    where details_id = #{detailsId,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from stu_assessment_question_details
+    where details_id = #{detailsId,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.sztzjy.trade.entity.StuAssessmentQuestionDetailsExample">
+    delete from stu_assessment_question_details
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.sztzjy.trade.entity.StuAssessmentQuestionDetails">
+    insert into stu_assessment_question_details (details_id, topic_id, student_answer, 
+      user_id, right_or_wrong, module
+      )
+    values (#{detailsId,jdbcType=INTEGER}, #{topicId,jdbcType=VARCHAR}, #{studentAnswer,jdbcType=VARCHAR}, 
+      #{userId,jdbcType=VARCHAR}, #{rightOrWrong,jdbcType=VARCHAR}, #{module,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.sztzjy.trade.entity.StuAssessmentQuestionDetails">
+    insert into stu_assessment_question_details
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="detailsId != null">
+        details_id,
+      </if>
+      <if test="topicId != null">
+        topic_id,
+      </if>
+      <if test="studentAnswer != null">
+        student_answer,
+      </if>
+      <if test="userId != null">
+        user_id,
+      </if>
+      <if test="rightOrWrong != null">
+        right_or_wrong,
+      </if>
+      <if test="module != null">
+        module,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="detailsId != null">
+        #{detailsId,jdbcType=INTEGER},
+      </if>
+      <if test="topicId != null">
+        #{topicId,jdbcType=VARCHAR},
+      </if>
+      <if test="studentAnswer != null">
+        #{studentAnswer,jdbcType=VARCHAR},
+      </if>
+      <if test="userId != null">
+        #{userId,jdbcType=VARCHAR},
+      </if>
+      <if test="rightOrWrong != null">
+        #{rightOrWrong,jdbcType=VARCHAR},
+      </if>
+      <if test="module != null">
+        #{module,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.sztzjy.trade.entity.StuAssessmentQuestionDetailsExample" resultType="java.lang.Long">
+    select count(*) from stu_assessment_question_details
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update stu_assessment_question_details
+    <set>
+      <if test="record.detailsId != null">
+        details_id = #{record.detailsId,jdbcType=INTEGER},
+      </if>
+      <if test="record.topicId != null">
+        topic_id = #{record.topicId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.studentAnswer != null">
+        student_answer = #{record.studentAnswer,jdbcType=VARCHAR},
+      </if>
+      <if test="record.userId != null">
+        user_id = #{record.userId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.rightOrWrong != null">
+        right_or_wrong = #{record.rightOrWrong,jdbcType=VARCHAR},
+      </if>
+      <if test="record.module != null">
+        module = #{record.module,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update stu_assessment_question_details
+    set details_id = #{record.detailsId,jdbcType=INTEGER},
+      topic_id = #{record.topicId,jdbcType=VARCHAR},
+      student_answer = #{record.studentAnswer,jdbcType=VARCHAR},
+      user_id = #{record.userId,jdbcType=VARCHAR},
+      right_or_wrong = #{record.rightOrWrong,jdbcType=VARCHAR},
+      module = #{record.module,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.sztzjy.trade.entity.StuAssessmentQuestionDetails">
+    update stu_assessment_question_details
+    <set>
+      <if test="topicId != null">
+        topic_id = #{topicId,jdbcType=VARCHAR},
+      </if>
+      <if test="studentAnswer != null">
+        student_answer = #{studentAnswer,jdbcType=VARCHAR},
+      </if>
+      <if test="userId != null">
+        user_id = #{userId,jdbcType=VARCHAR},
+      </if>
+      <if test="rightOrWrong != null">
+        right_or_wrong = #{rightOrWrong,jdbcType=VARCHAR},
+      </if>
+      <if test="module != null">
+        module = #{module,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where details_id = #{detailsId,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.sztzjy.trade.entity.StuAssessmentQuestionDetails">
+    update stu_assessment_question_details
+    set topic_id = #{topicId,jdbcType=VARCHAR},
+      student_answer = #{studentAnswer,jdbcType=VARCHAR},
+      user_id = #{userId,jdbcType=VARCHAR},
+      right_or_wrong = #{rightOrWrong,jdbcType=VARCHAR},
+      module = #{module,jdbcType=VARCHAR}
+    where details_id = #{detailsId,jdbcType=INTEGER}
+  </update>
+</mapper>

src/main/resources/mappers/TchDigitalTradeWeightMapper.xml

@@ -18,6 +18,19 @@
     <result column="weight_study_evaluation" jdbcType="DECIMAL" property="weightStudyEvaluation" />
     <result column="weight_experimental_training" jdbcType="DECIMAL" property="weightExperimentalTraining" />
     <result column="weight_experimental_report" jdbcType="DECIMAL" property="weightExperimentalReport" />
+    <result column="weight_one" jdbcType="DECIMAL" property="weightOne" />
+    <result column="weight_two" jdbcType="DECIMAL" property="weightTwo" />
+    <result column="weight_three" jdbcType="DECIMAL" property="weightThree" />
+    <result column="weight_four" jdbcType="DECIMAL" property="weightFour" />
+    <result column="weight_five" jdbcType="DECIMAL" property="weightFive" />
+    <result column="weight_six" jdbcType="DECIMAL" property="weightSix" />
+    <result column="weight_sven" jdbcType="DECIMAL" property="weightSven" />
+    <result column="weight_eight" jdbcType="DECIMAL" property="weightEight" />
+    <result column="weight_nine" jdbcType="DECIMAL" property="weightNine" />
+    <result column="weight_ten" jdbcType="DECIMAL" property="weightTen" />
+    <result column="weight_eleven" jdbcType="DECIMAL" property="weightEleven" />
+    <result column="weight_twelve" jdbcType="DECIMAL" property="weightTwelve" />
+    <result column="weight_thirteen" jdbcType="DECIMAL" property="weightThirteen" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -82,7 +95,9 @@
     weight_of_practical_case_scores, create_time, update_time, scoring_criteria_for_learning_duration, 
     scoring_criteria_for_study_resource, scoring_criteria_for_study_evaluation, scoring_criteria_for_experimental_training, 
     weight_study_time, weight_study_resource, weight_study_evaluation, weight_experimental_training, 
-    weight_experimental_report
+    weight_experimental_report, weight_one, weight_two, weight_three, weight_four, weight_five, 
+    weight_six, weight_sven, weight_eight, weight_nine, weight_ten, weight_eleven, weight_twelve, 
+    weight_thirteen
   </sql>
   <select id="selectByExample" parameterType="com.sztzjy.trade.entity.TchDigitalTradeWeightExample" resultMap="BaseResultMap">
     select
@@ -122,8 +137,12 @@
       scoring_criteria_for_study_resource, scoring_criteria_for_study_evaluation, 
       scoring_criteria_for_experimental_training, weight_study_time, 
       weight_study_resource, weight_study_evaluation, 
-      weight_experimental_training, weight_experimental_report
-      )
+      weight_experimental_training, weight_experimental_report, 
+      weight_one, weight_two, weight_three, 
+      weight_four, weight_five, weight_six, 
+      weight_sven, weight_eight, weight_nine, 
+      weight_ten, weight_eleven, weight_twelve, 
+      weight_thirteen)
     values (#{schoolId,jdbcType=VARCHAR}, #{weightOfAttendanceScoresSmall,jdbcType=DECIMAL}, 
       #{weightOfAttendanceScores,jdbcType=DECIMAL}, #{weightOfHomeworkExamScores,jdbcType=DECIMAL}, 
       #{weightOfPracticalCaseScores,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP}, 
@@ -131,8 +150,12 @@
       #{scoringCriteriaForStudyResource,jdbcType=DECIMAL}, #{scoringCriteriaForStudyEvaluation,jdbcType=DECIMAL}, 
       #{scoringCriteriaForExperimentalTraining,jdbcType=DECIMAL}, #{weightStudyTime,jdbcType=DECIMAL}, 
       #{weightStudyResource,jdbcType=DECIMAL}, #{weightStudyEvaluation,jdbcType=DECIMAL}, 
-      #{weightExperimentalTraining,jdbcType=DECIMAL}, #{weightExperimentalReport,jdbcType=DECIMAL}
-      )
+      #{weightExperimentalTraining,jdbcType=DECIMAL}, #{weightExperimentalReport,jdbcType=DECIMAL}, 
+      #{weightOne,jdbcType=DECIMAL}, #{weightTwo,jdbcType=DECIMAL}, #{weightThree,jdbcType=DECIMAL}, 
+      #{weightFour,jdbcType=DECIMAL}, #{weightFive,jdbcType=DECIMAL}, #{weightSix,jdbcType=DECIMAL}, 
+      #{weightSven,jdbcType=DECIMAL}, #{weightEight,jdbcType=DECIMAL}, #{weightNine,jdbcType=DECIMAL}, 
+      #{weightTen,jdbcType=DECIMAL}, #{weightEleven,jdbcType=DECIMAL}, #{weightTwelve,jdbcType=DECIMAL}, 
+      #{weightThirteen,jdbcType=DECIMAL})
   </insert>
   <insert id="insertSelective" parameterType="com.sztzjy.trade.entity.TchDigitalTradeWeight">
     insert into tch_digital_trade_weight
@@ -185,6 +208,45 @@
       <if test="weightExperimentalReport != null">
         weight_experimental_report,
       </if>
+      <if test="weightOne != null">
+        weight_one,
+      </if>
+      <if test="weightTwo != null">
+        weight_two,
+      </if>
+      <if test="weightThree != null">
+        weight_three,
+      </if>
+      <if test="weightFour != null">
+        weight_four,
+      </if>
+      <if test="weightFive != null">
+        weight_five,
+      </if>
+      <if test="weightSix != null">
+        weight_six,
+      </if>
+      <if test="weightSven != null">
+        weight_sven,
+      </if>
+      <if test="weightEight != null">
+        weight_eight,
+      </if>
+      <if test="weightNine != null">
+        weight_nine,
+      </if>
+      <if test="weightTen != null">
+        weight_ten,
+      </if>
+      <if test="weightEleven != null">
+        weight_eleven,
+      </if>
+      <if test="weightTwelve != null">
+        weight_twelve,
+      </if>
+      <if test="weightThirteen != null">
+        weight_thirteen,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="schoolId != null">
@@ -235,6 +297,45 @@
       <if test="weightExperimentalReport != null">
         #{weightExperimentalReport,jdbcType=DECIMAL},
       </if>
+      <if test="weightOne != null">
+        #{weightOne,jdbcType=DECIMAL},
+      </if>
+      <if test="weightTwo != null">
+        #{weightTwo,jdbcType=DECIMAL},
+      </if>
+      <if test="weightThree != null">
+        #{weightThree,jdbcType=DECIMAL},
+      </if>
+      <if test="weightFour != null">
+        #{weightFour,jdbcType=DECIMAL},
+      </if>
+      <if test="weightFive != null">
+        #{weightFive,jdbcType=DECIMAL},
+      </if>
+      <if test="weightSix != null">
+        #{weightSix,jdbcType=DECIMAL},
+      </if>
+      <if test="weightSven != null">
+        #{weightSven,jdbcType=DECIMAL},
+      </if>
+      <if test="weightEight != null">
+        #{weightEight,jdbcType=DECIMAL},
+      </if>
+      <if test="weightNine != null">
+        #{weightNine,jdbcType=DECIMAL},
+      </if>
+      <if test="weightTen != null">
+        #{weightTen,jdbcType=DECIMAL},
+      </if>
+      <if test="weightEleven != null">
+        #{weightEleven,jdbcType=DECIMAL},
+      </if>
+      <if test="weightTwelve != null">
+        #{weightTwelve,jdbcType=DECIMAL},
+      </if>
+      <if test="weightThirteen != null">
+        #{weightThirteen,jdbcType=DECIMAL},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.sztzjy.trade.entity.TchDigitalTradeWeightExample" resultType="java.lang.Long">
@@ -294,6 +395,45 @@
       <if test="record.weightExperimentalReport != null">
         weight_experimental_report = #{record.weightExperimentalReport,jdbcType=DECIMAL},
       </if>
+      <if test="record.weightOne != null">
+        weight_one = #{record.weightOne,jdbcType=DECIMAL},
+      </if>
+      <if test="record.weightTwo != null">
+        weight_two = #{record.weightTwo,jdbcType=DECIMAL},
+      </if>
+      <if test="record.weightThree != null">
+        weight_three = #{record.weightThree,jdbcType=DECIMAL},
+      </if>
+      <if test="record.weightFour != null">
+        weight_four = #{record.weightFour,jdbcType=DECIMAL},
+      </if>
+      <if test="record.weightFive != null">
+        weight_five = #{record.weightFive,jdbcType=DECIMAL},
+      </if>
+      <if test="record.weightSix != null">
+        weight_six = #{record.weightSix,jdbcType=DECIMAL},
+      </if>
+      <if test="record.weightSven != null">
+        weight_sven = #{record.weightSven,jdbcType=DECIMAL},
+      </if>
+      <if test="record.weightEight != null">
+        weight_eight = #{record.weightEight,jdbcType=DECIMAL},
+      </if>
+      <if test="record.weightNine != null">
+        weight_nine = #{record.weightNine,jdbcType=DECIMAL},
+      </if>
+      <if test="record.weightTen != null">
+        weight_ten = #{record.weightTen,jdbcType=DECIMAL},
+      </if>
+      <if test="record.weightEleven != null">
+        weight_eleven = #{record.weightEleven,jdbcType=DECIMAL},
+      </if>
+      <if test="record.weightTwelve != null">
+        weight_twelve = #{record.weightTwelve,jdbcType=DECIMAL},
+      </if>
+      <if test="record.weightThirteen != null">
+        weight_thirteen = #{record.weightThirteen,jdbcType=DECIMAL},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -316,7 +456,20 @@
       weight_study_resource = #{record.weightStudyResource,jdbcType=DECIMAL},
       weight_study_evaluation = #{record.weightStudyEvaluation,jdbcType=DECIMAL},
       weight_experimental_training = #{record.weightExperimentalTraining,jdbcType=DECIMAL},
-      weight_experimental_report = #{record.weightExperimentalReport,jdbcType=DECIMAL}
+      weight_experimental_report = #{record.weightExperimentalReport,jdbcType=DECIMAL},
+      weight_one = #{record.weightOne,jdbcType=DECIMAL},
+      weight_two = #{record.weightTwo,jdbcType=DECIMAL},
+      weight_three = #{record.weightThree,jdbcType=DECIMAL},
+      weight_four = #{record.weightFour,jdbcType=DECIMAL},
+      weight_five = #{record.weightFive,jdbcType=DECIMAL},
+      weight_six = #{record.weightSix,jdbcType=DECIMAL},
+      weight_sven = #{record.weightSven,jdbcType=DECIMAL},
+      weight_eight = #{record.weightEight,jdbcType=DECIMAL},
+      weight_nine = #{record.weightNine,jdbcType=DECIMAL},
+      weight_ten = #{record.weightTen,jdbcType=DECIMAL},
+      weight_eleven = #{record.weightEleven,jdbcType=DECIMAL},
+      weight_twelve = #{record.weightTwelve,jdbcType=DECIMAL},
+      weight_thirteen = #{record.weightThirteen,jdbcType=DECIMAL}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -369,6 +522,45 @@
       <if test="weightExperimentalReport != null">
         weight_experimental_report = #{weightExperimentalReport,jdbcType=DECIMAL},
       </if>
+      <if test="weightOne != null">
+        weight_one = #{weightOne,jdbcType=DECIMAL},
+      </if>
+      <if test="weightTwo != null">
+        weight_two = #{weightTwo,jdbcType=DECIMAL},
+      </if>
+      <if test="weightThree != null">
+        weight_three = #{weightThree,jdbcType=DECIMAL},
+      </if>
+      <if test="weightFour != null">
+        weight_four = #{weightFour,jdbcType=DECIMAL},
+      </if>
+      <if test="weightFive != null">
+        weight_five = #{weightFive,jdbcType=DECIMAL},
+      </if>
+      <if test="weightSix != null">
+        weight_six = #{weightSix,jdbcType=DECIMAL},
+      </if>
+      <if test="weightSven != null">
+        weight_sven = #{weightSven,jdbcType=DECIMAL},
+      </if>
+      <if test="weightEight != null">
+        weight_eight = #{weightEight,jdbcType=DECIMAL},
+      </if>
+      <if test="weightNine != null">
+        weight_nine = #{weightNine,jdbcType=DECIMAL},
+      </if>
+      <if test="weightTen != null">
+        weight_ten = #{weightTen,jdbcType=DECIMAL},
+      </if>
+      <if test="weightEleven != null">
+        weight_eleven = #{weightEleven,jdbcType=DECIMAL},
+      </if>
+      <if test="weightTwelve != null">
+        weight_twelve = #{weightTwelve,jdbcType=DECIMAL},
+      </if>
+      <if test="weightThirteen != null">
+        weight_thirteen = #{weightThirteen,jdbcType=DECIMAL},
+      </if>
     </set>
     where school_id = #{schoolId,jdbcType=VARCHAR}
   </update>
@@ -388,7 +580,20 @@
       weight_study_resource = #{weightStudyResource,jdbcType=DECIMAL},
       weight_study_evaluation = #{weightStudyEvaluation,jdbcType=DECIMAL},
       weight_experimental_training = #{weightExperimentalTraining,jdbcType=DECIMAL},
-      weight_experimental_report = #{weightExperimentalReport,jdbcType=DECIMAL}
+      weight_experimental_report = #{weightExperimentalReport,jdbcType=DECIMAL},
+      weight_one = #{weightOne,jdbcType=DECIMAL},
+      weight_two = #{weightTwo,jdbcType=DECIMAL},
+      weight_three = #{weightThree,jdbcType=DECIMAL},
+      weight_four = #{weightFour,jdbcType=DECIMAL},
+      weight_five = #{weightFive,jdbcType=DECIMAL},
+      weight_six = #{weightSix,jdbcType=DECIMAL},
+      weight_sven = #{weightSven,jdbcType=DECIMAL},
+      weight_eight = #{weightEight,jdbcType=DECIMAL},
+      weight_nine = #{weightNine,jdbcType=DECIMAL},
+      weight_ten = #{weightTen,jdbcType=DECIMAL},
+      weight_eleven = #{weightEleven,jdbcType=DECIMAL},
+      weight_twelve = #{weightTwelve,jdbcType=DECIMAL},
+      weight_thirteen = #{weightThirteen,jdbcType=DECIMAL}
     where school_id = #{schoolId,jdbcType=VARCHAR}
   </update>
 </mapper>