From 77bb9aa8ed6213bbdef04b0b3d328f86fb8f9f3f Mon Sep 17 00:00:00 2001 From: cjw Date: Thu, 6 Jun 2024 10:54:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SysScaleFactorServiceImpl.java | 14 ++++++++------ .../scale/service/impl/SysScaleServiceImpl.java | 5 ++++- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleFactorServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleFactorServiceImpl.java index 6d47232..c991648 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleFactorServiceImpl.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleFactorServiceImpl.java @@ -139,16 +139,18 @@ public class SysScaleFactorServiceImpl implements ISysScaleFactorService { throw new ServiceException("因子计算规则有误，请确认后再提交"); } switch (ruleTypeEnum) { - case SUM_TYPE -> add.setQuestionScore(BigDecimal.valueOf(maxScore)); - case AVG_TYPE -> { + case SUM_TYPE : + add.setQuestionScore(BigDecimal.valueOf(maxScore)); + break; + case AVG_TYPE : //均值四舍五入2位小数 BigDecimal avgScore = BigDecimal.valueOf(maxScore).divide(new BigDecimal(questionNum), 2, RoundingMode.HALF_UP); add.setQuestionScore(avgScore); - } - case SUM_INT_TYPE -> add.setQuestionScore(BigDecimal.valueOf(maxScore).setScale(0, RoundingMode.DOWN)); - default -> { + break; + case SUM_INT_TYPE : add.setQuestionScore(BigDecimal.valueOf(maxScore).setScale(0, RoundingMode.DOWN)); + default : add.setQuestionScore(BigDecimal.valueOf(maxScore)); - } + break; } return add; } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleServiceImpl.java index c978caa..29aac5b 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleServiceImpl.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleServiceImpl.java @@ -80,7 +80,10 @@ public class SysScaleServiceImpl implements ISysScaleService { lqw.like(StringUtils.isNotBlank(bo.getScaleName()), SysScale::getScaleName, bo.getScaleName()); lqw.like(StringUtils.isNotBlank(bo.getScaleCode()), SysScale::getScaleCode, bo.getScaleCode()); lqw.eq(bo.getStatus() != null, SysScale::getStatus, bo.getStatus()); - lqw.like(CollUtil.isNotEmpty(bo.getScaleType()), SysScale::getScaleType, bo.getScaleType().get(0)); + if(CollUtil.isNotEmpty(bo.getScaleType())){ + lqw.like(CollUtil.isNotEmpty(bo.getScaleType()), SysScale::getScaleType, bo.getScaleType().get(0)); + } + lqw.orderByDesc(SysScale::getCreateTime); return lqw; }