From d5b93f8024c3eeec27254dede5f9205fc999577c Mon Sep 17 00:00:00 2001 From: xiaoCJ <406612557@qq.com> Date: Tue, 30 Jul 2024 17:04:57 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=81=E5=B8=88=E7=AB=AF=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/stu/StuScoreController.java | 12 +++++++----- .../controller/tea/TeaGradeManageController.java | 9 +++++---- .../entity/tea_dto/TrainingReportDto.java | 2 ++ 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/sztzjy/financial_bigdata/controller/stu/StuScoreController.java b/src/main/java/com/sztzjy/financial_bigdata/controller/stu/StuScoreController.java index 4a4f6a8..3c86ada 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/controller/stu/StuScoreController.java +++ b/src/main/java/com/sztzjy/financial_bigdata/controller/stu/StuScoreController.java @@ -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> getReportByUserId(@RequestParam String userId) { + public ResultEntity> getReportByUserId(@RequestParam String userId, + @RequestParam String systemOwner) { TrainingReportExample trainingReportExample = new TrainingReportExample(); - trainingReportExample.createCriteria().andUserIdEqualTo(userId); + trainingReportExample.createCriteria().andUserIdEqualTo(userId).andSystemOwnerEqualTo(systemOwner); List 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 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); diff --git a/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaGradeManageController.java b/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaGradeManageController.java index bb6d529..bd1f414 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaGradeManageController.java +++ b/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaGradeManageController.java @@ -78,9 +78,9 @@ public class TeaGradeManageController { public ResultEntity> getExamInfo(@RequestParam Integer index, @RequestParam Integer size, @ApiParam("ManyAnswer为考试时间，JudgeAnswer为发布人") @RequestParam String schoolId, - @ApiParam("系统名称")@RequestParam String systemOwner) { + @ApiParam("系统名称") @RequestParam String systemOwner) { - List teaExamManages = teaExamManageMapper.selectBySchoolIdAndSystemOwner(schoolId,systemOwner); + List teaExamManages = teaExamManageMapper.selectBySchoolIdAndSystemOwner(schoolId, systemOwner); if (teaExamManages.isEmpty()) { return null; } @@ -457,10 +457,11 @@ public class TeaGradeManageController { @ApiOperation("练习模式--实训报告展示") public ResultEntity> 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 list = new AstList(); List trainingReports = reportMapper.selectByExampleWithBLOBs(reportExample); if (!trainingReports.isEmpty()) { diff --git a/src/main/java/com/sztzjy/financial_bigdata/entity/tea_dto/TrainingReportDto.java b/src/main/java/com/sztzjy/financial_bigdata/entity/tea_dto/TrainingReportDto.java index b5b4f73..f50a68c 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/entity/tea_dto/TrainingReportDto.java +++ b/src/main/java/com/sztzjy/financial_bigdata/entity/tea_dto/TrainingReportDto.java @@ -58,4 +58,6 @@ public class TrainingReportDto { @ApiModelProperty("教师评语") private String teacherComment; + @ApiModelProperty("归属系统") + private String systemOwner; } \ No newline at end of file