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-03-25 17:27:01 +08:00
parent dffca92564 2a23b51612
commit 4fece27960
18 changed files with 226 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysIngredientMapper.java
View File

@ -61,7 +61,7 @@ public interface SysIngredientMapper {
* @param ids 需要删除的数据ID
* @return 结果
*/
int deleteSysIngredientByIds(Long[] ids);
// int deleteSysIngredientByIds(Long[] ids);
int batchIngredientRec(List<SysIngredientRec> ingredientRecList);
@ -71,9 +71,9 @@ public interface SysIngredientMapper {
int deleteIngredientNotRecByIngredientId(Long notRecId);
int deleteIngredientRecByIngredientIds(Long[] id);
// int deleteIngredientRecByIngredientIds(Long[] id);
int deleteIngredientNotRecByIngredientIds(Long[] id);
// int deleteIngredientNotRecByIngredientIds(Long[] id);
/**
* 根据食材名称查询食材信息

2
stdiet-custom/src/main/java/com/stdiet/custom/service/ISysDishesService.java
View File

@ -53,7 +53,7 @@ public interface ISysDishesService
* @param ids 需要删除的菜品ID
* @return 结果
*/
public int deleteSysDishesByIds(Long[] ids);
// public int deleteSysDishesByIds(Long[] ids);
/**
* 删除菜品信息

2
stdiet-custom/src/main/java/com/stdiet/custom/service/ISysIngredientService.java
View File

@ -49,7 +49,7 @@ public interface ISysIngredientService
* @param ids 需要删除的食材ID
* @return 结果
*/
public int deleteSysIngredientByIds(Long[] ids);
// public int deleteSysIngredientByIds(Long[] ids);
/**
* 删除食材信息

12
stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysDishesServiceImpl.java
View File

@ -107,11 +107,11 @@ public class SysDishesServiceImpl implements ISysDishesService {
* @param ids 需要删除的菜品ID
* @return 结果
*/
@Override
public int deleteSysDishesByIds(Long[] ids) {
sysDishesMapper.deleteIngredientByIds(ids);
return sysDishesMapper.deleteSysDishesByIds(ids);
}
// @Override
// public int deleteSysDishesByIds(Long[] ids) {
// sysDishesMapper.deleteIngredientByIds(ids);
// return sysDishesMapper.deleteSysDishesByIds(ids);
// }
/**
* 删除菜品信息
@ -121,7 +121,7 @@ public class SysDishesServiceImpl implements ISysDishesService {
*/
@Override
public int deleteSysDishesById(Long id) {
sysDishesMapper.deleteIngredientById(id);
// sysDishesMapper.deleteIngredientById(id);
return sysDishesMapper.deleteSysDishesById(id);
}

28
stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysIngredientServiceImpl.java
View File

@ -169,18 +169,18 @@ public class SysIngredientServiceImpl implements ISysIngredientService {
return sysIngredientMapper.updateSysIngredient(sysIngredient);
}
/**
* 批量删除食材
*
* @param ids 需要删除的食材ID
* @return 结果
*/
@Override
public int deleteSysIngredientByIds(Long[] ids) {
sysIngredientMapper.deleteIngredientRecByIngredientIds(ids);
sysIngredientMapper.deleteIngredientNotRecByIngredientIds(ids);
return sysIngredientMapper.deleteSysIngredientByIds(ids);
}
// /**
// * 批量删除食材
// *
// * @param ids 需要删除的食材ID
// * @return 结果
// */
// @Override
// public int deleteSysIngredientByIds(Long[] ids) {
// sysIngredientMapper.deleteIngredientRecByIngredientIds(ids);
// sysIngredientMapper.deleteIngredientNotRecByIngredientIds(ids);
// return sysIngredientMapper.deleteSysIngredientByIds(ids);
// }
/**
* 删除食材信息
@ -190,8 +190,8 @@ public class SysIngredientServiceImpl implements ISysIngredientService {
*/
@Override
public int deleteSysIngredientById(Long id) {
sysIngredientMapper.deleteIngredientRecByIngredientId(id);
sysIngredientMapper.deleteIngredientNotRecByIngredientId(id);
// sysIngredientMapper.deleteIngredientRecByIngredientId(id);
// sysIngredientMapper.deleteIngredientNotRecByIngredientId(id);
return sysIngredientMapper.deleteSysIngredientById(id);
}

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

@ -5,37 +5,37 @@
<mapper namespace="com.stdiet.custom.mapper.SysDishesMapper">
<resultMap type="SysDishes" id="SysDishesResult">
<result property="id" column="id" />
<result property="name" column="name" />
<result property="bigClass" column="big_class" />
<result property="smallClass" column="small_class" />
<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" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="id" column="id"/>
<result property="name" column="name"/>
<result property="bigClass" column="big_class"/>
<result property="smallClass" column="small_class"/>
<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"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<!-- 非持久化字段 -->
<result property="bigClassName" column="bigClassName" />
<result property="smallClassName" column="smallClassName" />
<result property="bigClassName" column="bigClassName"/>
<result property="smallClassName" column="smallClassName"/>
</resultMap>
<resultMap type="SysDishesIngredient" id="SysDishesIngredientResult">
<result property="id" column="id" />
<result property="name" column="name" />
<result property="type" column="type" />
<result property="proteinRatio" column="protein_ratio" />
<result property="fatRatio" column="fat_ratio" />
<result property="carbonRatio" column="carbon_ratio" />
<result property="area" column="area" />
<result property="rec" column="rec" />
<result property="notRec" column="not_rec" />
<result property="cusWeight" column="cus_weight" />
<result property="cusUnit" column="cus_unit" />
<result property="weight" column="weight" />
<result property="id" column="id"/>
<result property="name" column="name"/>
<result property="type" column="type"/>
<result property="proteinRatio" column="protein_ratio"/>
<result property="fatRatio" column="fat_ratio"/>
<result property="carbonRatio" column="carbon_ratio"/>
<result property="area" column="area"/>
<result property="rec" column="rec"/>
<result property="notRec" column="not_rec"/>
<result property="cusWeight" column="cus_weight"/>
<result property="cusUnit" column="cus_unit"/>
<result property="weight" column="weight"/>
</resultMap>
<sql id="selectSysDishesVo">
@ -45,12 +45,13 @@
<select id="selectSysDishesList" parameterType="SysDishes" resultMap="SysDishesResult">
<include refid="selectSysDishesVo"/>
<where>
<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="bigClass != null"> and big_class = #{bigClass}</if>
<if test="smallClass != null"> and small_class = #{smallClass}</if>
<if test="reviewStatus != null and type != ''"> and review_status = #{reviewStatus}</if>
<if test="isMain != null and type != ''"> and is_main = #{isMain}</if>
<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="bigClass != null">and big_class = #{bigClass}</if>
<if test="smallClass != null">and small_class = #{smallClass}</if>
<if test="reviewStatus != null and type != ''">and review_status = #{reviewStatus}</if>
<if test="isMain != null and type != ''">and is_main = #{isMain}</if>
<if test="true">and del_flag=0</if>
</where>
order by id desc
</select>
@ -82,7 +83,7 @@
</sql>
<select id="selectSysIngreditentsById" parameterType="Long" resultMap="SysDishesIngredientResult">
<include refid="selectSysIngreditentsByIdVo" >
<include refid="selectSysIngreditentsByIdVo">
<property name="id" value="#{id}"/>
</include>
</select>
@ -140,16 +141,16 @@
where id = #{id}
</update>
<delete id="deleteSysDishesById" parameterType="Long">
delete from sys_dishes where id = #{id}
</delete>
<update id="deleteSysDishesById" parameterType="Long">
update sys_dishes set del_flag=1 where id = #{id}
</update>
<delete id="deleteSysDishesByIds" parameterType="String">
delete from sys_dishes where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
<!-- <delete id="deleteSysDishesByIds" parameterType="String">-->
<!-- delete from sys_dishes where id in-->
<!-- <foreach item="id" collection="array" open="(" separator="," close=")">-->
<!-- #{id}-->
<!-- </foreach>-->
<!-- </delete>-->
<delete id="deleteIngredientById" parameterType="Long">
delete from sys_dishes_ingredient where dishes_id = #{id}
@ -163,7 +164,8 @@
</delete>
<insert id="bashInsertDishesIngredent">
insert into sys_dishes_ingredient(dishes_id, ingredient_id, ingredient_weight, cus_unit, cus_weight, remark) values
insert into sys_dishes_ingredient(dishes_id, ingredient_id, ingredient_weight, cus_unit, cus_weight, remark)
values
<foreach collection="list" separator="," item="item" index="index">
(#{item.dishesId}, #{item.ingredientId}, #{item.weight}, #{item.cusUnit}, #{item.cusWeight}, #{item.remark})
</foreach>

38
stdiet-custom/src/main/resources/mapper/custom/SysIngredientMapper.xml
View File

@ -103,6 +103,7 @@
<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>
<if test="true">and del_flag=0</if>
</where>
</select>
@ -167,19 +168,19 @@
delete from sys_ingredient_not_rec where ingredient_id=#{ingredientId}
</delete>
<delete id="deleteIngredientRecByIngredientIds" parameterType="Long">
delete from sys_ingredient_rec where ingredient_id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
<!-- <delete id="deleteIngredientRecByIngredientIds" parameterType="Long">-->
<!-- delete from sys_ingredient_rec where ingredient_id in-->
<!-- <foreach item="id" collection="array" open="(" separator="," close=")">-->
<!-- #{id}-->
<!-- </foreach>-->
<!-- </delete>-->
<delete id="deleteIngredientNotRecByIngredientIds" parameterType="String">
delete from sys_ingredient_not_rec where ingredient_id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
<!-- <delete id="deleteIngredientNotRecByIngredientIds" parameterType="String">-->
<!-- delete from sys_ingredient_not_rec where ingredient_id in-->
<!-- <foreach item="id" collection="array" open="(" separator="," close=")">-->
<!-- #{id}-->
<!-- </foreach>-->
<!-- </delete>-->
<update id="updateSysIngredient" parameterType="SysIngredient">
update sys_ingredient
@ -201,16 +202,9 @@
where id = #{id}
</update>
<delete id="deleteSysIngredientById" parameterType="Long">
delete from sys_ingredient where id = #{id}
</delete>
<delete id="deleteSysIngredientByIds" parameterType="String">
delete from sys_ingredient where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
<update id="deleteSysIngredientById" parameterType="Long">
update sys_ingredient set del_flag=1 where id = #{id}
</update>
<!-- 根据食材名称查询食材 -->
<select id="selectSysIngredientByName" parameterType="String" resultMap="SysIngredientResult">