更新菜谱
This commit is contained in:
parent
e786f8d53a
commit
fec8f85805
|
|
@ -99,9 +99,9 @@ public class CookRecipeController extends BaseController {
|
||||||
//@RequiresPermissions("cook:recipe:edit")
|
//@RequiresPermissions("cook:recipe:edit")
|
||||||
@SysLog(title = "菜品计划信息", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->修改菜品计划信息")
|
@SysLog(title = "菜品计划信息", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->修改菜品计划信息")
|
||||||
@PostMapping("/edit")
|
@PostMapping("/edit")
|
||||||
public AjaxResult edit(@RequestBody CookRecipe cookRecipe) {
|
public AjaxResult edit(@RequestBody CookRecipeDTO cookRecipeDTO) {
|
||||||
try {
|
try {
|
||||||
return toAjax(cookRecipeService.updateCookRecipe(cookRecipe));
|
return toAjax(cookRecipeService.updateCookRecipe(cookRecipeDTO));
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
return error(e.getMessage());
|
return error(e.getMessage());
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -40,10 +40,10 @@ public interface CookRecipeMapper {
|
||||||
/**
|
/**
|
||||||
* 修改菜品计划信息
|
* 修改菜品计划信息
|
||||||
*
|
*
|
||||||
* @param cookRecipe 菜品计划信息
|
* @param cookRecipeDTO 菜品计划信息
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
public int updateCookRecipe(CookRecipe cookRecipe);
|
public int updateCookRecipe(CookRecipeDTO cookRecipeDTO);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 删除菜品计划信息
|
* 删除菜品计划信息
|
||||||
|
|
|
||||||
|
|
@ -38,10 +38,10 @@ public interface ICookRecipeService {
|
||||||
/**
|
/**
|
||||||
* 修改菜品计划信息
|
* 修改菜品计划信息
|
||||||
*
|
*
|
||||||
* @param cookRecipe 菜品计划信息
|
* @param cookRecipeDTO 菜品计划信息
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
public int updateCookRecipe(CookRecipe cookRecipe);
|
public int updateCookRecipe(CookRecipeDTO cookRecipeDTO);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 批量删除菜品计划信息
|
* 批量删除菜品计划信息
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@ package com.bonus.canteen.core.cook.service.impl;
|
||||||
|
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
import com.bonus.canteen.core.cook.domain.CookRecipeDetail;
|
import com.bonus.canteen.core.cook.domain.CookRecipeDetail;
|
||||||
import com.bonus.canteen.core.cook.domain.CookRecipeDishes;
|
import com.bonus.canteen.core.cook.domain.CookRecipeDishes;
|
||||||
|
|
@ -91,6 +92,13 @@ public class CookRecipeServiceImpl implements ICookRecipeService {
|
||||||
}
|
}
|
||||||
|
|
||||||
private void createRecipeDetails(CookRecipeDTO cookRecipeDTO, boolean isCreate) {
|
private void createRecipeDetails(CookRecipeDTO cookRecipeDTO, boolean isCreate) {
|
||||||
|
// 更新菜谱时,
|
||||||
|
// 指定日期菜谱,删掉指定日期的菜谱
|
||||||
|
// 循环菜谱,删掉模板数据 + 今日开始的详情数据
|
||||||
|
if (!isCreate) {
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
// 插入指定日期、日循环摸板、周循环模板
|
// 插入指定日期、日循环摸板、周循环模板
|
||||||
if (!CollectionUtils.isEmpty(cookRecipeDTO.getRecipeDateList())) {
|
if (!CollectionUtils.isEmpty(cookRecipeDTO.getRecipeDateList())) {
|
||||||
for (CookRecipeDateDTO recipeDateDTO : cookRecipeDTO.getRecipeDateList()) {
|
for (CookRecipeDateDTO recipeDateDTO : cookRecipeDTO.getRecipeDateList()) {
|
||||||
|
|
@ -186,20 +194,23 @@ public class CookRecipeServiceImpl implements ICookRecipeService {
|
||||||
/**
|
/**
|
||||||
* 修改菜品计划信息
|
* 修改菜品计划信息
|
||||||
*
|
*
|
||||||
* @param cookRecipe 菜品计划信息
|
* @param cookRecipeDTO 菜品计划信息
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public int updateCookRecipe(CookRecipe cookRecipe) {
|
public int updateCookRecipe(CookRecipeDTO cookRecipeDTO) {
|
||||||
cookRecipe.setUpdateTime(DateUtils.getNowDate());
|
cookRecipeDTO.setUpdateTime(DateUtils.getNowDate());
|
||||||
|
cookRecipeDTO.setUpdateBy(SecurityUtils.getUsername());
|
||||||
try {
|
try {
|
||||||
//TODO 删除菜谱之菜品详情
|
List<CookRecipe> cookRecipes = cookRecipeMapper.selectCookRecipeList(new CookRecipe());
|
||||||
//TODO 删除菜谱之执行计划
|
List<String> otherCookRecipes = cookRecipes.stream().filter(item -> !item.getRecipeId().equals(cookRecipeDTO.getRecipeId()))
|
||||||
|
.map(CookRecipe::getRecipeName).collect(Collectors.toList());
|
||||||
//TODO 新增菜谱之执行计划
|
if (otherCookRecipes.contains(cookRecipeDTO.getRecipeName())) {
|
||||||
//TODO 新增菜谱之菜品详情
|
throw new ServiceException("该菜谱名称已存在,请重新输入");
|
||||||
|
}
|
||||||
return cookRecipeMapper.updateCookRecipe(cookRecipe);
|
int count = cookRecipeMapper.updateCookRecipe(cookRecipeDTO);
|
||||||
|
createRecipeDetails(cookRecipeDTO, false);
|
||||||
|
return count;
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
throw new ServiceException(e.getMessage());
|
throw new ServiceException(e.getMessage());
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue