部分bug修改，创建日期精确到几点几分，日期放最前面，转场优化

zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScChangeVarietyMapper.xml

@@ -8,6 +8,8 @@
         <result property="id" column="id"/>
         <result property="sheepId" column="sheep_id"/>
         <result property="manageTags" column="manage_tags"/>
+        <result property="sheepfoldName" column="sheepfold_name"/>
+        <result property="eventType" column="event_type"/>
         <result property="varietyOld" column="variety_old"/>
         <result property="varietyNew" column="variety_new"/>
         <result property="comment" column="comment"/>
@@ -18,7 +20,9 @@
     <sql id="selectScChangeVarietyVo">
         select scv.id,
                scv.sheep_id,
-               bs.manage_tags as manage_tags,
+               bs.manage_tags    as manage_tags,
+               sf.sheepfold_name as sheepfold_name,
+               '改品种'          as event_type,
                scv.variety_old,
                scv.variety_new,
                scv.comment,
@@ -26,6 +30,7 @@
                scv.create_time
         from sc_change_variety scv
                  left join bas_sheep bs on scv.sheep_id = bs.id
+                 left join da_sheepfold sf on bs.sheepfold_id = sf.id
     </sql>
 
     <select id="selectScChangeVarietyList" parameterType="ScChangeVariety" resultMap="ScChangeVarietyResult">
@@ -35,6 +40,7 @@
             <if test="manageTags != null and manageTags != ''">
                 and bs.manage_tags like concat('%', #{manageTags}, '%')
             </if>
+            <if test="sheepfoldId != null">and bs.sheepfold_id = #{sheepfoldId}</if>
             <if test="varietyOld != null and varietyOld != ''">
                 and scv.variety_old like concat('%', #{varietyOld}, '%')
             </if>