体尺测量，体况评分，乳房评分缺失字段的添加，改品种页面展示原品种

zhyc-module/src/main/resources/mapper/produce/bodyManage/ScBreastRatingMapper.xml

@@ -8,6 +8,12 @@
         <result property="id" column="id"/>
         <result property="sheepId" column="sheep_id"/>
         <result property="manageTags" column="manageTags"/>
+        <result property="varietyId" column="varietyId"/>
+        <result property="varietyName" column="varietyName"/>
+        <result property="eventType" column="event_type"/>
+        <result property="eventDate" column="event_date"/>
+        <result property="sheepfoldId" column="sheepfoldId"/>
+        <result property="sheepfoldName" column="sheepfoldName"/>
         <result property="depth" column="depth"/>
         <result property="length" column="length"/>
         <result property="position" column="position"/>
@@ -22,9 +28,17 @@
 
     <sql id="selectScBreastRatingVo">
         select sbr.*,
-               bs.manage_tags as manageTags
+               bs.manage_tags    as manageTags,
+               bsv.id            as varietyId,
+               bsv.variety       as varietyName,
+               '乳房评分'        as event_type,
+               sf.id             as sheepfoldId,
+               sf.sheepfold_name as sheepfoldName,
+               sbr.event_date
         from sc_breast_rating sbr
                  left join bas_sheep bs on sbr.sheep_id = bs.id
+                 left join bas_sheep_variety bsv on bs.variety_id = bsv.id
+                 left join da_sheepfold sf on bs.sheepfold_id = sf.id
     </sql>
 
     <select id="selectScBreastRatingList" parameterType="ScBreastRating" resultMap="ScBreastRatingResult">
@@ -33,6 +47,11 @@
             <if test="manageTags != null and manageTags != ''">
                 and bs.manage_tags like concat('%', #{manageTags}, '%')
             </if>
+            <if test="varietyId != null">and bsv.id = #{varietyId}</if>
+            <if test="sheepfoldId != null">and sf.id = #{sheepfoldId}</if>
+            <if test="params.beginEventDate != null and params.endEventDate != null">
+                and sbr.event_date between #{params.beginEventDate} and #{params.endEventDate}
+            </if>
             <if test="params.beginCreateTime != null and params.endCreateTime != null">
                 and sbr.create_time between #{params.beginCreateTime} and #{params.endCreateTime}
             </if>
@@ -48,6 +67,7 @@
         insert into sc_breast_rating
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="sheepId != null">sheep_id,</if>
+            <if test="eventDate != null">event_date,</if>
             <if test="depth != null">depth,</if>
             <if test="length != null">length,</if>
             <if test="position != null">position,</if>
@@ -61,6 +81,7 @@
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="sheepId != null">#{sheepId},</if>
+            <if test="eventDate != null">#{eventDate},</if>
             <if test="depth != null">#{depth},</if>
             <if test="length != null">#{length},</if>
             <if test="position != null">#{position},</if>
@@ -78,6 +99,7 @@
         update sc_breast_rating
         <trim prefix="SET" suffixOverrides=",">
             <if test="sheepId != null">sheep_id = #{sheepId},</if>
+            <if test="eventDate != null">event_date = #{eventDate},</if>
             <if test="depth != null">depth = #{depth},</if>
             <if test="length != null">length = #{length},</if>
             <if test="position != null">position = #{position},</if>