From 05572662cf3d0e5eacaba7f6a86e609e9dad80ba Mon Sep 17 00:00:00 2001 From: huangdeliang Date: Thu, 7 Jan 2021 23:28:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A3=9F=E6=9D=90?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stdiet/custom/domain/SysIngredient.java | 32 +++++++++++++ .../mapper/custom/SysIngredientMapper.xml | 5 +++ .../src/views/custom/ingredient/index.vue | 45 ++++++++++++++++--- 3 files changed, 77 insertions(+), 5 deletions(-) diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysIngredient.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysIngredient.java index 716a7614f..4b45d85b0 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysIngredient.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysIngredient.java @@ -16,6 +16,9 @@ import java.math.BigDecimal; public class SysIngredient extends BaseEntity { private static final long serialVersionUID = 1L; + private int pageNum; + private int pageSize; + /** * id */ @@ -69,6 +72,19 @@ public class SysIngredient extends BaseEntity { @Excel(name = "推荐人群") private String rec; + /** + * 审核状态 + */ + private String reviewStatus; + + public void setReviewStatus(String reviewStatus) { + this.reviewStatus = reviewStatus; + } + + public String getReviewStatus() { + return reviewStatus; + } + private Long[] recIds; private Long[] notRecIds; @@ -153,6 +169,22 @@ public class SysIngredient extends BaseEntity { this.rec = rec; } + public void setPageNum(int pageNum) { + this.pageNum = pageNum; + } + + public void setPageSize(int pageSize) { + this.pageSize = pageSize; + } + + public int getPageNum() { + return pageNum; + } + + public int getPageSize() { + return pageSize; + } + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysIngredientMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysIngredientMapper.xml index 51c7517c4..f51d79dd4 100644 --- a/stdiet-custom/src/main/resources/mapper/custom/SysIngredientMapper.xml +++ b/stdiet-custom/src/main/resources/mapper/custom/SysIngredientMapper.xml @@ -19,6 +19,7 @@ + @@ -99,6 +100,7 @@ and name like concat('%', #{name}, '%') and type = #{type} and area = #{area} + and review_status = #{reviewStatus} @@ -121,6 +123,7 @@ create_time, update_by, update_time, + review_status, #{name}, @@ -134,6 +137,7 @@ #{createTime}, #{updateBy}, #{updateTime}, + #{reviewStatus}, @@ -187,6 +191,7 @@ create_time = #{createTime}, update_by = #{updateBy}, update_time = #{updateTime}, + review_status = #{reviewStatus}, where id = #{id} diff --git a/stdiet-ui/src/views/custom/ingredient/index.vue b/stdiet-ui/src/views/custom/ingredient/index.vue index cbe64797a..6582fd130 100644 --- a/stdiet-ui/src/views/custom/ingredient/index.vue +++ b/stdiet-ui/src/views/custom/ingredient/index.vue @@ -50,6 +50,15 @@ + + + + + 搜索 重置 @@ -105,11 +114,20 @@ + + + - - - + + + @@ -207,7 +225,7 @@ - + + + + + + + + @@ -264,6 +293,8 @@ total: 0, // 食材表格数据 ingredientList: [], + // 审核状态 + reviewStatusOptions: [], // 弹出层标题 title: "", // 是否显示弹出层 @@ -283,6 +314,7 @@ area: null, notRecIds: null, recIds: null, + reviewStatus: null }, // 表单参数 form: {}, @@ -298,6 +330,9 @@ this.getDicts("cus_area").then(response => { this.areaOptions = response.data; }); + this.getDicts("cus_review_status").then(response => { + this.reviewStatusOptions = response.data; + }) listPhysicalSigns().then(response => { this.physicalSignsOptions = response.rows.map(obj => ({ dictLabel: obj.name, @@ -434,7 +469,7 @@ this.download(response.msg); }).catch(function () { }); - } + }, } }; From 55096f9e455e0890e736c66fe7b80575bff79721 Mon Sep 17 00:00:00 2001 From: huangdeliang Date: Fri, 8 Jan 2021 20:54:43 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- stdiet-admin/src/main/filters/dev/application.yml | 2 +- stdiet-admin/src/main/filters/local/application.yml | 2 +- stdiet-admin/src/main/filters/prod/application.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/stdiet-admin/src/main/filters/dev/application.yml b/stdiet-admin/src/main/filters/dev/application.yml index 1cc260e8a..f9c1e913b 100644 --- a/stdiet-admin/src/main/filters/dev/application.yml +++ b/stdiet-admin/src/main/filters/dev/application.yml @@ -83,7 +83,7 @@ spring: # 主库数据源 master: url: jdbc:mysql://localhost:3306/stdiet_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - password: S6QAUjVMFwWe + password: gzDxPaZcSiXJpi2N username: root slave: # 从数据源开关/默认关闭 diff --git a/stdiet-admin/src/main/filters/local/application.yml b/stdiet-admin/src/main/filters/local/application.yml index 3c7cc4ede..d8b94efbe 100644 --- a/stdiet-admin/src/main/filters/local/application.yml +++ b/stdiet-admin/src/main/filters/local/application.yml @@ -83,7 +83,7 @@ spring: # 主库数据源 master: url: jdbc:mysql://47.115.23.82:3306/stdiet_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - password: S6QAUjVMFwWe + password: gzDxPaZcSiXJpi2N username: root slave: # 从数据源开关/默认关闭 diff --git a/stdiet-admin/src/main/filters/prod/application.yml b/stdiet-admin/src/main/filters/prod/application.yml index 9c4701cca..f1095933f 100644 --- a/stdiet-admin/src/main/filters/prod/application.yml +++ b/stdiet-admin/src/main/filters/prod/application.yml @@ -83,7 +83,7 @@ spring: # 主库数据源 master: url: jdbc:mysql://localhost:3306/stdiet?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - password: S6QAUjVMFwWe + password: gzDxPaZcSiXJpi2N username: root slave: # 从数据源开关/默认关闭