diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysRecipesTemplateController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysRecipesTemplateController.java index 1185cb7bb..272c1cdf7 100644 --- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysRecipesTemplateController.java +++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysRecipesTemplateController.java @@ -3,6 +3,7 @@ package com.stdiet.web.controller.custom; import com.stdiet.common.core.controller.BaseController; import com.stdiet.common.core.domain.AjaxResult; import com.stdiet.common.core.page.TableDataInfo; +import com.stdiet.common.utils.StringUtils; import com.stdiet.custom.domain.SysRecipesTemplate; import com.stdiet.custom.service.ISysRecipesTemplateService; import org.springframework.beans.factory.annotation.Autowired; @@ -10,6 +11,7 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import java.util.List; +import java.util.Map; /** * 食谱模板 @@ -46,7 +48,11 @@ public class SysRecipesTemplateController extends BaseController { @PreAuthorize("@ss.hasPermi('recipes:template:edit')") @PostMapping("/add") public AjaxResult add(@RequestBody SysRecipesTemplate sysRecipesTemplate) { - return toAjax(iSysRecipesTemplateService.insertRecipsesTemplate(sysRecipesTemplate)); + Map result = iSysRecipesTemplateService.insertRecipsesTemplate(sysRecipesTemplate); + if (StringUtils.isEmpty(result)) { + return AjaxResult.error(); + } + return AjaxResult.success(result); } /** diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysRecipesTemplateService.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysRecipesTemplateService.java index c2ac9c22d..702730713 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysRecipesTemplateService.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysRecipesTemplateService.java @@ -3,6 +3,7 @@ package com.stdiet.custom.service; import com.stdiet.custom.domain.SysRecipesTemplate; import java.util.List; +import java.util.Map; /** * 食谱计划Service接口 @@ -14,7 +15,7 @@ public interface ISysRecipesTemplateService { List selectRecipesTemplateListByCondition(SysRecipesTemplate sysRecipesTemplate); - int insertRecipsesTemplate(SysRecipesTemplate sysRecipesTemplate); + Map insertRecipsesTemplate(SysRecipesTemplate sysRecipesTemplate); int updateRecipesTemplate(SysRecipesTemplate sysRecipesTemplate); diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesServiceImpl.java index 9c38d2f2a..46523212a 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesServiceImpl.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesServiceImpl.java @@ -1,5 +1,6 @@ package com.stdiet.custom.service.impl; +import com.stdiet.common.utils.StringUtils; import com.stdiet.custom.domain.SysRecipes; import com.stdiet.custom.domain.SysRecipesDaily; import com.stdiet.custom.domain.SysRecipesDailyDishes; diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesTemplateServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesTemplateServiceImpl.java index b8f9f9e84..a4f3dfc04 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesTemplateServiceImpl.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesTemplateServiceImpl.java @@ -12,7 +12,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * 食谱计划Service业务层处理 @@ -36,7 +38,7 @@ public class SysRecipesTemplateServiceImpl implements ISysRecipesTemplateService } @Override - public int insertRecipsesTemplate(SysRecipesTemplate sysRecipesTemplate) { + public Map insertRecipsesTemplate(SysRecipesTemplate sysRecipesTemplate) { SysRecipesPlan sysRecipesPlan = new SysRecipesPlan(); sysRecipesPlan.setStartNumDay(1); sysRecipesPlan.setEndNumDay(7); @@ -47,9 +49,17 @@ public class SysRecipesTemplateServiceImpl implements ISysRecipesTemplateService sysRecipesTemplate.setCreateBy(SecurityUtils.getUsername()); sysRecipesTemplate.setCreateTime(DateUtils.getNowDate()); sysRecipesTemplate.setPlanId(sysRecipesPlan.getId()); - return sysRecipesTemplateMapper.insertRecipsesTemplate(sysRecipesTemplate); + int rows = sysRecipesTemplateMapper.insertRecipsesTemplate(sysRecipesTemplate); + if(rows > 0) { + Map result = new HashMap<>(); + result.put("id", sysRecipesTemplate.getId()); + result.put("planId", sysRecipesPlan.getId()); + return result; + } else { + return null; + } } - return 0; + return null; } @Override diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysRecipesMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysRecipesMapper.xml index baa055611..9edc9c56b 100644 --- a/stdiet-custom/src/main/resources/mapper/custom/SysRecipesMapper.xml +++ b/stdiet-custom/src/main/resources/mapper/custom/SysRecipesMapper.xml @@ -144,7 +144,7 @@ insert into sys_customer_menu_dishes (menu_id, type, dishes_id, remark, detail) values - (#{item.menuId}, #{item.type}, #{item.dishesId}, #{remark}, #{item.detail, jdbcType=OTHER, typeHandler=com.stdiet.custom.typehandler.ArrayJsonHandler}) + (#{item.menuId}, #{item.type}, #{item.dishesId}, #{item.remark}, #{item.detail, jdbcType=OTHER, typeHandler=com.stdiet.custom.typehandler.ArrayJsonHandler}) diff --git a/stdiet-ui/src/components/HealthyView/index.vue b/stdiet-ui/src/components/HealthyView/index.vue index ee00f0956..633004bc0 100644 --- a/stdiet-ui/src/components/HealthyView/index.vue +++ b/stdiet-ui/src/components/HealthyView/index.vue @@ -12,10 +12,10 @@ >
diff --git a/stdiet-ui/src/components/RecipesPlanDrawer/index.vue b/stdiet-ui/src/components/RecipesPlanDrawer/index.vue index 31a2dc5ce..341066c93 100644 --- a/stdiet-ui/src/components/RecipesPlanDrawer/index.vue +++ b/stdiet-ui/src/components/RecipesPlanDrawer/index.vue @@ -17,7 +17,7 @@ class="copyBtn" :data-clipboard-text="copyValue" @click="handleOnRecipesLinkClick" - >客户食谱链接 + >食谱链接 diff --git a/stdiet-ui/src/components/TemplateDialog/index.vue b/stdiet-ui/src/components/TemplateDialog/index.vue new file mode 100644 index 000000000..3b53f2f57 --- /dev/null +++ b/stdiet-ui/src/components/TemplateDialog/index.vue @@ -0,0 +1,119 @@ + + diff --git a/stdiet-ui/src/store/modules/recipes.js b/stdiet-ui/src/store/modules/recipes.js index 6c20b9ad5..1211d4ad0 100644 --- a/stdiet-ui/src/store/modules/recipes.js +++ b/stdiet-ui/src/store/modules/recipes.js @@ -14,6 +14,7 @@ import { getDicts } from "@/api/system/dict/data"; const oriState = { cusId: undefined, + name: undefined, planId: undefined, temId: undefined, recipesId: undefined, @@ -107,6 +108,7 @@ const mutations = { const actions = { async init({ commit, dispatch }, payload) { + // // console.log(payload); const planResponse = await getRecipesPlan(payload.planId); const { @@ -261,14 +263,15 @@ const actions = { async saveRecipes({ commit, dispatch, state }, payload) { const { recipesData, cusId, planId } = state; const params = { - cusId, - planId, + cusId: payload.cusId !== undefined ? payload.cusId : cusId, + planId: payload.planId || planId, menus: recipesData.map((menu, idx) => ({ numDay: menu.numDay, cusId, dishes: menu.dishes.map(dObj => ({ dishesId: dObj.dishesId, type: dObj.type, + remark: dObj.remark, detail: dObj.igdList.map(igd => ({ id: igd.id, weight: igd.weight, @@ -282,11 +285,14 @@ const actions = { const result = await addRecipesApi(params); if (result.code === 200) { const recipesId = result.data; - commit("updateStateData", { recipesId }); - dispatch("getRecipesInfo", { recipesId }); + if (!payload.planId) { + // 非保存模板 + commit("updateStateData", { recipesId }); + dispatch("getRecipesInfo", { recipesId }); + } payload.callback && payload.callback({ - name: state.healthyData.name, + name: state.name, planId: state.planId }); } diff --git a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesAspectCom/index.vue b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesAspectCom/index.vue index ac4b465df..dbe86dd81 100644 --- a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesAspectCom/index.vue +++ b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesAspectCom/index.vue @@ -3,58 +3,84 @@ class="recipes_aspect_wrapper" :style="`height: ${collapse ? 30 : 200}px`" > -
- - 字体大小: - - - - - 返回 - -
- 审核通过 +
+ + - 未审核通过 + + + + 字体大小: + + + + + 返回 -
- - {{ reviewStatus === 1 ? "未审核" : "已审核" }} - - + +
+ 审核通过 + 未审核通过 +
+ + {{ reviewStatus === 1 ? "未审核" : "已审核" }} + +
+ 生成食谱 + +
生成食谱 - {{ `${collapse ? "展开" : "收起"}` }}
+ +