Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj

Browse Source
This commit is contained in:
xiezhijun
2021-01-23 22:11:58 +08:00
parent c4fe017d4d 25de0afa3f
commit ace8a536cf
8 changed files with 653 additions and 543 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
stdiet-custom/src/main/java/com/stdiet/custom/domain/SysDishes.java
View File

@@ -32,8 +32,18 @@ public class SysDishes extends BaseEntity
@Excel(name = "做法")
private String methods;
private Integer isMain;
private String reviewStatus;
public Integer getIsMain() {
return isMain;
}
public void setIsMain(Integer isMain) {
this.isMain = isMain;
}
public void setReviewStatus(String reviewStatus) {
this.reviewStatus = reviewStatus;
}

7
stdiet-custom/src/main/resources/mapper/custom/SysDishesMapper.xml
View File

@@ -8,6 +8,7 @@
<result property="id" column="id" />
<result property="name" column="name" />
<result property="type" column="type" />
<result property="isMain" column="is_main" />
<result property="methods" column="methods" />
<result property="reviewStatus" column="review_status" />
<result property="createBy" column="create_by" />
@@ -32,7 +33,7 @@
</resultMap>
<sql id="selectSysDishesVo">
select id, name, type, methods, create_by, create_time, update_by, update_time, review_status from sys_dishes
select id, name, type, is_main, methods, create_by, create_time, update_by, update_time, review_status from sys_dishes
</sql>
<select id="selectSysDishesList" parameterType="SysDishes" resultMap="SysDishesResult">
@@ -41,6 +42,7 @@
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
<if test="type != null and type != ''"> and FIND_IN_SET(#{type}, type)</if>
<if test="reviewStatus != null and type != ''"> and review_status = #{reviewStatus}</if>
<if test="isMain != null and type != ''"> and is_main = #{isMain}</if>
</where>
</select>
@@ -86,6 +88,7 @@
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="name != null">name,</if>
<if test="type != null">type,</if>
<if test="isMain != null">is_main,</if>
<if test="methods != null">methods,</if>
<if test="createBy != null">create_by,</if>
<if test="reviewStatus != null">review_status</if>
@@ -96,6 +99,7 @@
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="name != null">#{name},</if>
<if test="type != null">#{type},</if>
<if test="isMain != null">#{isMain},</if>
<if test="methods != null">#{methods},</if>
<if test="createBy != null">#{createBy},</if>
<if test="reviewStatus != null">#{reviewStatus}</if>
@@ -110,6 +114,7 @@
<trim prefix="SET" suffixOverrides=",">
<if test="name != null">name = #{name},</if>
<if test="type != null">type = #{type},</if>
<if test="isMain != null">is_main = #{isMain},</if>
<if test="methods != null">methods = #{methods},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="reviewStatus != null">review_status = #{reviewStatus},</if>