From 92081f70352a37c898dedd1b587ec477560f99c7 Mon Sep 17 00:00:00 2001 From: huangdeliang Date: Wed, 3 Mar 2021 13:46:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=9B=E5=BB=BA=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SysRecipesTemplateServiceImpl.java | 11 ++++++++++- .../mapper/custom/SysRecipesPlanMapper.xml | 6 +++--- stdiet-ui/src/api/custom/recipes.js | 2 +- stdiet-ui/src/store/modules/recipes.js | 2 -- .../RecipesView/RecipesAspectCom/index.vue | 13 +++++++++---- .../src/views/custom/recipesTemplate/index.vue | 1 + 6 files changed, 24 insertions(+), 11 deletions(-) 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 ad260731a..b8f9f9e84 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 @@ -41,6 +41,7 @@ public class SysRecipesTemplateServiceImpl implements ISysRecipesTemplateService sysRecipesPlan.setStartNumDay(1); sysRecipesPlan.setEndNumDay(7); sysRecipesPlan.setType(1); + sysRecipesPlan.setCusId(0L); sysRecipesPlanMapper.insertSysRecipesPlan(sysRecipesPlan); if (!StringUtils.isNull(sysRecipesPlan.getId())) { sysRecipesTemplate.setCreateBy(SecurityUtils.getUsername()); @@ -60,7 +61,15 @@ public class SysRecipesTemplateServiceImpl implements ISysRecipesTemplateService @Override public int removeRecipesTemplate(Long id) { - return sysRecipesTemplateMapper.removeRecipesTemplate(id); + SysRecipesTemplate sysRecipesTemplate= sysRecipesTemplateMapper.getRecipesTemplateById(id); + if(StringUtils.isNull(sysRecipesTemplate)) { + return 0; + } + int rows = sysRecipesTemplateMapper.removeRecipesTemplate(sysRecipesTemplate.getId()); + if(rows > 0) { + return sysRecipesPlanMapper.deleteSysRecipesPlanById(sysRecipesTemplate.getPlanId()); + } + return 0; } @Override diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysRecipesPlanMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysRecipesPlanMapper.xml index 150ae32b1..b3d74834b 100644 --- a/stdiet-custom/src/main/resources/mapper/custom/SysRecipesPlanMapper.xml +++ b/stdiet-custom/src/main/resources/mapper/custom/SysRecipesPlanMapper.xml @@ -132,9 +132,9 @@ where id = #{id} and del_flag = 0 - - delete from sys_recipes_plan where id = #{id} - + + update sys_recipes_plan set del_flag = 1 where id = #{id} + delete from sys_recipes_plan where id in diff --git a/stdiet-ui/src/api/custom/recipes.js b/stdiet-ui/src/api/custom/recipes.js index 3ab412055..f8ecdbd6c 100644 --- a/stdiet-ui/src/api/custom/recipes.js +++ b/stdiet-ui/src/api/custom/recipes.js @@ -2,7 +2,7 @@ import request from "@/utils/request"; export function addRecipesApi(data) { return request({ - url: "/custom/recipes/", + url: "/custom/recipes", method: "post", data }); diff --git a/stdiet-ui/src/store/modules/recipes.js b/stdiet-ui/src/store/modules/recipes.js index fabe4fd9e..87ffe6cbf 100644 --- a/stdiet-ui/src/store/modules/recipes.js +++ b/stdiet-ui/src/store/modules/recipes.js @@ -259,9 +259,7 @@ const actions = { dispatch("getRecipesInfo", { recipesId }); payload.callback && payload.callback({ - recipesId: result.data, name: state.healthyData.name, - cusId: state.cusId, 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 a4c37f955..9c7705d47 100644 --- a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesAspectCom/index.vue +++ b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesAspectCom/index.vue @@ -72,7 +72,9 @@ import BarChart from "./BarChart"; import PieChart from "./PieChart"; import { createNamespacedHelpers } from "vuex"; -const { mapActions, mapState } = createNamespacedHelpers("recipes"); +const { mapActions, mapState, mapMutations } = createNamespacedHelpers( + "recipes" +); export default { name: "RecipesAspectCom", components: { @@ -96,8 +98,10 @@ export default { handleOnSave() { this.saveRecipes({ callback: (query) => { - console.log(query); - this.$router.replace({ path: "/recipes/build", query }); + // console.log(query); + this.$router.replace({ + path: "/recipes/build/" + query.name + "/" + query.planId, + }); }, }); }, @@ -105,9 +109,10 @@ export default { this.updateReviewStatus({ reviewStatus }); }, handleOnBack() { - this.updateReviewStatus({ recipesData: [] }); + this.updateStateData({ recipesData: [] }); }, ...mapActions(["saveRecipes", "updateReviewStatus"]), + ...mapMutations(["updateStateData"]), }, }; diff --git a/stdiet-ui/src/views/custom/recipesTemplate/index.vue b/stdiet-ui/src/views/custom/recipesTemplate/index.vue index b763a0c1b..d378f6a38 100644 --- a/stdiet-ui/src/views/custom/recipesTemplate/index.vue +++ b/stdiet-ui/src/views/custom/recipesTemplate/index.vue @@ -430,6 +430,7 @@ export default { submitForm() { this.$refs["form"].validate((valid) => { if (valid) { + this.form.cusId = 0; if (this.form.id != null) { updateRecipesTemplate(this.form).then((response) => { if (response.code === 200) {