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 @@
+
+
+
+ {{scope.row.reviewStatus === 'yes' ? '已审核':'未审核'}}
+
+
+
-
-
-
+
+
+
@@ -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 () {
});
- }
+ },
}
};