From b22851c553353325228c48d32a677630ce1f62a0 Mon Sep 17 00:00:00 2001 From: xiaoCJ <406612557@qq.com> Date: Mon, 21 Aug 2023 17:11:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=80=BB=E6=88=90=E7=BB=A9?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8C=E4=BB=A5=E5=8F=8A=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/system/service/ISysTrainingScoreService.java | 4 ++-- .../system/service/impl/SysTrainingScoreServiceImpl.java | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysTrainingScoreService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysTrainingScoreService.java index e0864ec..2263125 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysTrainingScoreService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysTrainingScoreService.java @@ -15,7 +15,7 @@ public interface ISysTrainingScoreService { AjaxResult uploadReport(MultipartFile file, String fileName, Long id); - AjaxResult saveOrSubmitReport(String content, Long userId,boolean isSubmit); + AjaxResult saveOrSubmitReport(String content, Long userId, boolean isSubmit); void updateByPrimaryKeySelective(SysTrainingScore sysTrainingScore); @@ -25,7 +25,7 @@ public interface ISysTrainingScoreService { PageInfo<ReportDto> teacherGetReport(Integer index, Integer size, Double reportWeight, Double operatorWeight, String keyWord, String stuClass); - List<String>selectClass(); + List<String> selectClass(); void deleteByUserId(Long userId); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTrainingScoreServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTrainingScoreServiceImpl.java index 334d932..aa1f85f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTrainingScoreServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTrainingScoreServiceImpl.java @@ -294,12 +294,15 @@ public class SysTrainingScoreServiceImpl implements ISysTrainingScoreService { // 保存或提交学生输入的实验报告内容 @Override - public AjaxResult saveOrSubmitReport(String content, Long userId, boolean isSubmit) { // issubmit为true时提交 false保存 + public AjaxResult saveOrSubmitReport(String content, Long userId, boolean isSubmit) { // isSubmit为true时提交 false保存 SysTrainingScoreExample trainingScoreExample = new SysTrainingScoreExample(); trainingScoreExample.createCriteria().andUseridEqualTo(userId); List<SysTrainingScore> sysTrainingScores = trainingScoreMapper.selectByExample(trainingScoreExample); if (!sysTrainingScores.isEmpty()) { SysTrainingScore sysTrainingScore = sysTrainingScores.get(0); + if (StringUtils.isEmpty(sysTrainingScore.getReportstatus())) { + sysTrainingScore.setReportstatus("未提交"); // 设置默认值为"未提交" + } if (isSubmit) { if (sysTrainingScore.getReportUploadPath() == null) { return AjaxResult.error("请先上传再提交");