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 272c1cdf7..869f5ffa5 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 @@ -29,8 +29,8 @@ public class SysRecipesTemplateController extends BaseController { * 查询 */ @PreAuthorize("@ss.hasPermi('recipes:template:list')") - @GetMapping("/list") - public TableDataInfo list(SysRecipesTemplate sysRecipesTemplate) { + @PostMapping("/list") + public TableDataInfo list(@RequestBody SysRecipesTemplate sysRecipesTemplate) { startPage(); List<SysRecipesTemplate> list = iSysRecipesTemplateService.selectRecipesTemplateListByCondition(sysRecipesTemplate); return getDataTable(list); diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesTemplate.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesTemplate.java index f09334a9a..852575c92 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesTemplate.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesTemplate.java @@ -36,4 +36,6 @@ public class SysRecipesTemplate { Long recipesId; Integer reviewStatus; + + String[] keys; } diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysRecipesTemplateMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysRecipesTemplateMapper.xml index dac9aa98a..98d612f0d 100644 --- a/stdiet-custom/src/main/resources/mapper/custom/SysRecipesTemplateMapper.xml +++ b/stdiet-custom/src/main/resources/mapper/custom/SysRecipesTemplateMapper.xml @@ -31,7 +31,11 @@ left join sys_user su_nutritionist on su_nutritionist.user_id = srt.nutritionist_id and su_nutritionist.del_flag = 0 left join sys_user su_nutritionist_assis on su_nutritionist_assis.user_id = srt.nutri_assis_id and su_nutritionist_assis.del_flag = 0 where srt.del_flag = 0 - <if test="name != null and name != ''">and srt.name like concat('%', #{name}, '%') or srt.remark like concat('%', #{name}, '%')</if> + <if test="keys != null">and + <foreach collection="keys" item="key" separator="and" open="(" close=")"> + srt.name like concat('%', #{key}, '%') or srt.remark like concat('%', #{key}, '%') + </foreach> + </if> <if test="nutriAssisId != null ">and srt.nutri_assis_id = #{nutriAssisId}</if> <if test="nutritionistId != null ">and srt.nutritionist_id = #{nutritionistId}</if> <if test="reviewStatus != null ">and srp.review_status = #{reviewStatus}</if> diff --git a/stdiet-ui/src/api/custom/recipesTemplate.js b/stdiet-ui/src/api/custom/recipesTemplate.js index 4d8167140..3251ca84c 100644 --- a/stdiet-ui/src/api/custom/recipesTemplate.js +++ b/stdiet-ui/src/api/custom/recipesTemplate.js @@ -1,10 +1,14 @@ import request from "@/utils/request"; -export function listRecipesTemplate(query) { +export function listRecipesTemplate(data) { return request({ url: "/recipes/template/list", - method: "get", - params: query + method: "post", + params: { + pageSize: data.pageSize, + pageNum: data.pageNum + }, + data }); } diff --git a/stdiet-ui/src/views/custom/recipesBuild/RecommendView/TemplateView/index.vue b/stdiet-ui/src/views/custom/recipesBuild/RecommendView/TemplateView/index.vue index a944afc0f..d8cdee2f9 100644 --- a/stdiet-ui/src/views/custom/recipesBuild/RecommendView/TemplateView/index.vue +++ b/stdiet-ui/src/views/custom/recipesBuild/RecommendView/TemplateView/index.vue @@ -1,7 +1,7 @@ <template> <div class="template_view_wrapper"> <div class="header"> - <div style="fontWeight: bold">选择模板</div> + <div style="fontweight: bold">选择模板</div> <el-button size="mini" @click="handleOnBackClick">返回</el-button> </div> <div class="content"> @@ -131,7 +131,9 @@ export default { }, getList() { this.loading = true; - listRecipesTemplate(this.queryParams).then((res) => { + const params = JSON.parse(JSON.stringify(this.queryParams)); + params.keys = (params.name || "").split(" "); + listRecipesTemplate(params).then((res) => { if (res.code === 200) { this.dataList = res.rows; this.total = res.total; diff --git a/stdiet-ui/src/views/custom/recipesPlan/index.vue b/stdiet-ui/src/views/custom/recipesPlan/index.vue index 1d1ee402a..fda3aab3f 100644 --- a/stdiet-ui/src/views/custom/recipesPlan/index.vue +++ b/stdiet-ui/src/views/custom/recipesPlan/index.vue @@ -12,6 +12,7 @@ placeholder="请输入客户姓名或手机号" clearable size="small" + @keyup.enter.native="handleQuery" /> </el-form-item> <el-form-item label="日期" prop="planStartDateScope"> diff --git a/stdiet-ui/src/views/custom/recipesTemplate/index.vue b/stdiet-ui/src/views/custom/recipesTemplate/index.vue index 84ec9a191..c3ef7d801 100644 --- a/stdiet-ui/src/views/custom/recipesTemplate/index.vue +++ b/stdiet-ui/src/views/custom/recipesTemplate/index.vue @@ -269,7 +269,9 @@ export default { /** 查询食谱计划列表 */ getList() { this.loading = true; - listRecipesTemplate(this.queryParams).then((response) => { + const params = JSON.parse(JSON.stringify(this.queryParams)); + params.keys = params.name ? params.name.split(" ") : null; + listRecipesTemplate(params).then((response) => { this.recipesTemplateList = response.rows; this.total = response.total; this.loading = false; diff --git a/stdiet-ui/src/views/system/user/index.vue b/stdiet-ui/src/views/system/user/index.vue index 2a2bc304a..67eca3f09 100644 --- a/stdiet-ui/src/views/system/user/index.vue +++ b/stdiet-ui/src/views/system/user/index.vue @@ -10,6 +10,7 @@ clearable size="small" prefix-icon="el-icon-search" + @keyup.enter.native="handleQuery" style="margin-bottom: 20px" /> </div>