From 6f52d7d6be2938f157eb082b6f78a05feaa708bb Mon Sep 17 00:00:00 2001 From: xiaoCJ <406612557@qq.com> Date: Tue, 29 Aug 2023 15:15:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=99=E8=AF=AF=E6=8F=90?= =?UTF-8?q?=E7=A4=BAcode=E4=B8=BA400,=E5=88=97=E8=A1=A8=E5=88=86=E6=95=B0?= =?UTF-8?q?=E5=81=9A=E5=9B=9B=E8=88=8D=E4=BA=94=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SysTrainingScoreServiceImpl.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) 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 e3f1987..aff5d70 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 @@ -132,6 +132,7 @@ public class SysTrainingScoreServiceImpl implements ISysTrainingScoreService { @Override public PageInfo teacherGetReport(Integer index, Integer size, Double reportWeight, Double operatorWeight, String keyWord, String stuClass) { + DecimalFormat df = new DecimalFormat("#.##"); // 指定保留两位小数 List userList1 = sysUserMapper.selectClassStuNumberName(); long total = userList1.size(); List users1 = sysUserMapper.selectByNameStuNum(stuClass, keyWord); @@ -152,6 +153,8 @@ public class SysTrainingScoreServiceImpl implements ISysTrainingScoreService { sysTrainingScore.getTrainingOperationScore() != null) { double reportScore = (sysTrainingScore.getTrainingReportScore().doubleValue()) * reportWeight; double operatorScore = (sysTrainingScore.getTrainingOperationScore().doubleValue()) * operatorWeight; + reportScore = Double.parseDouble(df.format(reportScore)); // 格式化结果 + operatorScore = Double.parseDouble(df.format(operatorScore)); double totalScore = reportScore + operatorScore; // 使用数据库中的分数创建ReportDto ReportDto reportDto = new ReportDto( @@ -186,8 +189,11 @@ public class SysTrainingScoreServiceImpl implements ISysTrainingScoreService { if (sysTrainingScore.getTotalscore() != null && sysTrainingScore.getTrainingReportScore() != null && sysTrainingScore.getTrainingOperationScore() != null) { - double reportScore = (sysTrainingScore.getTrainingReportScore().doubleValue()) * reportWeight; - double operatorScore = (sysTrainingScore.getTrainingOperationScore().doubleValue()) * operatorWeight; + double reportScore = sysTrainingScore.getTrainingReportScore().doubleValue() * reportWeight; + double operatorScore = sysTrainingScore.getTrainingOperationScore().doubleValue() * operatorWeight; + reportScore = Double.parseDouble(df.format(reportScore)); // 格式化结果 + operatorScore = Double.parseDouble(df.format(operatorScore)); + double totalScore = reportScore + operatorScore; // 使用数据库中的分数创建ReportDto ReportDto reportDto = new ReportDto( @@ -296,7 +302,7 @@ public class SysTrainingScoreServiceImpl implements ISysTrainingScoreService { if (!sysTrainingScores.isEmpty()) { SysTrainingScore sysTrainingScore = sysTrainingScores.get(0); if (sysTrainingScore != null && sysTrainingScore.getReportContent() != null && !sysTrainingScore.getReportContent().isEmpty()) { - return AjaxResult.error("报告已提交，不允许上传和修改"); + return AjaxResult.error(400,"报告已提交，不允许上传和修改"); } if (sysTrainingScore != null && StringUtils.hasText(sysTrainingScore.getReportUploadPath())) { fileUtil.remove(sysTrainingScore.getReportUploadPath()); @@ -329,11 +335,11 @@ public class SysTrainingScoreServiceImpl implements ISysTrainingScoreService { sysTrainingScore.setReportstatus("未提交"); // 设置默认值为"未提交" } if (sysTrainingScore.getReportstatus().equals("已提交")) { // 检查报告状态，如果已提交，则不允许再次提交 - return AjaxResult.error("报告已提交，不可重复提交，如需再次提交，请点击重新实训"); + return AjaxResult.error(400,"报告已提交，不可重复提交，如需再次提交，请点击重新实训"); } if (isSubmit) { if (sysTrainingScore.getReportUploadPath() == null) { - return AjaxResult.error("请先上传再提交"); + return AjaxResult.error(400,"请先上传再提交"); } sysTrainingScore.setReportContent(content); sysTrainingScore.setReportstatus("已提交"); @@ -341,7 +347,7 @@ public class SysTrainingScoreServiceImpl implements ISysTrainingScoreService { return AjaxResult.success("提交成功"); } else { if (sysTrainingScore.getReportstatus().equals("已提交")) { - return AjaxResult.error("报告已提交，无法修改"); + return AjaxResult.error(400,"报告已提交，无法修改"); } sysTrainingScore.setReportContent(content); trainingScoreMapper.updateByPrimaryKeySelective(sysTrainingScore);