From 18636cf6b8fd636b0a56b71249c9724f0a859f2d Mon Sep 17 00:00:00 2001 From: xiaoCJ <406612557@qq.com> Date: Mon, 21 Aug 2023 14:18:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9user.xml=E8=AF=AD=E5=8F=A5=20?= =?UTF-8?q?,=20=E6=96=B0=E5=A2=9E=E4=BF=9D=E5=AD=98=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TrainingScoreController.java | 3 +- .../ruoyi/system/mapper/SysUserMapper.java | 2 +- .../service/ISysTrainingScoreService.java | 2 +- .../impl/SysTrainingScoreServiceImpl.java | 42 +++++++++++++++---- .../resources/mapper/system/SysUserMapper.xml | 2 - 5 files changed, 39 insertions(+), 12 deletions(-) diff --git a/ruoyi-biemo/src/main/java/com/ruoyi/biemo/business/controller/TrainingScoreController.java b/ruoyi-biemo/src/main/java/com/ruoyi/biemo/business/controller/TrainingScoreController.java index a6e6ea6..17025c6 100644 --- a/ruoyi-biemo/src/main/java/com/ruoyi/biemo/business/controller/TrainingScoreController.java +++ b/ruoyi-biemo/src/main/java/com/ruoyi/biemo/business/controller/TrainingScoreController.java @@ -135,7 +135,8 @@ public class TrainingScoreController { public AjaxResult submitReport(@RequestBody JSONObject jsonObject) { Long userId = jsonObject.getLong("userId"); String content = jsonObject.getString("content"); - return trainingScoreService.submitReport(content, userId); + boolean isSubmit = jsonObject.getBoolean("isSubmit"); + return trainingScoreService.saveOrSubmitReport(content, userId,isSubmit); } //学生端实验报告回显 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java index e4a1b72..53a07f8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java @@ -139,7 +139,7 @@ public interface SysUserMapper List selectClassStuNumberNameByClass(@Param("stuClass") String stuClass); - @Select("select id from sys_user where studentnumber = #{studentNumber}") + @Select("select user_id from sys_user where studentnumber = #{studentNumber}") Long selectUserIDByStuNum(@Param("studentNumber") String studentNumber); } 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 e271ea3..e0864ec 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 submitReport(String content, Long userId); + AjaxResult saveOrSubmitReport(String content, Long userId,boolean isSubmit); void updateByPrimaryKeySelective(SysTrainingScore sysTrainingScore); 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 e911344..334d932 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 @@ -292,23 +292,51 @@ public class SysTrainingScoreServiceImpl implements ISysTrainingScoreService { } - //提交 + // 保存或提交学生输入的实验报告内容 @Override - public AjaxResult submitReport(String content, Long userId) { + 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 (sysTrainingScore.getReportUploadPath() == null) { - return AjaxResult.error("请先上传再提交"); + if (isSubmit) { + if (sysTrainingScore.getReportUploadPath() == null) { + return AjaxResult.error("请先上传再提交"); + } + sysTrainingScore.setReportContent(content); + sysTrainingScore.setReportstatus("已提交"); + trainingScoreMapper.updateByPrimaryKeySelective(sysTrainingScore); + return AjaxResult.success("提交成功"); + } else { + if (sysTrainingScore.getReportstatus().equals("已提交")) { + return AjaxResult.error("报告已提交，无法修改"); + } + sysTrainingScore.setReportContent(content); + trainingScoreMapper.updateByPrimaryKeySelective(sysTrainingScore); + return AjaxResult.success("保存成功"); } - sysTrainingScore.setReportContent(content); - trainingScoreMapper.updateByPrimaryKeySelective(sysTrainingScore); } - return AjaxResult.success("提交成功"); + return null; } +// //提交 +// @Override +// public AjaxResult submitReport(String content, Long userId) { +// SysTrainingScoreExample trainingScoreExample = new SysTrainingScoreExample(); +// trainingScoreExample.createCriteria().andUseridEqualTo(userId); +// List sysTrainingScores = trainingScoreMapper.selectByExample(trainingScoreExample); +// if (!sysTrainingScores.isEmpty()) { +// SysTrainingScore sysTrainingScore = sysTrainingScores.get(0); +// if (sysTrainingScore.getReportUploadPath() == null) { +// return AjaxResult.error("请先上传再提交"); +// } +// sysTrainingScore.setReportContent(content); +// trainingScoreMapper.updateByPrimaryKeySelective(sysTrainingScore); +// } +// return AjaxResult.success("提交成功"); +// } + @Override public List selectClass() { diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index d391f30..4a5f4f2 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -219,7 +219,6 @@ insert into sys_user( - user_id, dept_id, user_name, nick_name, @@ -235,7 +234,6 @@ remark, create_time )values( - #{userId}, #{deptId}, #{userName}, #{nickName},