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 teacherGetReport(Integer index, Integer size, Double reportWeight, Double operatorWeight, String keyWord, String stuClass); - ListselectClass(); + List 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 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("请先上传再提交");