老师端新增参数

master
xiaoCJ 8 months ago
parent 5bb8d57c43
commit d5b93f8024

@ -6,7 +6,6 @@ import com.sztzjy.financial_bigdata.entity.*;
import com.sztzjy.financial_bigdata.entity.resource_entity.SysThreeCatalog;
import com.sztzjy.financial_bigdata.entity.stu_dto.StuTrainingDto;
import com.sztzjy.financial_bigdata.mapper.StuTrainingMapper;
import com.sztzjy.financial_bigdata.mapper.SysCourseChapterMapper;
import com.sztzjy.financial_bigdata.mapper.SysWeightMapper;
import com.sztzjy.financial_bigdata.mapper.TrainingReportMapper;
import com.sztzjy.financial_bigdata.resourceCenterAPI.CourseAPI;
@ -91,9 +90,10 @@ public class StuScoreController {
@AnonymousAccess
@ApiOperation("实验报告展示")
@PostMapping("getReportByUserId")
public ResultEntity<List<TrainingReport>> getReportByUserId(@RequestParam String userId) {
public ResultEntity<List<TrainingReport>> getReportByUserId(@RequestParam String userId,
@RequestParam String systemOwner) {
TrainingReportExample trainingReportExample = new TrainingReportExample();
trainingReportExample.createCriteria().andUserIdEqualTo(userId);
trainingReportExample.createCriteria().andUserIdEqualTo(userId).andSystemOwnerEqualTo(systemOwner);
List<TrainingReport> trainingReports = trainingReportMapper.selectByExampleWithBLOBs(trainingReportExample);
return new ResultEntity<>(trainingReports);
}
@ -107,7 +107,8 @@ public class StuScoreController {
@RequestParam String trainingId,
@ApiParam("章节ID") @RequestParam String chapterId,
@ApiParam("章节名称") @RequestParam String chapterName,
@RequestParam String schoolId) {
@RequestParam String schoolId,
@RequestParam String systemOwner) {
int size = (int) file.getSize() / (1024 * 1024); //拿到MB为单位的大小
String originalFilename = file.getOriginalFilename();
assert originalFilename != null;
@ -117,7 +118,7 @@ public class StuScoreController {
}
//老师评分后不允许上传
TrainingReportExample example = new TrainingReportExample();
example.createCriteria().andSchoolIdEqualTo(schoolId).andUserIdEqualTo(userId).andChapterIdEqualTo(chapterId);
example.createCriteria().andSchoolIdEqualTo(schoolId).andUserIdEqualTo(userId).andChapterIdEqualTo(chapterId).andSystemOwnerEqualTo(systemOwner);
List<TrainingReport> trainingReports = trainingReportMapper.selectByExampleWithBLOBs(example);
if (!trainingReports.isEmpty()) { //上传过
TrainingReport trainingReport = trainingReports.get(0);
@ -145,6 +146,7 @@ public class StuScoreController {
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);

@ -78,9 +78,9 @@ public class TeaGradeManageController {
public ResultEntity<PageInfo<TeaExamManageCountDto>> getExamInfo(@RequestParam Integer index,
@RequestParam Integer size,
@ApiParam("ManyAnswer为考试时间JudgeAnswer为发布人") @RequestParam String schoolId,
@ApiParam("系统名称")@RequestParam String systemOwner) {
@ApiParam("系统名称") @RequestParam String systemOwner) {
List<TeaExamManage> teaExamManages = teaExamManageMapper.selectBySchoolIdAndSystemOwner(schoolId,systemOwner);
List<TeaExamManage> teaExamManages = teaExamManageMapper.selectBySchoolIdAndSystemOwner(schoolId, systemOwner);
if (teaExamManages.isEmpty()) {
return null;
}
@ -457,10 +457,11 @@ public class TeaGradeManageController {
@ApiOperation("练习模式--实训报告展示")
public ResultEntity<PageInfo<TrainingReportDto>> getReportBySchoolID(@RequestParam Integer index,
@RequestParam Integer size,
@RequestParam String schoolId) {
@RequestParam String schoolId,
@RequestParam String systemOwner) {
PageHelper.startPage(index, size);
TrainingReportExample reportExample = new TrainingReportExample();
reportExample.createCriteria().andSchoolIdEqualTo(schoolId);
reportExample.createCriteria().andSchoolIdEqualTo(schoolId).andSystemOwnerEqualTo(systemOwner);
List<TrainingReportDto> list = new AstList();
List<TrainingReport> trainingReports = reportMapper.selectByExampleWithBLOBs(reportExample);
if (!trainingReports.isEmpty()) {

@ -58,4 +58,6 @@ public class TrainingReportDto {
@ApiModelProperty("教师评语")
private String teacherComment;
@ApiModelProperty("归属系统")
private String systemOwner;
}
Loading…
Cancel
Save