From abb843bb72cdf8866bc5bf6ac2cb274f52d5c9cb Mon Sep 17 00:00:00 2001 From: caoyiwen Date: Thu, 30 Nov 2023 21:13:17 +0800 Subject: [PATCH] fix --- .../java/com/mathvision/diet/service/DishService.java | 8 ++++++-- .../com/mathvision/diet/repository/RoleRepository.java | 5 ++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/diet-core/src/main/java/com/mathvision/diet/service/DishService.java b/diet-core/src/main/java/com/mathvision/diet/service/DishService.java index ab7d464..1bf3085 100644 --- a/diet-core/src/main/java/com/mathvision/diet/service/DishService.java +++ b/diet-core/src/main/java/com/mathvision/diet/service/DishService.java @@ -165,10 +165,14 @@ public class DishService { List component = items.entrySet().stream().filter(x -> MUST_DISPLAY_ITEM.contains(x.getKey()) || WANT_DISPLAY_ITEM.contains(x.getKey()) && x.getValue() != null && x.getValue().compareTo(BigDecimal.ZERO) > 0).map(x -> { FoodNutrient foodNutrient = enumService.getNutrient(x.getKey()); if (foodNutrient == null) { - foodNutrient = FoodNutrient.builder().key(x.getKey()).measurement("-").build(); + if (x.getKey().equals("sugar")) { + foodNutrient = FoodNutrient.builder().key(x.getKey()).value("糖").measurement("g").build(); + } else { + foodNutrient = FoodNutrient.builder().key(x.getKey()).value(x.getKey()).measurement("-").build(); + } } - String name = x.getKey().equals("sugar") ? "糖" : StringUtils.isBlank(foodNutrient.getValue()) ? x.getKey() : foodNutrient.getValue(); + String name = foodNutrient.getValue(); String value = String.format("%s(%s)", format.format(x.getValue().floatValue()), foodNutrient.getMeasurement() == null ? "-" : foodNutrient.getMeasurement()); String nvr = foodNutrient.getNrv() == null || foodNutrient.getNrv().floatValue() == 0 ? "-" : String.format("%.2f%%", x.getValue().divide(foodNutrient.getNrv(), RoundingMode.HALF_UP).multiply(new BigDecimal(100))); if (StringUtils.equalsIgnoreCase(x.getKey(), "sodium")) { diff --git a/diet-dao/src/main/java/com/mathvision/diet/repository/RoleRepository.java b/diet-dao/src/main/java/com/mathvision/diet/repository/RoleRepository.java index 3e2e56e..b4bd840 100644 --- a/diet-dao/src/main/java/com/mathvision/diet/repository/RoleRepository.java +++ b/diet-dao/src/main/java/com/mathvision/diet/repository/RoleRepository.java @@ -11,6 +11,8 @@ import org.springframework.transaction.annotation.Transactional; import java.util.List; public interface RoleRepository extends JpaRepository, JpaSpecificationExecutor { + @Transactional + long deleteByIdAndVenderAndRoleTypeNot(Long id, Long vender, RoleType roleType); @Transactional long deleteByVender(Long vender); @@ -26,9 +28,6 @@ public interface RoleRepository extends JpaRepository, JpaSpecificat @Query("update Role r set r.roleName = ?1, r.operate = ?2 where r.id = ?3 and r.vender = ?4 and r.roleType != '系统'") int updateRoleNameAndOperateByIdAndVenderAndRoleTypeNot(String roleName, String operate, Long id, Long vender); - @Transactional - @Query("DELETE FROM Role d WHERE d.id = ?1 AND d.vender = ?2 AND ?3 != d.roleType") - long deleteByIdAndVenderAndRoleTypeNot(Long id, Long vender, RoleType roleType); List findByVender(Long vender); @Query("SELECT d FROM Role d WHERE d.vender = ?1 AND ?2= d.roleType")