Merge branch 'develop' of https://gitee.com/darlk/ShengTangManage into xzj

This commit is contained in:
xiezhijun
2021-02-27 16:58:41 +08:00
16 changed files with 388 additions and 451 deletions

View File

@ -57,6 +57,12 @@ public class SysRecipesPlanController extends BaseController
return getDataTable(list);
}
@PreAuthorize("@ss.hasPermi('recipes:recipesPlan:list')")
@GetMapping(value = "/list/{cusId}")
public AjaxResult getAllPlanByCusId(@PathVariable Long cusId) {
return AjaxResult.success(sysRecipesPlanService.selectPlanListByCusId(cusId));
}
/**
* 获取食谱计划详细信息
*/

View File

@ -34,16 +34,31 @@ public class SysWapController extends BaseController {
return AjaxResult.success(iSysWapServices.getRecipesPlanListInfo(outId));
}
/**
* 获取用户信息
* @param outId
* @return
*/
@GetMapping(value = "/healthyInfo/{outId}")
public AjaxResult healthy(@PathVariable String outId) {
return AjaxResult.success(iSysWapServices.getHealthyDataByOutId(outId));
}
/**
* 获取某天食谱菜品
* @param id
* @return
*/
@GetMapping(value = "/recipes/menu/{id}")
public AjaxResult dayilyMenu(@PathVariable Long id) {
return AjaxResult.success(iSysRecipesService.selectDishesByMenuId(id));
}
/**
* 系统字典
* @param dictType
* @return
*/
@GetMapping(value = "/dict/{dictType}")
public AjaxResult sysDict(@PathVariable String dictType) {
return AjaxResult.success(iSysDictTypeService.selectDictDataByType(dictType));