完成食材管理页面

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

@@ -17,10 +17,27 @@
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
+        <result property="rec"    column="rec"    />
+        <result property="notRec"    column="not_rec"    />
     </resultMap>
 
     <sql id="selectSysIngredientVo">
-        select id, name, type, protein_ratio, fat_ratio, carbon_ratio, area, remark, create_by, create_time, update_by, update_time from sys_ingredient
+--         select id, name, type, protein_ratio, fat_ratio, carbon_ratio, area, remark, create_by, create_time, update_by, update_time from sys_ingredient
+        SELECT * FROM sys_ingredient igd
+            LEFT JOIN (
+            SELECT ingredient_id as id, GROUP_CONCAT(name SEPARATOR ',') not_rec 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 physical_signs_id as id, ingredient_id
+            FROM sys_ingredient_rec
+            ) rec JOIN sys_physical_signs phy USING(id)
+            GROUP BY id) recT
+            USING(id)
     </sql>
 
     <select id="selectSysIngredientList" parameterType="SysIngredient" resultMap="SysIngredientResult">
@@ -68,14 +85,14 @@
     </insert>
 
     <insert id="batchIngredientRec" >
-        insert into sys_ingredient_rec(ingredient_id, rec_id) values
+        insert into sys_ingredient_rec(ingredient_id, physical_signs_id) values
         <foreach collection="list" separator="," item="item" index="index">
             (#{item.ingredientId},#{item.recommandId})
         </foreach>
     </insert>
 
     <insert id="batchIngredientNotRec" >
-        insert into sys_ingredient_not_rec(ingredient_id, not_rec_id) values
+        insert into sys_ingredient_not_rec(ingredient_id, physical_signs_id) values
         <foreach collection="list" separator="," item="item" index="index">
             (#{item.ingredientId},#{item.notRecommandId})
         </foreach>

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

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<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"    />
+    </resultMap>
+
+    <sql id="selectSysPhysicalSignsVo">
+        select id, name, type_id, remark from sys_physical_signs
+    </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>
+        </where>
+    </select>
+
+    <select id="selectSysPhysicalSignsById" parameterType="Long" resultMap="SysPhysicalSignsResult">
+        <include refid="selectSysPhysicalSignsVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertSysPhysicalSigns" parameterType="SysPhysicalSigns" useGeneratedKeys="true" keyProperty="id">
+        insert into sys_physical_signs
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="name != null">name,</if>
+            <if test="typeId != null">type_id,</if>
+            <if test="remark != null">remark,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="name != null">#{name},</if>
+            <if test="typeId != null">#{typeId},</if>
+            <if test="remark != null">#{remark},</if>
+        </trim>
+    </insert>
+
+    <update id="updateSysPhysicalSigns" parameterType="SysPhysicalSigns">
+        update sys_physical_signs
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="name != null">name = #{name},</if>
+            <if test="typeId != null">type_id = #{typeId},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSysPhysicalSignsById" parameterType="Long">
+        delete from sys_physical_signs where id = #{id}
+    </delete>
+
+    <delete id="deleteSysPhysicalSignsByIds" parameterType="String">
+        delete from sys_physical_signs where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+</mapper>