!31 修改食材页面

Merge pull request !31 from 德仔/develop

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)

stdiet-custom/src/main/resources/mapper/custom/SysIngredientMapper.xml

@@ -19,6 +19,7 @@
         <result property="updateTime"    column="update_time"    />
         <result property="rec"    column="rec"    />
         <result property="notRec"    column="not_rec"    />
+        <result property="reviewStatus"    column="review_status"    />
     </resultMap>
 
     <sql id="selectSysIngredientVo">
@@ -99,6 +100,7 @@
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
             <if test="type != null  and type != ''"> and type = #{type}</if>
             <if test="area != null  and area != ''"> and area = #{area}</if>
+            <if test="reviewStatus != null and reviewStatus != ''"> and review_status = #{reviewStatus}</if>
         </where>
     </select>
 
@@ -121,6 +123,7 @@
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
+            <if test="reviewStatus != null">review_status,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="name != null">#{name},</if>
@@ -134,6 +137,7 @@
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
+            <if test="reviewStatus != null">#{reviewStatus},</if>
         </trim>
     </insert>
 
@@ -187,6 +191,7 @@
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="reviewStatus != null">review_status = #{reviewStatus},</if>
         </trim>
         where id = #{id}
     </update>