新增成绩相关接口

master
yz
parent 90cd870ea8
commit 64dd81a874

@ -0,0 +1,126 @@
package com.sztzjy.money_management.controller;
import cn.hutool.core.util.IdUtil;
import com.sztzjy.money_management.annotation.AnonymousAccess;
import com.sztzjy.money_management.entity.*;
import com.sztzjy.money_management.entity.dto.StuTrainingDto;
import com.sztzjy.money_management.mapper.StuTrainingMapper;
import com.sztzjy.money_management.mapper.StudentScoreWeightMapper;
import com.sztzjy.money_management.mapper.TrainingReportMapper;
import com.sztzjy.money_management.util.ResultEntity;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal;
import java.util.List;
@RestController
@Api(tags = "成绩相关")
@RequestMapping("api/ResourceController")
public class GradeController {
@Autowired
StuTrainingMapper trainingMapper;
@Autowired
StudentScoreWeightMapper studentScoreWeightMapper;
@Autowired
TrainingReportMapper trainingReportMapper;
@AnonymousAccess
@ApiOperation("得分情况展示")
@PostMapping("getScoreInfo")
public ResultEntity<StuTrainingDto> getScoreInfo(@RequestParam String userId,
@RequestParam String chapterId,
@RequestParam String schoolId) {
StudentScoreWeight studentScoreWeight=new StudentScoreWeight();
//先根据schoolID和chapterId查出学习成绩权重表数据
StudentScoreWeightExample studentScoreWeightExample = new StudentScoreWeightExample();
studentScoreWeightExample.createCriteria().andSchoolIdEqualTo(schoolId).andChapterIdEqualTo(chapterId);
List<StudentScoreWeight> studentScoreWeights = studentScoreWeightMapper.selectByExample(studentScoreWeightExample);
if(studentScoreWeights.isEmpty()){ //设置默认权重与计分规则
//计分规则
studentScoreWeight.setSummaryOfKnowledgeScore(BigDecimal.valueOf(20));
studentScoreWeight.setResourceLearningScore(BigDecimal.valueOf(2));
studentScoreWeight.setLearningAssessmentScore(BigDecimal.valueOf(10));
studentScoreWeight.setExperimentalTrainingScore(BigDecimal.valueOf(20));
//权重
studentScoreWeight.setSummaryOfKnowledgeWeight(BigDecimal.valueOf(0.2));
studentScoreWeight.setResourceLearningWeight(BigDecimal.valueOf(0.2));
studentScoreWeight.setLearningAssessmentWeight(BigDecimal.valueOf(0.2));
studentScoreWeight.setExperimentalTrainingWeight(BigDecimal.valueOf(0.2));
studentScoreWeight.setReportWeight(BigDecimal.valueOf(0.2));
}else {
studentScoreWeight = studentScoreWeights.get(0);
}
//再根据userid和chapterId查出学生实训表中的数据
StuTrainingExample stuTrainingExample = new StuTrainingExample();
stuTrainingExample.createCriteria().andUserIdEqualTo(userId).andChapterIdEqualTo(chapterId);
List<StuTraining> stuTrainings = trainingMapper.selectByExample(stuTrainingExample);
StuTraining stuTraining = stuTrainings.get(0);
//进行整合
StuTrainingDto stuTrainingDto = new StuTrainingDto();
//设置返回对象计分规则
stuTrainingDto.setKnowledgeSummaryDefaultRule(studentScoreWeight.getSummaryOfKnowledgeScore());
stuTrainingDto.setResourceLearningDefaultRule(studentScoreWeight.getResourceLearningScore());
stuTrainingDto.setLearningEvalDefaultRule(studentScoreWeight.getLearningAssessmentScore());
stuTrainingDto.setExpTrainingDefautRule(studentScoreWeight.getExperimentalTrainingScore());
//设置返回对象权重
stuTrainingDto.setKnowledgeSummaryWeight(studentScoreWeight.getSummaryOfKnowledgeWeight());
stuTrainingDto.setResourceLearningWeight(studentScoreWeight.getResourceLearningWeight());
stuTrainingDto.setLearningEvalWeight(studentScoreWeight.getLearningAssessmentWeight());
stuTrainingDto.setExpTrainingWeight(studentScoreWeight.getExperimentalTrainingWeight());
stuTrainingDto.setReportWeight(studentScoreWeight.getReportWeight());
//设置返回对象完成情况
stuTrainingDto.setKnowledgeSummaryCompleteStatus(stuTraining.getKnowledgeSummaryCompleteStatus());
stuTrainingDto.setResourceLearningCompleteStatus(stuTraining.getResourceLearningCompleteStatus());
stuTrainingDto.setLearningEvalCompleteStatus(stuTraining.getLearningEvalCompleteStatus());
stuTrainingDto.setExpTrainingCompleteStatus(stuTraining.getExpTrainingCompleteStatus());
TrainingReportExample trainingReportExample = new TrainingReportExample();
trainingReportExample.createCriteria().andChapterIdEqualTo(chapterId).andUserIdEqualTo(userId);
//设置返回对象得分
stuTrainingDto.setKnowledgeSummaryScore(stuTraining.getKnowledgeSummaryScore());
stuTrainingDto.setResourceLearningScore(stuTraining.getResourceLearningScore());
stuTrainingDto.setLearningEvalScore(stuTraining.getLearningEvalScore());
stuTrainingDto.setCaseStuScore(stuTraining.getExpTrainingScore());
//设置实验报告情况及得分
List<TrainingReport> trainingReports = trainingReportMapper.selectByExample(trainingReportExample);
if(trainingReports.isEmpty()){
stuTrainingDto.setReportCompleteStatus("未提交");
stuTrainingDto.setReportScore(null);
}else {
stuTrainingDto.setReportCompleteStatus("已提交");
stuTrainingDto.setReportScore(trainingReports.get(0).getTeacherScore());
}
return new ResultEntity<>(HttpStatus.OK, "得分情况展示",stuTrainingDto);
}
@GetMapping("/returnTrainingId")
@ApiOperation("第一次进入时创建学生实训对象")
@AnonymousAccess
public ResultEntity<String> returnTrainingId(@RequestParam String chapterId,
@RequestParam String userId) {
StuTrainingExample stuTrainingExample = new StuTrainingExample();
stuTrainingExample.createCriteria().andChapterIdEqualTo(chapterId).andUserIdEqualTo(userId);
List<StuTrainingWithBLOBs> list = trainingMapper.selectByExampleWithBLOBs(stuTrainingExample);
if (list.isEmpty()) { //该用户第一次进入这个章节的知识概要 新增
StuTrainingWithBLOBs stuTraining = new StuTrainingWithBLOBs();
String uuid = IdUtil.randomUUID();
stuTraining.setTrainingId(uuid);
stuTraining.setChapterId(chapterId);
stuTraining.setUserId(userId);
trainingMapper.insert(stuTraining);
return new ResultEntity<>(uuid);
} else {
return new ResultEntity<>(list.get(0).getTrainingId());
}
}
}

