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

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

Browse Source
This commit is contained in:
xiezhijun
2021-04-27 19:49:05 +08:00
parent bbbc4f2753 409c1e582f
commit bab4569b43
24 changed files with 312 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,6 +21,7 @@
<!-- 非持久化字段 -->
<result property="bigClassName" column="bigClassName"/>
<result property="smallClassName" column="smallClassName"/>
<association property="igdList" column="id" select="selectSysIngreditentsById"/>
</resultMap>
<resultMap type="SysDishesIngredient" id="SysDishesIngredientResult">
@ -32,7 +33,9 @@
<result property="carbonRatio" column="carbon_ratio"/>
<result property="area" column="area"/>
<result property="rec" column="rec"/>
<result property="recIdsStr" column="rec_ids"/>
<result property="notRec" column="not_rec"/>
<result property="notRecIdsStr" column="not_rec_ids"/>
<result property="cusWeight" column="cus_weight"/>
<result property="cusUnit" column="cus_unit"/>
<result property="weight" column="weight"/>
@ -47,6 +50,12 @@
<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="physical != null and physical != ''">
and id in(SELECT DISTINCT(dishes_id) FROM sys_dishes_rec WHERE physical_signs_id = #{physical})
</if>
<if test="igdName != null and igdName != ''">
and id in(SELECT DISTINCT(dishes_id) FROM sys_dishes_ingredient WHERE name like concat('%', #{igdName}, '%'))
</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>
@ -63,17 +72,17 @@
WHERE dishes_id = #{id}
) dishes
LEFT JOIN (
SELECT id, name, type, protein_ratio, fat_ratio, carbon_ratio, area, not_rec, rec
SELECT id, name, type, protein_ratio, fat_ratio, carbon_ratio, area, not_rec, not_rec_ids, rec, rec_ids
FROM sys_ingredient igd
LEFT JOIN (
SELECT ingredient_id as id, GROUP_CONCAT(name SEPARATOR ',') not_rec FROM(
SELECT ingredient_id as id, GROUP_CONCAT(name SEPARATOR ',') not_rec, GROUP_CONCAT(notRec.id SEPARATOR ',') not_rec_ids FROM(
SELECT physical_signs_id as id, ingredient_id
FROM sys_ingredient_not_rec
) notRec JOIN sys_physical_signs phy USING(id)
GROUP BY id
) notRecT USING(id)
LEFT JOIN (
SELECT ingredient_id as id, GROUP_CONCAT(name SEPARATOR ',') rec FROM(
SELECT ingredient_id as id, GROUP_CONCAT(name SEPARATOR ',') rec, GROUP_CONCAT(rec.id SEPARATOR ',') rec_ids FROM(
SELECT physical_signs_id as id, ingredient_id
FROM sys_ingredient_rec
) rec JOIN sys_physical_signs phy USING(id)
@ -175,4 +184,27 @@
select type from sys_dishes where id=#{id}
</select>
<!-- 推荐，不推荐-->
<insert id="batchInsertDishesRec">
insert into sys_dishes_rec(dishes_id, physical_signs_id) values
<foreach collection="list" separator="," item="item" index="index">
(#{item.targetId},#{item.physicalSignsId})
</foreach>
</insert>
<insert id="batchInsertDishesNotRec">
insert into sys_dishes_not_rec(dishes_id, physical_signs_id) values
<foreach collection="list" separator="," item="item" index="index">
(#{item.targetId},#{item.physicalSignsId})
</foreach>
</insert>
<delete id="deleteDishesRecByDishesId" parameterType="Long">
delete from sys_dishes_rec where dishes_id=#{dishesId}
</delete>
<delete id="deleteDishesNotRecByDishesId" parameterType="Long">
delete from sys_dishes_not_rec where dishes_id=#{dishesId}
</delete>
</mapper>

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

@ -149,14 +149,14 @@
<insert id="batchIngredientRec">
insert into sys_ingredient_rec(ingredient_id, physical_signs_id) values
<foreach collection="list" separator="," item="item" index="index">
(#{item.ingredientId},#{item.recommandId})
(#{item.targetId},#{item.physicalSignsId})
</foreach>
</insert>
<insert id="batchIngredientNotRec">
insert into sys_ingredient_not_rec(ingredient_id, physical_signs_id) values
<foreach collection="list" separator="," item="item" index="index">
(#{item.ingredientId},#{item.notRecommandId})
(#{item.targetId},#{item.physicalSignsId})
</foreach>
</insert>

20
stdiet-custom/src/main/resources/mapper/custom/SysPhysicalSignsMapper.xml
View File

@ -5,27 +5,30 @@
<mapper namespace="com.stdiet.custom.mapper.SysPhysicalSignsMapper">
<resultMap type="SysPhysicalSigns" id="SysPhysicalSignsResult">
<result property="id" column="id" />
<result property="name" column="name" />
<result property="typeId" column="type_id" />
<result property="remark" column="remark" />
<result property="id" column="id"/>
<result property="name" column="name"/>
<result property="typeId" column="type_id"/>
<result property="typeName" column="type_name"/>
<result property="remark" column="remark"/>
</resultMap>
<sql id="selectSysPhysicalSignsVo">
select id, name, type_id, remark from sys_physical_signs
SELECT name, id, sdd.dict_label AS type_name, type_id FROM sys_physical_signs
LEFT JOIN (SELECT * FROM sys_dict_data WHERE dict_type = 'cus_signs_type') AS sdd ON sdd.dict_value = type_id
</sql>
<select id="selectSysPhysicalSignsList" parameterType="SysPhysicalSigns" resultMap="SysPhysicalSignsResult">
<include refid="selectSysPhysicalSignsVo"/>
<where>
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
<if test="typeId != null "> and type_id = #{typeId}</if>
<if test="name != null and name != ''">and name like concat('%', #{name}, '%')</if>
<if test="typeId != null ">and type_id = #{typeId}</if>
</where>
ORDER BY type_id ASC
</select>
<select id="selectSysPhysicalSignsById" parameterType="Long" resultMap="SysPhysicalSignsResult">
<include refid="selectSysPhysicalSignsVo"/>
where id = #{id}
where sps.id = #{id}
</select>
<insert id="insertSysPhysicalSigns" parameterType="SysPhysicalSigns" useGeneratedKeys="true" keyProperty="id">
@ -63,4 +66,5 @@
</foreach>
</delete>
</mapper>