新增羊只，转场，转群，改耳号,改品种，改备注，体尺测量，体况评分，乳况评分，修蹄，去势初版

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

@@ -4,10 +4,11 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zhyc.module.produce.manage_sheep.mapper.ScTransGroupMapper">
 
-    <resultMap type="ScTransGroup" id="ScTransGroupResult">
+    <resultMap type="com.zhyc.module.produce.manage_sheep.domain.ScTransGroup" id="ScTransGroupResult">
         <result property="id" column="id"/>
         <result property="sheepId" column="sheep_id"/>
         <result property="manageTags" column="manageTags"/>
+        <result property="sheepTypeId" column="type_id"/>
         <result property="foldTo" column="fold_to"/>
         <result property="foldFrom" column="fold_from"/>
         <result property="reason" column="reason"/>
@@ -23,7 +24,7 @@
     <sql id="selectScTransGroupVo">
         SELECT tg.id,
                tg.sheep_id,
-               s.manage_tags AS manageTags,
+               s.manage_tags          AS manageTags,
                tg.fold_to,
                tg.fold_from,
                tg.reason,
@@ -35,9 +36,12 @@
                tg.create_by,
                tg.create_time,
                sf_from.sheepfold_name AS foldFromName,
-               sf_to.sheepfold_name   AS foldToName
+               sf_to.sheepfold_name   AS foldToName,
+               st.id                  AS sheepTypeId,
+               st.name                AS sheepTypeName
         FROM sc_trans_group tg
                  LEFT JOIN bas_sheep s ON tg.sheep_id = s.id
+                 LEFT JOIN bas_sheep_type st ON s.type_id = st.id
                  LEFT JOIN da_sheepfold sf_from ON tg.fold_from = sf_from.id
                  LEFT JOIN da_sheepfold sf_to ON tg.fold_to = sf_to.id
                  LEFT JOIN bas_sheep_variety bv ON tg.variety_id = bv.id
@@ -55,7 +59,7 @@
             <if test="status != null">and status = #{status}</if>
             <if test="varietyId != null">and tg.variety_id = #{varietyId}</if>
             <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''">
-                and create_time between #{params.beginCreateTime} and #{params.endCreateTime}
+                and tg.create_time between #{params.beginCreateTime} and #{params.endCreateTime}
             </if>
         </where>
     </select>