zt/canteen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
qjq
2024-06-19 18:28:55 +08:00
parent 7b424ae700
commit 913f727c1a
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/enums/Nutrition/NutritionEnum.java
View File

@ -21,18 +21,18 @@ public enum NutritionEnum {
ZF(BigDecimal.valueOf(60),"脂肪"), ZF(BigDecimal.valueOf(60),"脂肪"),
//碳水化合物每日推荐 //碳水化合物每日推荐
TSHHW(BigDecimal.valueOf(300),"碳水化合物"); TSHHW(BigDecimal.valueOf(300),"碳水化合物");
private static final BigDecimal ONE=BigDecimal.valueOf(100);
private final BigDecimal num; private final BigDecimal num;
private final String name; private final String name;
public static String percentage(String naem,BigDecimal big){ public static String percentage(String naem,BigDecimal big){
if(NutritionEnum.NL.getName().equals(naem)){ 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)){ }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)){ }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{ }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)+"%";
} }
} }
} }

1
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dishesnutrition/DishesNutritionServiceImpl.java
View File

@ -56,6 +56,7 @@ public class DishesNutritionServiceImpl implements DishesNutritionService {
@Override @Override
public void updateDishesNutritionList(List<DishesNutritionSaveReqVO> updateReqVO) { public void updateDishesNutritionList(List<DishesNutritionSaveReqVO> updateReqVO) {
percentage(updateReqVO);
updateReqVO.forEach(this::updateDishesNutrition); updateReqVO.forEach(this::updateDishesNutrition);
} }