bonus
/
Bonus-Cloud-JYY-Canteen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
sxu 2025-05-13 14:58:40 +08:00
parent fde1c3dc29 1c8f6676da
commit 7e2a7c8a71
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuDishesServiceImpl.java
View File

@ -72,7 +72,7 @@ import javax.validation.constraints.Size;
*/ */
@Service @Service
public class MenuDishesServiceImpl extends ServiceImpl<MenuDishesMapper, MenuDishes> implements IMenuDishesService { public class MenuDishesServiceImpl extends ServiceImpl<MenuDishesMapper, MenuDishes> implements IMenuDishesService {
@Autowired @Resource
private MenuDishesMapper menuDishesMapper; private MenuDishesMapper menuDishesMapper;
@Resource @Resource
@ -204,8 +204,7 @@ public class MenuDishesServiceImpl extends ServiceImpl<MenuDishesMapper, MenuDis
menuDishesMapper.updateMenuMaterialDishes(Long.parseLong(menuDishesDTO.getDishesId())); menuDishesMapper.updateMenuMaterialDishes(Long.parseLong(menuDishesDTO.getDishesId()));
menuDishesMapper.addMenuMaterialDishes(Long.parseLong(menuDishesDTO.getDishesId()),materialList); menuDishesMapper.addMenuMaterialDishes(Long.parseLong(menuDishesDTO.getDishesId()),materialList);
} }
NutritionEntityUtil nutritionEntityUtil = new NutritionEntityUtil(); NutritionEntity nutritionEntity = NutritionEntityUtil.countNutrition(nutritionEntityList);
NutritionEntity nutritionEntity = nutritionEntityUtil.countNutrition(nutritionEntityList);
if(nutritionEntityList !=null && nutritionEntityList.size() >0){ if(nutritionEntityList !=null && nutritionEntityList.size() >0){
System.err.println("总和："+nutritionEntity.getCalcium()); System.err.println("总和："+nutritionEntity.getCalcium());
//计算营养成分 //计算营养成分
@ -300,8 +299,7 @@ public class MenuDishesServiceImpl extends ServiceImpl<MenuDishesMapper, MenuDis
//添加菜品和材料关系表 //添加菜品和材料关系表
menuDishesMapper.updateMenuMaterialDishes(Long.parseLong(menuDishesDTO.getDishesId())); menuDishesMapper.updateMenuMaterialDishes(Long.parseLong(menuDishesDTO.getDishesId()));
menuDishesMapper.addMenuMaterialDishes(dishesId,materialList); menuDishesMapper.addMenuMaterialDishes(dishesId,materialList);
NutritionEntityUtil nutritionEntityUtil = new NutritionEntityUtil(); NutritionEntity nutritionEntity = NutritionEntityUtil.countNutrition(nutritionEntityList);
NutritionEntity nutritionEntity = nutritionEntityUtil.countNutrition(nutritionEntityList);
if(nutritionEntityList !=null && nutritionEntityList.size() >0){ if(nutritionEntityList !=null && nutritionEntityList.size() >0){
System.err.println("总和："+nutritionEntity.getCalcium()); System.err.println("总和："+nutritionEntity.getCalcium());
//计算营养成分 //计算营养成分

3
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/device/DoubleScreenMachineMapper.xml
View File

@ -237,9 +237,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateContent != null and updateContent != ''"> <if test="updateContent != null and updateContent != ''">
update_content = #{updateContent}, update_content = #{updateContent},
</if> </if>
<if test="updateContent != null and updateContent != ''">
update_content = #{updateContent},
</if>
<if test="deployUser != null and deployUser != ''"> <if test="deployUser != null and deployUser != ''">
deploy_user = #{deployUser}, deploy_user = #{deployUser},
</if> </if>