@ -1,26 +1,41 @@
package com.sztzjy.money_management.controller;
import cn.hutool.core.util.IdUtil;
import com.sztzjy.money_management.annotation.AnonymousAccess;
import com.sztzjy.money_management.entity.KnowledgeSummary;
import com.sztzjy.money_management.entity.StuTrainingWithBLOBs;
import com.sztzjy.money_management.mapper.KnowledgeSummaryMapper;
import com.sztzjy.money_management.mapper.StuTrainingMapper;
import com.sztzjy.money_management.util.PdfUtil;
import com.sztzjy.money_management.util.ResultEntity;
import com.sztzjy.money_management.util.file.IFileUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.*;
import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
@RestController
@Api(tags = "知识概要相关")
@Api(tags = "知识概要、知识笔记相关")
@RequestMapping("api/KnowledgeNoteController")
public class KnowledgeNoteController {
@Autowired
KnowledgeSummaryMapper knowledgeSummaryMapper;
@Autowired
StuTrainingMapper trainingMapper;
@Autowired
private IFileUtil fileUtil;
@Value("${file.path}")
private String filePath;
//知识概要新增、编辑
@AnonymousAccess
@ -43,12 +58,49 @@ public class KnowledgeNoteController {
//知识概要查询
@AnonymousAccess
@ApiOperation("***知识概要-获取页面")
@ApiOperation("知识概要-查询")
@PostMapping("getSysKnowledgeSummaryByChapterId")
public ResultEntity<KnowledgeSummary> getSysKnowledgeSummaryByChapterId(@RequestParam String chapterId) {
KnowledgeSummary knowledgeSummary = knowledgeSummaryMapper.selectByPrimaryKey(chapterId);
return new ResultEntity<>(knowledgeSummary);
}
@AnonymousAccess
@ApiOperation("知识笔记-保存")
@PostMapping("saveNote")
public ResultEntity<String> saveNote(@RequestParam String knowledgeNote,@RequestParam String trainingId) {
StuTrainingWithBLOBs stuTrainingWithBLOBs = trainingMapper.selectByPrimaryKey(trainingId);
if (StringUtils.isNotBlank(knowledgeNote)) {
stuTrainingWithBLOBs.setKnowledgeNote(knowledgeNote);
trainingMapper.updateByPrimaryKeyWithBLOBs(stuTrainingWithBLOBs);
return new ResultEntity<>(HttpStatus.OK, "保存成功!");
} else {
return new ResultEntity<>(HttpStatus.BAD_REQUEST, "请输入内容后保存!");
}
}
@AnonymousAccess
@ApiOperation("知识笔记-导出")
@GetMapping("exportNote")
public void export(HttpServletResponse response, String context) {
try {
String s = IdUtil.simpleUUID();
FileOutputStream fileOutputStream = new FileOutputStream(filePath + "/pdf/" + s + ".pdf");
fileUtil.download(response, s + ".pdf", "/pdf/" + s + ".pdf");
PdfUtil.htmlStringToPdf(context, fileOutputStream);
} catch (FileNotFoundException e) {
throw new RuntimeException(e);
}
}
@AnonymousAccess
@ApiOperation("知识笔记-回显")
@PostMapping("getKnowledgeNote")
public ResultEntity<String> getKnowledgeNote(@RequestParam String trainingId) {
StuTrainingWithBLOBs stuTrainingWithBLOBs = trainingMapper.selectByPrimaryKey(trainingId);
return new ResultEntity<>(stuTrainingWithBLOBs.getKnowledgeNote());
}
}

@ -30,6 +30,8 @@ public class ProductCenter {
InsuranceProMapper insuranceProMapper;
@Autowired
p2pProductMapper p2pProductMapper;
@Autowired
ObjectiveQuestionMapper objectiveQuestionMapper;
@PostMapping("selectFundProduct")
@ApiOperation("基金产品查询")

@ -0,0 +1,110 @@
//package com.sztzjy.money_management.controller;
//
//import cn.hutool.core.util.IdUtil;
//import com.sztzjy.money_management.annotation.AnonymousAccess;
//import com.sztzjy.money_management.entity.StuTrainingWithBLOBs;
//import com.sztzjy.money_management.entity.TrainingReportExample;
//import com.sztzjy.money_management.util.ResultEntity;
//import io.swagger.annotations.Api;
//import io.swagger.annotations.ApiOperation;
//import io.swagger.annotations.ApiParam;
//import org.springframework.http.HttpStatus;
//import org.springframework.util.Assert;
//import org.springframework.web.bind.annotation.*;
//import org.springframework.web.multipart.MultipartFile;
//
//import javax.servlet.http.HttpServletResponse;
//import java.math.BigDecimal;
//import java.util.Date;
//import java.util.List;
//
//@RestController
//@Api(tags = "实验报告相关")
//@RequestMapping("api/ResourceController")
//public class TrainingReport {
// @AnonymousAccess
// @ApiOperation("实验报告展示")
// @PostMapping("getReportByUserId")
// public ResultEntity<List<TrainingReport>> getReportByUserId(@RequestParam String userId,
// @RequestParam String systemOwner) {
// TrainingReportExample trainingReportExample = new TrainingReportExample();
// trainingReportExample.createCriteria().andUserIdEqualTo(userId).andSystemOwnerEqualTo(systemOwner);
// List<TrainingReport> trainingReports = trainingReportMapper.selectByExampleWithBLOBs(trainingReportExample);
// return new ResultEntity<>(trainingReports);
// }
//
// @AnonymousAccess
// @PostMapping("uploadReport")
// @ApiOperation("上传报告")
// public ResultEntity<String> uploadReport(@RequestPart(name = "file") MultipartFile file,
// @ApiParam("文件名称") @RequestParam String fileName,
// @RequestParam String userId,
// @RequestParam String trainingId,
// @ApiParam("章节ID") @RequestParam String chapterId,
// @ApiParam("章节名称") @RequestParam String chapterName,
// @RequestParam String schoolId,
// @RequestParam String systemOwner) {
// int size = (int) file.getSize() / (1024 * 1024); //拿到MB为单位的大小
// String originalFilename = file.getOriginalFilename();
// assert originalFilename != null;
// String fileExtension = originalFilename.substring(originalFilename.lastIndexOf(".")).toLowerCase();
// if (!fileExtension.equals(".pdf") && !fileExtension.equals(".doc") && !fileExtension.equals(".docx")) {
// return new ResultEntity<>(HttpStatus.BAD_REQUEST, "文件必须为word或pdf");
// }
// //老师评分后不允许上传
// TrainingReportExample example = new TrainingReportExample();
// example.createCriteria().andSchoolIdEqualTo(schoolId).andUserIdEqualTo(userId).andChapterIdEqualTo(chapterId).andSystemOwnerEqualTo(systemOwner);
// List<TrainingReport> trainingReports = trainingReportMapper.selectByExampleWithBLOBs(example);
// if (!trainingReports.isEmpty()) { //上传过
// TrainingReport trainingReport = trainingReports.get(0);
// BigDecimal teacherScore = trainingReport.getTeacherScore();
// if (teacherScore != null) { //老师评分过
// return new ResultEntity<>(HttpStatus.BAD_REQUEST, "老师已评分,无法重新上传!");
// } else { //老师没评分 多次上传 直接覆盖
// String filePath = fileUtil.upload(file);
// trainingReport.setFilePath(filePath);
// trainingReport.setUploadTime(new Date());
// trainingReport.setReportName(fileName);
// trainingReport.setReportSize(size);
// trainingReportMapper.updateByPrimaryKeyWithBLOBs(trainingReport);
// return new ResultEntity<>(HttpStatus.BAD_REQUEST, "重新上传成功!");
// }
// } else { //第一次上传
// String filePath = fileUtil.upload(file);
// TrainingReport trainingReport = new TrainingReport();
// trainingReport.setReportId(IdUtil.randomUUID());
// trainingReport.setFilePath(filePath);
// trainingReport.setUploadTime(new Date());
// trainingReport.setReportName(fileName);
// trainingReport.setChapterId(chapterId);
// trainingReport.setChapterName(chapterName);
// trainingReport.setUserId(userId);
// trainingReport.setSchoolId(schoolId);
// trainingReport.setReportSize(size);
// trainingReport.setSystemOwner(systemOwner);
// StuTrainingWithBLOBs stuTrainingWithBLOBs = stuTrainingMapper.selectByPrimaryKey(trainingId);
// stuTrainingWithBLOBs.setReportId(trainingReport.getReportId()); // 第一次上传时设置实训表的报告ID
// trainingReportMapper.insert(trainingReport);
// return new ResultEntity<>(HttpStatus.OK, "上传成功!");
// }
// }
//
//
// @AnonymousAccess
// @ApiOperation("实验报告下载")
// @GetMapping("downloadReport")
// public void downloadReport(@RequestParam String reportId, HttpServletResponse response) {
// TrainingReport trainingReport = trainingReportMapper.selectByPrimaryKey(reportId);
// Assert.isTrue(trainingReport != null && trainingReport.getFilePath() != null, "报告不存在");
// fileUtil.download(response, trainingReport.getReportName(), trainingReport.getFilePath());
// }
//
//
// @AnonymousAccess
// @ApiOperation("实验报告查看评语")
// @PostMapping("getTeacherCommentById")
// public ResultEntity<String> getTeacherCommentById(@RequestParam String reportId) {
// TrainingReport trainingReport = trainingReportMapper.selectByPrimaryKey(reportId);
// return new ResultEntity<>(trainingReport.getTeacherComment());
// }
//}

@ -38,16 +38,16 @@ public class StuTraining {
private BigDecimal expTrainingScore;
@ApiModelProperty("知识概要完成情况")
private Boolean knowledgeSummaryCompleteStatus;
private Integer knowledgeSummaryCompleteStatus;
@ApiModelProperty("资源学习完成情况 0未完成, 1完成")
private Boolean resourceLearningCompleteStatus;
@ApiModelProperty("资源学习完成情况")
private Integer resourceLearningCompleteStatus;
@ApiModelProperty("学习评测完成情况")
private Boolean learningEvalCompleteStatus;
private Integer learningEvalCompleteStatus;
@ApiModelProperty("实验实训完成情况")
private Boolean expTrainingCompleteStatus;
private Integer expTrainingCompleteStatus;
@ApiModelProperty("报告ID")
private String reportId;
@ -124,35 +124,35 @@ public class StuTraining {
this.expTrainingScore = expTrainingScore;
}
public Boolean getKnowledgeSummaryCompleteStatus() {
public Integer getKnowledgeSummaryCompleteStatus() {
return knowledgeSummaryCompleteStatus;
}
public void setKnowledgeSummaryCompleteStatus(Boolean knowledgeSummaryCompleteStatus) {
public void setKnowledgeSummaryCompleteStatus(Integer knowledgeSummaryCompleteStatus) {
this.knowledgeSummaryCompleteStatus = knowledgeSummaryCompleteStatus;
}
public Boolean getResourceLearningCompleteStatus() {
public Integer getResourceLearningCompleteStatus() {
return resourceLearningCompleteStatus;
}
public void setResourceLearningCompleteStatus(Boolean resourceLearningCompleteStatus) {
public void setResourceLearningCompleteStatus(Integer resourceLearningCompleteStatus) {
this.resourceLearningCompleteStatus = resourceLearningCompleteStatus;
}
public Boolean getLearningEvalCompleteStatus() {
public Integer getLearningEvalCompleteStatus() {
return learningEvalCompleteStatus;
}
public void setLearningEvalCompleteStatus(Boolean learningEvalCompleteStatus) {
public void setLearningEvalCompleteStatus(Integer learningEvalCompleteStatus) {
this.learningEvalCompleteStatus = learningEvalCompleteStatus;
}
public Boolean getExpTrainingCompleteStatus() {
public Integer getExpTrainingCompleteStatus() {
return expTrainingCompleteStatus;
}
public void setExpTrainingCompleteStatus(Boolean expTrainingCompleteStatus) {
public void setExpTrainingCompleteStatus(Integer expTrainingCompleteStatus) {
this.expTrainingCompleteStatus = expTrainingCompleteStatus;
}

@ -695,52 +695,52 @@ public class StuTrainingExample {
return (Criteria) this;
}
public Criteria andKnowledgeSummaryCompleteStatusEqualTo(Boolean value) {
public Criteria andKnowledgeSummaryCompleteStatusEqualTo(Integer value) {
addCriterion("knowledge_summary_complete_status =", value, "knowledgeSummaryCompleteStatus");
return (Criteria) this;
}
public Criteria andKnowledgeSummaryCompleteStatusNotEqualTo(Boolean value) {
public Criteria andKnowledgeSummaryCompleteStatusNotEqualTo(Integer value) {
addCriterion("knowledge_summary_complete_status <>", value, "knowledgeSummaryCompleteStatus");
return (Criteria) this;
}
public Criteria andKnowledgeSummaryCompleteStatusGreaterThan(Boolean value) {
public Criteria andKnowledgeSummaryCompleteStatusGreaterThan(Integer value) {
addCriterion("knowledge_summary_complete_status >", value, "knowledgeSummaryCompleteStatus");
return (Criteria) this;
}
public Criteria andKnowledgeSummaryCompleteStatusGreaterThanOrEqualTo(Boolean value) {
public Criteria andKnowledgeSummaryCompleteStatusGreaterThanOrEqualTo(Integer value) {
addCriterion("knowledge_summary_complete_status >=", value, "knowledgeSummaryCompleteStatus");
return (Criteria) this;
}
public Criteria andKnowledgeSummaryCompleteStatusLessThan(Boolean value) {
public Criteria andKnowledgeSummaryCompleteStatusLessThan(Integer value) {
addCriterion("knowledge_summary_complete_status <", value, "knowledgeSummaryCompleteStatus");
return (Criteria) this;
}
public Criteria andKnowledgeSummaryCompleteStatusLessThanOrEqualTo(Boolean value) {
public Criteria andKnowledgeSummaryCompleteStatusLessThanOrEqualTo(Integer value) {
addCriterion("knowledge_summary_complete_status <=", value, "knowledgeSummaryCompleteStatus");
return (Criteria) this;
}
public Criteria andKnowledgeSummaryCompleteStatusIn(List<Boolean> values) {
public Criteria andKnowledgeSummaryCompleteStatusIn(List<Integer> values) {
addCriterion("knowledge_summary_complete_status in", values, "knowledgeSummaryCompleteStatus");
return (Criteria) this;
}
public Criteria andKnowledgeSummaryCompleteStatusNotIn(List<Boolean> values) {
public Criteria andKnowledgeSummaryCompleteStatusNotIn(List<Integer> values) {
addCriterion("knowledge_summary_complete_status not in", values, "knowledgeSummaryCompleteStatus");
return (Criteria) this;
}
public Criteria andKnowledgeSummaryCompleteStatusBetween(Boolean value1, Boolean value2) {
public Criteria andKnowledgeSummaryCompleteStatusBetween(Integer value1, Integer value2) {
addCriterion("knowledge_summary_complete_status between", value1, value2, "knowledgeSummaryCompleteStatus");
return (Criteria) this;
}
public Criteria andKnowledgeSummaryCompleteStatusNotBetween(Boolean value1, Boolean value2) {
public Criteria andKnowledgeSummaryCompleteStatusNotBetween(Integer value1, Integer value2) {
addCriterion("knowledge_summary_complete_status not between", value1, value2, "knowledgeSummaryCompleteStatus");
return (Criteria) this;
}
@ -755,52 +755,52 @@ public class StuTrainingExample {
return (Criteria) this;
}
public Criteria andResourceLearningCompleteStatusEqualTo(Boolean value) {
public Criteria andResourceLearningCompleteStatusEqualTo(Integer value) {
addCriterion("resource_learning_complete_status =", value, "resourceLearningCompleteStatus");
return (Criteria) this;
}
public Criteria andResourceLearningCompleteStatusNotEqualTo(Boolean value) {
public Criteria andResourceLearningCompleteStatusNotEqualTo(Integer value) {
addCriterion("resource_learning_complete_status <>", value, "resourceLearningCompleteStatus");
return (Criteria) this;
}
public Criteria andResourceLearningCompleteStatusGreaterThan(Boolean value) {
public Criteria andResourceLearningCompleteStatusGreaterThan(Integer value) {
addCriterion("resource_learning_complete_status >", value, "resourceLearningCompleteStatus");
return (Criteria) this;
}
public Criteria andResourceLearningCompleteStatusGreaterThanOrEqualTo(Boolean value) {
public Criteria andResourceLearningCompleteStatusGreaterThanOrEqualTo(Integer value) {
addCriterion("resource_learning_complete_status >=", value, "resourceLearningCompleteStatus");
return (Criteria) this;
}
public Criteria andResourceLearningCompleteStatusLessThan(Boolean value) {
public Criteria andResourceLearningCompleteStatusLessThan(Integer value) {
addCriterion("resource_learning_complete_status <", value, "resourceLearningCompleteStatus");
return (Criteria) this;
}
public Criteria andResourceLearningCompleteStatusLessThanOrEqualTo(Boolean value) {
public Criteria andResourceLearningCompleteStatusLessThanOrEqualTo(Integer value) {
addCriterion("resource_learning_complete_status <=", value, "resourceLearningCompleteStatus");
return (Criteria) this;
}
public Criteria andResourceLearningCompleteStatusIn(List<Boolean> values) {
public Criteria andResourceLearningCompleteStatusIn(List<Integer> values) {
addCriterion("resource_learning_complete_status in", values, "resourceLearningCompleteStatus");
return (Criteria) this;
}
public Criteria andResourceLearningCompleteStatusNotIn(List<Boolean> values) {
public Criteria andResourceLearningCompleteStatusNotIn(List<Integer> values) {
addCriterion("resource_learning_complete_status not in", values, "resourceLearningCompleteStatus");
return (Criteria) this;
}
public Criteria andResourceLearningCompleteStatusBetween(Boolean value1, Boolean value2) {
public Criteria andResourceLearningCompleteStatusBetween(Integer value1, Integer value2) {
addCriterion("resource_learning_complete_status between", value1, value2, "resourceLearningCompleteStatus");
return (Criteria) this;
}
public Criteria andResourceLearningCompleteStatusNotBetween(Boolean value1, Boolean value2) {
public Criteria andResourceLearningCompleteStatusNotBetween(Integer value1, Integer value2) {
addCriterion("resource_learning_complete_status not between", value1, value2, "resourceLearningCompleteStatus");
return (Criteria) this;
}
@ -815,52 +815,52 @@ public class StuTrainingExample {
return (Criteria) this;
}
public Criteria andLearningEvalCompleteStatusEqualTo(Boolean value) {
public Criteria andLearningEvalCompleteStatusEqualTo(Integer value) {
addCriterion("learning_eval_complete_status =", value, "learningEvalCompleteStatus");
return (Criteria) this;
}
public Criteria andLearningEvalCompleteStatusNotEqualTo(Boolean value) {
public Criteria andLearningEvalCompleteStatusNotEqualTo(Integer value) {
addCriterion("learning_eval_complete_status <>", value, "learningEvalCompleteStatus");
return (Criteria) this;
}
public Criteria andLearningEvalCompleteStatusGreaterThan(Boolean value) {
public Criteria andLearningEvalCompleteStatusGreaterThan(Integer value) {
addCriterion("learning_eval_complete_status >", value, "learningEvalCompleteStatus");
return (Criteria) this;
}
public Criteria andLearningEvalCompleteStatusGreaterThanOrEqualTo(Boolean value) {
public Criteria andLearningEvalCompleteStatusGreaterThanOrEqualTo(Integer value) {
addCriterion("learning_eval_complete_status >=", value, "learningEvalCompleteStatus");
return (Criteria) this;
}
public Criteria andLearningEvalCompleteStatusLessThan(Boolean value) {
public Criteria andLearningEvalCompleteStatusLessThan(Integer value) {
addCriterion("learning_eval_complete_status <", value, "learningEvalCompleteStatus");
return (Criteria) this;
}
public Criteria andLearningEvalCompleteStatusLessThanOrEqualTo(Boolean value) {
public Criteria andLearningEvalCompleteStatusLessThanOrEqualTo(Integer value) {
addCriterion("learning_eval_complete_status <=", value, "learningEvalCompleteStatus");
return (Criteria) this;
}
public Criteria andLearningEvalCompleteStatusIn(List<Boolean> values) {
public Criteria andLearningEvalCompleteStatusIn(List<Integer> values) {
addCriterion("learning_eval_complete_status in", values, "learningEvalCompleteStatus");
return (Criteria) this;
}
public Criteria andLearningEvalCompleteStatusNotIn(List<Boolean> values) {
public Criteria andLearningEvalCompleteStatusNotIn(List<Integer> values) {
addCriterion("learning_eval_complete_status not in", values, "learningEvalCompleteStatus");
return (Criteria) this;
}
public Criteria andLearningEvalCompleteStatusBetween(Boolean value1, Boolean value2) {
public Criteria andLearningEvalCompleteStatusBetween(Integer value1, Integer value2) {
addCriterion("learning_eval_complete_status between", value1, value2, "learningEvalCompleteStatus");
return (Criteria) this;
}
public Criteria andLearningEvalCompleteStatusNotBetween(Boolean value1, Boolean value2) {
public Criteria andLearningEvalCompleteStatusNotBetween(Integer value1, Integer value2) {
addCriterion("learning_eval_complete_status not between", value1, value2, "learningEvalCompleteStatus");
return (Criteria) this;
}
@ -875,52 +875,52 @@ public class StuTrainingExample {
return (Criteria) this;
}
public Criteria andExpTrainingCompleteStatusEqualTo(Boolean value) {
public Criteria andExpTrainingCompleteStatusEqualTo(Integer value) {
addCriterion("exp_training_complete_status =", value, "expTrainingCompleteStatus");
return (Criteria) this;
}
public Criteria andExpTrainingCompleteStatusNotEqualTo(Boolean value) {
public Criteria andExpTrainingCompleteStatusNotEqualTo(Integer value) {
addCriterion("exp_training_complete_status <>", value, "expTrainingCompleteStatus");
return (Criteria) this;
}
public Criteria andExpTrainingCompleteStatusGreaterThan(Boolean value) {
public Criteria andExpTrainingCompleteStatusGreaterThan(Integer value) {
addCriterion("exp_training_complete_status >", value, "expTrainingCompleteStatus");
return (Criteria) this;
}
public Criteria andExpTrainingCompleteStatusGreaterThanOrEqualTo(Boolean value) {
public Criteria andExpTrainingCompleteStatusGreaterThanOrEqualTo(Integer value) {
addCriterion("exp_training_complete_status >=", value, "expTrainingCompleteStatus");
return (Criteria) this;
}
public Criteria andExpTrainingCompleteStatusLessThan(Boolean value) {
public Criteria andExpTrainingCompleteStatusLessThan(Integer value) {
addCriterion("exp_training_complete_status <", value, "expTrainingCompleteStatus");
return (Criteria) this;
}
public Criteria andExpTrainingCompleteStatusLessThanOrEqualTo(Boolean value) {
public Criteria andExpTrainingCompleteStatusLessThanOrEqualTo(Integer value) {
addCriterion("exp_training_complete_status <=", value, "expTrainingCompleteStatus");
return (Criteria) this;
}
public Criteria andExpTrainingCompleteStatusIn(List<Boolean> values) {
public Criteria andExpTrainingCompleteStatusIn(List<Integer> values) {
addCriterion("exp_training_complete_status in", values, "expTrainingCompleteStatus");
return (Criteria) this;
}
public Criteria andExpTrainingCompleteStatusNotIn(List<Boolean> values) {
public Criteria andExpTrainingCompleteStatusNotIn(List<Integer> values) {
addCriterion("exp_training_complete_status not in", values, "expTrainingCompleteStatus");
return (Criteria) this;
}
public Criteria andExpTrainingCompleteStatusBetween(Boolean value1, Boolean value2) {
public Criteria andExpTrainingCompleteStatusBetween(Integer value1, Integer value2) {
addCriterion("exp_training_complete_status between", value1, value2, "expTrainingCompleteStatus");
return (Criteria) this;
}
public Criteria andExpTrainingCompleteStatusNotBetween(Boolean value1, Boolean value2) {
public Criteria andExpTrainingCompleteStatusNotBetween(Integer value1, Integer value2) {
addCriterion("exp_training_complete_status not between", value1, value2, "expTrainingCompleteStatus");
return (Criteria) this;
}

@ -0,0 +1,74 @@
package com.sztzjy.money_management.entity.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.math.BigDecimal;
@Data
@NoArgsConstructor
public class StuTrainingDto {
@ApiModelProperty("知识概要默认计分规则")
private BigDecimal knowledgeSummaryDefaultRule;
@ApiModelProperty("资源学习默认计分规则")
private BigDecimal resourceLearningDefaultRule;
@ApiModelProperty("学习测评默认计分规则")
private BigDecimal learningEvalDefaultRule;
@ApiModelProperty("实验实训默认计分规则")
private BigDecimal expTrainingDefautRule;
@ApiModelProperty("知识概要权重")
private BigDecimal knowledgeSummaryWeight;
@ApiModelProperty("资源学习权重")
private BigDecimal resourceLearningWeight;
@ApiModelProperty("学习测评权重")
private BigDecimal learningEvalWeight;
@ApiModelProperty("实验实训权重")
private BigDecimal expTrainingWeight;
@ApiModelProperty("实验报告权重")
private BigDecimal reportWeight;
@ApiModelProperty("知识概要完成情况")
private Integer knowledgeSummaryCompleteStatus;
@ApiModelProperty("资源学习完成情况")
private Integer resourceLearningCompleteStatus;
@ApiModelProperty("学习评测完成情况")
private Integer learningEvalCompleteStatus;
@ApiModelProperty("实验实训完成情况")
private Integer expTrainingCompleteStatus;
@ApiModelProperty("实验报告完成情况")
private String reportCompleteStatus;
@ApiModelProperty("知识概要得分")
private BigDecimal knowledgeSummaryScore;
@ApiModelProperty("资源学习得分")
private BigDecimal resourceLearningScore;
@ApiModelProperty("学习评测得分")
private BigDecimal learningEvalScore;
@ApiModelProperty("案例题学生得分")
private BigDecimal caseStuScore;
@ApiModelProperty("实验报告得分")
private BigDecimal reportScore;
}

@ -11,10 +11,10 @@
<result column="resource_learning_score" jdbcType="DECIMAL" property="resourceLearningScore" />
<result column="learning_eval_score" jdbcType="DECIMAL" property="learningEvalScore" />
<result column="exp_training_score" jdbcType="DECIMAL" property="expTrainingScore" />
<result column="knowledge_summary_complete_status" jdbcType="BIT" property="knowledgeSummaryCompleteStatus" />
<result column="resource_learning_complete_status" jdbcType="BIT" property="resourceLearningCompleteStatus" />
<result column="learning_eval_complete_status" jdbcType="BIT" property="learningEvalCompleteStatus" />
<result column="exp_training_complete_status" jdbcType="BIT" property="expTrainingCompleteStatus" />
<result column="knowledge_summary_complete_status" jdbcType="INTEGER" property="knowledgeSummaryCompleteStatus" />
<result column="resource_learning_complete_status" jdbcType="INTEGER" property="resourceLearningCompleteStatus" />
<result column="learning_eval_complete_status" jdbcType="INTEGER" property="learningEvalCompleteStatus" />
<result column="exp_training_complete_status" jdbcType="INTEGER" property="expTrainingCompleteStatus" />
<result column="report_id" jdbcType="VARCHAR" property="reportId" />
</resultMap>
<resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.sztzjy.money_management.entity.StuTrainingWithBLOBs">
@ -149,9 +149,9 @@
values (#{trainingId,jdbcType=VARCHAR}, #{userId,jdbcType=VARCHAR}, #{chapterId,jdbcType=VARCHAR},
#{chapterName,jdbcType=VARCHAR}, #{trainingTime,jdbcType=DECIMAL}, #{knowledgeSummaryScore,jdbcType=DECIMAL},
#{resourceLearningScore,jdbcType=DECIMAL}, #{learningEvalScore,jdbcType=DECIMAL},
#{expTrainingScore,jdbcType=DECIMAL}, #{knowledgeSummaryCompleteStatus,jdbcType=BIT},
#{resourceLearningCompleteStatus,jdbcType=BIT}, #{learningEvalCompleteStatus,jdbcType=BIT},
#{expTrainingCompleteStatus,jdbcType=BIT}, #{reportId,jdbcType=VARCHAR}, #{learningEvalIdList,jdbcType=LONGVARCHAR},
#{expTrainingScore,jdbcType=DECIMAL}, #{knowledgeSummaryCompleteStatus,jdbcType=INTEGER},
#{resourceLearningCompleteStatus,jdbcType=INTEGER}, #{learningEvalCompleteStatus,jdbcType=INTEGER},
#{expTrainingCompleteStatus,jdbcType=INTEGER}, #{reportId,jdbcType=VARCHAR}, #{learningEvalIdList,jdbcType=LONGVARCHAR},
#{learningEvalAnswer,jdbcType=LONGVARCHAR}, #{knowledgeNote,jdbcType=LONGVARCHAR}
)
</insert>
@ -239,16 +239,16 @@
#{expTrainingScore,jdbcType=DECIMAL},
</if>
<if test="knowledgeSummaryCompleteStatus != null">
#{knowledgeSummaryCompleteStatus,jdbcType=BIT},
#{knowledgeSummaryCompleteStatus,jdbcType=INTEGER},
</if>
<if test="resourceLearningCompleteStatus != null">
#{resourceLearningCompleteStatus,jdbcType=BIT},
#{resourceLearningCompleteStatus,jdbcType=INTEGER},
</if>
<if test="learningEvalCompleteStatus != null">
#{learningEvalCompleteStatus,jdbcType=BIT},
#{learningEvalCompleteStatus,jdbcType=INTEGER},
</if>
<if test="expTrainingCompleteStatus != null">
#{expTrainingCompleteStatus,jdbcType=BIT},
#{expTrainingCompleteStatus,jdbcType=INTEGER},
</if>
<if test="reportId != null">
#{reportId,jdbcType=VARCHAR},
@ -301,16 +301,16 @@
exp_training_score = #{record.expTrainingScore,jdbcType=DECIMAL},
</if>
<if test="record.knowledgeSummaryCompleteStatus != null">
knowledge_summary_complete_status = #{record.knowledgeSummaryCompleteStatus,jdbcType=BIT},
knowledge_summary_complete_status = #{record.knowledgeSummaryCompleteStatus,jdbcType=INTEGER},
</if>
<if test="record.resourceLearningCompleteStatus != null">
resource_learning_complete_status = #{record.resourceLearningCompleteStatus,jdbcType=BIT},
resource_learning_complete_status = #{record.resourceLearningCompleteStatus,jdbcType=INTEGER},
</if>
<if test="record.learningEvalCompleteStatus != null">
learning_eval_complete_status = #{record.learningEvalCompleteStatus,jdbcType=BIT},
learning_eval_complete_status = #{record.learningEvalCompleteStatus,jdbcType=INTEGER},
</if>
<if test="record.expTrainingCompleteStatus != null">
exp_training_complete_status = #{record.expTrainingCompleteStatus,jdbcType=BIT},
exp_training_complete_status = #{record.expTrainingCompleteStatus,jdbcType=INTEGER},
</if>
<if test="record.reportId != null">
report_id = #{record.reportId,jdbcType=VARCHAR},
@ -340,10 +340,10 @@
resource_learning_score = #{record.resourceLearningScore,jdbcType=DECIMAL},
learning_eval_score = #{record.learningEvalScore,jdbcType=DECIMAL},
exp_training_score = #{record.expTrainingScore,jdbcType=DECIMAL},
knowledge_summary_complete_status = #{record.knowledgeSummaryCompleteStatus,jdbcType=BIT},
resource_learning_complete_status = #{record.resourceLearningCompleteStatus,jdbcType=BIT},
learning_eval_complete_status = #{record.learningEvalCompleteStatus,jdbcType=BIT},
exp_training_complete_status = #{record.expTrainingCompleteStatus,jdbcType=BIT},
knowledge_summary_complete_status = #{record.knowledgeSummaryCompleteStatus,jdbcType=INTEGER},
resource_learning_complete_status = #{record.resourceLearningCompleteStatus,jdbcType=INTEGER},
learning_eval_complete_status = #{record.learningEvalCompleteStatus,jdbcType=INTEGER},
exp_training_complete_status = #{record.expTrainingCompleteStatus,jdbcType=INTEGER},
report_id = #{record.reportId,jdbcType=VARCHAR},
learning_eval_id_list = #{record.learningEvalIdList,jdbcType=LONGVARCHAR},
learning_eval_answer = #{record.learningEvalAnswer,jdbcType=LONGVARCHAR},
@ -363,10 +363,10 @@
resource_learning_score = #{record.resourceLearningScore,jdbcType=DECIMAL},
learning_eval_score = #{record.learningEvalScore,jdbcType=DECIMAL},
exp_training_score = #{record.expTrainingScore,jdbcType=DECIMAL},
knowledge_summary_complete_status = #{record.knowledgeSummaryCompleteStatus,jdbcType=BIT},
resource_learning_complete_status = #{record.resourceLearningCompleteStatus,jdbcType=BIT},
learning_eval_complete_status = #{record.learningEvalCompleteStatus,jdbcType=BIT},
exp_training_complete_status = #{record.expTrainingCompleteStatus,jdbcType=BIT},
knowledge_summary_complete_status = #{record.knowledgeSummaryCompleteStatus,jdbcType=INTEGER},
resource_learning_complete_status = #{record.resourceLearningCompleteStatus,jdbcType=INTEGER},
learning_eval_complete_status = #{record.learningEvalCompleteStatus,jdbcType=INTEGER},
exp_training_complete_status = #{record.expTrainingCompleteStatus,jdbcType=INTEGER},
report_id = #{record.reportId,jdbcType=VARCHAR}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
@ -400,16 +400,16 @@
exp_training_score = #{expTrainingScore,jdbcType=DECIMAL},
</if>
<if test="knowledgeSummaryCompleteStatus != null">
knowledge_summary_complete_status = #{knowledgeSummaryCompleteStatus,jdbcType=BIT},
knowledge_summary_complete_status = #{knowledgeSummaryCompleteStatus,jdbcType=INTEGER},
</if>
<if test="resourceLearningCompleteStatus != null">
resource_learning_complete_status = #{resourceLearningCompleteStatus,jdbcType=BIT},
resource_learning_complete_status = #{resourceLearningCompleteStatus,jdbcType=INTEGER},
</if>
<if test="learningEvalCompleteStatus != null">
learning_eval_complete_status = #{learningEvalCompleteStatus,jdbcType=BIT},
learning_eval_complete_status = #{learningEvalCompleteStatus,jdbcType=INTEGER},
</if>
<if test="expTrainingCompleteStatus != null">
exp_training_complete_status = #{expTrainingCompleteStatus,jdbcType=BIT},
exp_training_complete_status = #{expTrainingCompleteStatus,jdbcType=INTEGER},
</if>
<if test="reportId != null">
report_id = #{reportId,jdbcType=VARCHAR},
@ -436,10 +436,10 @@
resource_learning_score = #{resourceLearningScore,jdbcType=DECIMAL},
learning_eval_score = #{learningEvalScore,jdbcType=DECIMAL},
exp_training_score = #{expTrainingScore,jdbcType=DECIMAL},
knowledge_summary_complete_status = #{knowledgeSummaryCompleteStatus,jdbcType=BIT},
resource_learning_complete_status = #{resourceLearningCompleteStatus,jdbcType=BIT},
learning_eval_complete_status = #{learningEvalCompleteStatus,jdbcType=BIT},
exp_training_complete_status = #{expTrainingCompleteStatus,jdbcType=BIT},
knowledge_summary_complete_status = #{knowledgeSummaryCompleteStatus,jdbcType=INTEGER},
resource_learning_complete_status = #{resourceLearningCompleteStatus,jdbcType=INTEGER},
learning_eval_complete_status = #{learningEvalCompleteStatus,jdbcType=INTEGER},
exp_training_complete_status = #{expTrainingCompleteStatus,jdbcType=INTEGER},
report_id = #{reportId,jdbcType=VARCHAR},
learning_eval_id_list = #{learningEvalIdList,jdbcType=LONGVARCHAR},
learning_eval_answer = #{learningEvalAnswer,jdbcType=LONGVARCHAR},
@ -456,10 +456,10 @@
resource_learning_score = #{resourceLearningScore,jdbcType=DECIMAL},
learning_eval_score = #{learningEvalScore,jdbcType=DECIMAL},
exp_training_score = #{expTrainingScore,jdbcType=DECIMAL},
knowledge_summary_complete_status = #{knowledgeSummaryCompleteStatus,jdbcType=BIT},
resource_learning_complete_status = #{resourceLearningCompleteStatus,jdbcType=BIT},
learning_eval_complete_status = #{learningEvalCompleteStatus,jdbcType=BIT},
exp_training_complete_status = #{expTrainingCompleteStatus,jdbcType=BIT},
knowledge_summary_complete_status = #{knowledgeSummaryCompleteStatus,jdbcType=INTEGER},
resource_learning_complete_status = #{resourceLearningCompleteStatus,jdbcType=INTEGER},
learning_eval_complete_status = #{learningEvalCompleteStatus,jdbcType=INTEGER},
exp_training_complete_status = #{expTrainingCompleteStatus,jdbcType=INTEGER},
report_id = #{reportId,jdbcType=VARCHAR}
where training_id = #{trainingId,jdbcType=VARCHAR}
</update>

Loading…
Cancel
Save