From ccef6fa24c9df9a5e088ecc19af343dc1cef6d50 Mon Sep 17 00:00:00 2001
From: huangdeliang <huangdeliang@skieer.com>
Date: Fri, 9 Apr 2021 11:58:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A4=9A=E5=85=B3=E9=94=AE=E5=AD=97?=
=?UTF-8?q?=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../controller/custom/SysRecipesTemplateController.java | 4 ++--
.../java/com/stdiet/custom/domain/SysRecipesTemplate.java | 2 ++
.../resources/mapper/custom/SysRecipesTemplateMapper.xml | 6 +++++-
stdiet-ui/src/api/custom/recipesTemplate.js | 7 ++++---
.../recipesBuild/RecommendView/TemplateView/index.vue | 6 ++++--
stdiet-ui/src/views/custom/recipesPlan/index.vue | 1 +
stdiet-ui/src/views/custom/recipesTemplate/index.vue | 4 +++-
stdiet-ui/src/views/system/user/index.vue | 1 +
8 files changed, 22 insertions(+), 9 deletions(-)
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..00df9655f 100644
--- a/stdiet-ui/src/api/custom/recipesTemplate.js
+++ b/stdiet-ui/src/api/custom/recipesTemplate.js
@@ -1,10 +1,11 @@
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: query
+ 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>
From 39ad0f1b8600cf11eb307ef0f72e91b073d3f359 Mon Sep 17 00:00:00 2001
From: huangdeliang <huangdeliang@skieer.com>
Date: Fri, 9 Apr 2021 15:05:30 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=A3=9F=E8=B0=B1=E6=A8=A1=E6=9D=BF?=
=?UTF-8?q?=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
stdiet-ui/src/api/custom/recipesTemplate.js | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/stdiet-ui/src/api/custom/recipesTemplate.js b/stdiet-ui/src/api/custom/recipesTemplate.js
index 00df9655f..3251ca84c 100644
--- a/stdiet-ui/src/api/custom/recipesTemplate.js
+++ b/stdiet-ui/src/api/custom/recipesTemplate.js
@@ -4,7 +4,10 @@ export function listRecipesTemplate(data) {
return request({
url: "/recipes/template/list",
method: "post",
- // params: query
+ params: {
+ pageSize: data.pageSize,
+ pageNum: data.pageNum
+ },
data
});
}