去掉supermarket_material表
This commit is contained in:
parent
603537b983
commit
19007047c9
|
|
@ -57,7 +57,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
<select id="selectCookMaterialList" parameterType="com.bonus.canteen.core.cook.domain.CookMaterial" resultMap="CookMaterialResult">
|
<select id="selectCookMaterialList" parameterType="com.bonus.canteen.core.cook.domain.CookMaterial" resultMap="CookMaterialResult">
|
||||||
<include refid="selectCookMaterialVo"/>
|
<include refid="selectCookMaterialVo"/>
|
||||||
<where>
|
<where>
|
||||||
cm.goods_type = 1
|
|
||||||
<if test="searchValue != null and searchValue != ''">
|
<if test="searchValue != null and searchValue != ''">
|
||||||
and (cm.material_name like concat('%', #{searchValue}, '%')
|
and (cm.material_name like concat('%', #{searchValue}, '%')
|
||||||
or cm.material_code like concat('%', #{searchValue}, '%'))
|
or cm.material_code like concat('%', #{searchValue}, '%'))
|
||||||
|
|
@ -75,6 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
<if test="nutritionId != null "> and cm.nutrition_id = #{nutritionId}</if>
|
<if test="nutritionId != null "> and cm.nutrition_id = #{nutritionId}</if>
|
||||||
<if test="materialTypeId != null "> and cm.material_type_id = #{materialTypeId}</if>
|
<if test="materialTypeId != null "> and cm.material_type_id = #{materialTypeId}</if>
|
||||||
<if test="nutritionTypeId != null and nutritionTypeId != ''"> and cm.nutrition_type_id = #{nutritionTypeId}</if>
|
<if test="nutritionTypeId != null and nutritionTypeId != ''"> and cm.nutrition_type_id = #{nutritionTypeId}</if>
|
||||||
|
<if test="goodsType != null "> and cm.goods_type = #{goodsType}</if>
|
||||||
<if test="barCode != null and barCode != ''"> and cm.bar_code = #{barCode}</if>
|
<if test="barCode != null and barCode != ''"> and cm.bar_code = #{barCode}</if>
|
||||||
<if test="unitId != null "> and cm.unit_id = #{unitId}</if>
|
<if test="unitId != null "> and cm.unit_id = #{unitId}</if>
|
||||||
<if test="salePrice != null "> and cm.sale_price = #{salePrice}</if>
|
<if test="salePrice != null "> and cm.sale_price = #{salePrice}</if>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue