mozhe
/
mental-health-api
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

This commit is contained in:
cjw 2024-06-06 10:54:27 +08:00
parent 4caccd6af8
commit 77bb9aa8ed
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleFactorServiceImpl.java
View File

@ -139,16 +139,18 @@ public class SysScaleFactorServiceImpl implements ISysScaleFactorService {
throw new ServiceException("因子计算规则有误，请确认后再提交"); throw new ServiceException("因子计算规则有误，请确认后再提交");
} }
switch (ruleTypeEnum) { switch (ruleTypeEnum) {
case SUM_TYPE -> add.setQuestionScore(BigDecimal.valueOf(maxScore)); case SUM_TYPE :
case AVG_TYPE -> { add.setQuestionScore(BigDecimal.valueOf(maxScore));
break;
case AVG_TYPE :
//均值四舍五入2位小数 //均值四舍五入2位小数
BigDecimal avgScore = BigDecimal.valueOf(maxScore).divide(new BigDecimal(questionNum), 2, RoundingMode.HALF_UP); BigDecimal avgScore = BigDecimal.valueOf(maxScore).divide(new BigDecimal(questionNum), 2, RoundingMode.HALF_UP);
add.setQuestionScore(avgScore); add.setQuestionScore(avgScore);
} break;
case SUM_INT_TYPE -> add.setQuestionScore(BigDecimal.valueOf(maxScore).setScale(0, RoundingMode.DOWN)); case SUM_INT_TYPE : add.setQuestionScore(BigDecimal.valueOf(maxScore).setScale(0, RoundingMode.DOWN));
default -> { default :
add.setQuestionScore(BigDecimal.valueOf(maxScore)); add.setQuestionScore(BigDecimal.valueOf(maxScore));
} break;
} }
return add; return add;
} }

3
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleServiceImpl.java
View File

@ -80,7 +80,10 @@ public class SysScaleServiceImpl implements ISysScaleService {
lqw.like(StringUtils.isNotBlank(bo.getScaleName()), SysScale::getScaleName, bo.getScaleName()); lqw.like(StringUtils.isNotBlank(bo.getScaleName()), SysScale::getScaleName, bo.getScaleName());
lqw.like(StringUtils.isNotBlank(bo.getScaleCode()), SysScale::getScaleCode, bo.getScaleCode()); lqw.like(StringUtils.isNotBlank(bo.getScaleCode()), SysScale::getScaleCode, bo.getScaleCode());
lqw.eq(bo.getStatus() != null, SysScale::getStatus, bo.getStatus()); lqw.eq(bo.getStatus() != null, SysScale::getStatus, bo.getStatus());
if(CollUtil.isNotEmpty(bo.getScaleType())){
lqw.like(CollUtil.isNotEmpty(bo.getScaleType()), SysScale::getScaleType, bo.getScaleType().get(0)); lqw.like(CollUtil.isNotEmpty(bo.getScaleType()), SysScale::getScaleType, bo.getScaleType().get(0));
}
lqw.orderByDesc(SysScale::getCreateTime); lqw.orderByDesc(SysScale::getCreateTime);
return lqw; return lqw;
} }