新增菜谱

This commit is contained in:
sxu 2025-05-27 22:37:09 +08:00
parent 5ba34e5b7f
commit 774bc46626
1 changed files with 14 additions and 7 deletions

View File

@ -97,14 +97,19 @@ public class CookRecipeServiceImpl implements ICookRecipeService {
if (1 == cookRecipeDTO.getRecipeType()) { //指定日期 if (1 == cookRecipeDTO.getRecipeType()) { //指定日期
recipeDateList = cookRecipeDTO.getRecipeDateList(); recipeDateList = cookRecipeDTO.getRecipeDateList();
} else if (2 == cookRecipeDTO.getRecipeType()) { //每日循环 } else if (2 == cookRecipeDTO.getRecipeType()) { //每日循环
List<CookRecipeDetailDTO> recipeDetailList = cookRecipeDTO.getRecipeDateList().get(0).getDetailList();
//新增详情
CookRecipeDateDTO cookRecipeDateDTO = new CookRecipeDateDTO(); CookRecipeDateDTO cookRecipeDateDTO = new CookRecipeDateDTO();
cookRecipeDateDTO.setDetailList(cookRecipeDTO.getRecipeDateList().get(0).getDetailList()); cookRecipeDateDTO.setDetailList(recipeDetailList);
LocalDate now = LocalDate.now(); LocalDate now = LocalDate.now();
for (int i = 0; i < 7; ++i) { for (int i = 0; i < 7; ++i) {
cookRecipeDateDTO.setApplyDate(now.plusDays(i)); cookRecipeDateDTO.setApplyDate(now.plusDays(i));
} }
recipeDateList.add(cookRecipeDateDTO); recipeDateList.add(cookRecipeDateDTO);
recipeDateList.add(new CookRecipeDateDTO()); //新增模板
CookRecipeDateDTO cookRecipeDateDTO2 = new CookRecipeDateDTO();
cookRecipeDateDTO2.setDetailList(recipeDetailList);
recipeDateList.add(cookRecipeDateDTO2);
} else if (3 == cookRecipeDTO.getRecipeType()) { //每周循环 } else if (3 == cookRecipeDTO.getRecipeType()) { //每周循环
LocalDate now = LocalDate.now(); LocalDate now = LocalDate.now();
HashMap<Integer, LocalDate> dateHashMap = new HashMap<>(); HashMap<Integer, LocalDate> dateHashMap = new HashMap<>();
@ -112,11 +117,7 @@ public class CookRecipeServiceImpl implements ICookRecipeService {
LocalDate applyWeek = now.plusDays((long) i); LocalDate applyWeek = now.plusDays((long) i);
dateHashMap.put(applyWeek.getDayOfWeek().getValue(), applyWeek); dateHashMap.put(applyWeek.getDayOfWeek().getValue(), applyWeek);
} }
for (Integer key : dateHashMap.keySet()) { //新增详情
CookRecipeDateDTO cookRecipeDateDTO = new CookRecipeDateDTO();
cookRecipeDateDTO.setApplyWeek(Long.valueOf(key));
recipeDateList.add(cookRecipeDateDTO);
}
Iterator<Map.Entry<Integer, LocalDate>> iterator = dateHashMap.entrySet().iterator(); Iterator<Map.Entry<Integer, LocalDate>> iterator = dateHashMap.entrySet().iterator();
while (iterator.hasNext()) { while (iterator.hasNext()) {
Map.Entry<Integer, LocalDate> entry = iterator.next(); Map.Entry<Integer, LocalDate> entry = iterator.next();
@ -125,6 +126,12 @@ public class CookRecipeServiceImpl implements ICookRecipeService {
cookRecipeDateDTO.setApplyDate(entry.getValue()); cookRecipeDateDTO.setApplyDate(entry.getValue());
recipeDateList.add(cookRecipeDateDTO); recipeDateList.add(cookRecipeDateDTO);
} }
//新增模板
for (Integer key : dateHashMap.keySet()) {
CookRecipeDateDTO cookRecipeDateDTO = new CookRecipeDateDTO();
cookRecipeDateDTO.setApplyWeek(Long.valueOf(key));
recipeDateList.add(cookRecipeDateDTO);
}
} }
return recipeDateList; return recipeDateList;
} }