From 913f727c1a9efcea24371a519e2b0cdc5bee7e65 Mon Sep 17 00:00:00 2001 From: qjq <1766193529@qq.com> Date: Wed, 19 Jun 2024 18:28:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/system/enums/Nutrition/NutritionEnum.java | 10 +++++----- .../dishesnutrition/DishesNutritionServiceImpl.java | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/enums/Nutrition/NutritionEnum.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/enums/Nutrition/NutritionEnum.java index 20d5eacf..42aaee5d 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/enums/Nutrition/NutritionEnum.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/enums/Nutrition/NutritionEnum.java @@ -21,18 +21,18 @@ public enum NutritionEnum { ZF(BigDecimal.valueOf(60),"脂肪"), //碳水化合物每日推荐 TSHHW(BigDecimal.valueOf(300),"碳水化合物"); - + private static final BigDecimal ONE=BigDecimal.valueOf(100); private final BigDecimal num; private final String name; public static String percentage(String naem,BigDecimal big){ if(NutritionEnum.NL.getName().equals(naem)){ - return big.divide(NutritionEnum.NL.getNum(),2, RoundingMode.UP).toString()+"%"; + return big.divide(NutritionEnum.NL.getNum(),4, RoundingMode.UP).multiply(ONE).setScale(2,RoundingMode.UP)+"%"; }else if(NutritionEnum.DBZ.getName().equals(naem)){ - return big.divide(NutritionEnum.DBZ.getNum(),2, RoundingMode.UP).toString()+"%"; + return big.divide(NutritionEnum.DBZ.getNum(),4, RoundingMode.UP).multiply(ONE).setScale(2,RoundingMode.UP)+"%"; }else if (NutritionEnum.ZF.getName().equals(naem)){ - return big.divide(NutritionEnum.ZF.getNum(),2, RoundingMode.UP).toString()+"%"; + return big.divide(NutritionEnum.ZF.getNum(),4, RoundingMode.UP).multiply(ONE).setScale(2,RoundingMode.UP)+"%"; }else{ - return big.divide(NutritionEnum.TSHHW.getNum(),2, RoundingMode.UP).toString()+"%"; + return big.divide(NutritionEnum.TSHHW.getNum(),4, RoundingMode.UP).multiply(ONE).setScale(2,RoundingMode.UP)+"%"; } } } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dishesnutrition/DishesNutritionServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dishesnutrition/DishesNutritionServiceImpl.java index 780bed55..6705bb89 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dishesnutrition/DishesNutritionServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dishesnutrition/DishesNutritionServiceImpl.java @@ -56,6 +56,7 @@ public class DishesNutritionServiceImpl implements DishesNutritionService { @Override public void updateDishesNutritionList(List updateReqVO) { + percentage(updateReqVO); updateReqVO.forEach(this::updateDishesNutrition); }