From 946fcae03e541b0119841d4235dfe39a93714bfd Mon Sep 17 00:00:00 2001 From: xiaoCJ <406612557@qq.com> Date: Tue, 30 Apr 2024 14:05:03 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=E5=92=8Cmapper=20xml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/stu/StuScoreController.java | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 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 0eb23ab..7c88f34 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 @@ -4,7 +4,10 @@ import cn.hutool.core.util.IdUtil; import com.sztzjy.financial_bigdata.annotation.AnonymousAccess; import com.sztzjy.financial_bigdata.entity.*; import com.sztzjy.financial_bigdata.entity.stu_dto.StuTrainingDto; -import com.sztzjy.financial_bigdata.mapper.*; +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.util.ResultEntity; import com.sztzjy.financial_bigdata.util.file.IFileUtil; import io.swagger.annotations.Api; @@ -48,33 +51,31 @@ public class StuScoreController { public ResultEntity getScoreInfo(@RequestParam String userId, @RequestParam String chapterId, @RequestParam String schoolId) { - StuTrainingExample stuTrainingExample =new StuTrainingExample(); + StuTrainingExample stuTrainingExample = new StuTrainingExample(); stuTrainingExample.createCriteria().andUserIdEqualTo(userId).andChapterIdEqualTo(chapterId); List stuTrainings = stuTrainingMapper.selectByExampleWithBLOBs(stuTrainingExample); - StuTrainingDto stuTrainingDto =new StuTrainingDto(); + StuTrainingDto stuTrainingDto = new StuTrainingDto(); //根据章节ID拿到课程ID 再去拿权重 SysCourseChapter sysCourseChapter = sysCourseChapterMapper.selectByPrimaryKey(chapterId); - SysWeightExample sysWeightExample =new SysWeightExample(); + SysWeightExample sysWeightExample = new SysWeightExample(); sysWeightExample.createCriteria().andCourseIdEqualTo(sysCourseChapter.getCourseId()).andSchoolIdEqualTo(schoolId); List sysWeights = sysWeightMapper.selectByExample(sysWeightExample); - if (!sysWeights.isEmpty()) - { + if (!sysWeights.isEmpty()) { SysWeight sysWeight = sysWeights.get(0); - BeanUtils.copyProperties(sysWeight,stuTrainingDto); //五个权重 + BeanUtils.copyProperties(sysWeight, stuTrainingDto); //五个权重 } - if (!stuTrainings.isEmpty()){ + if (!stuTrainings.isEmpty()) { StuTrainingWithBLOBs stuTrainingWithBLOBs = stuTrainings.get(0); - BeanUtils.copyProperties(stuTrainingWithBLOBs,stuTrainingDto); //四个完成情况和四个得分 + BeanUtils.copyProperties(stuTrainingWithBLOBs, stuTrainingDto); //四个完成情况和四个得分 TrainingReport trainingReport = trainingReportMapper.selectByPrimaryKey(stuTrainingWithBLOBs.getReportId()); - //设置报告相关数据 - if (trainingReport.getTeacherScore()==null){ + if (trainingReport == null || trainingReport.getTeacherScore() == null) { stuTrainingDto.setReportCompleteStatus("未提交"); stuTrainingDto.setReportScore(null); - }else { + } else { stuTrainingDto.setReportCompleteStatus("已提交"); stuTrainingDto.setReportScore(trainingReport.getTeacherScore()); }