修蹄，去势，转群的新增功能的完善

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

@@ -7,6 +7,7 @@
     <resultMap type="ScTransGroup" id="ScTransGroupResult">
         <result property="id" column="id"/>
         <result property="sheepId" column="sheep_id"/>
+        <result property="manageTags" column="manageTags"/>
         <result property="foldTo" column="fold_to"/>
         <result property="foldFrom" column="fold_from"/>
         <result property="reason" column="reason"/>
@@ -22,6 +23,7 @@
     <sql id="selectScTransGroupVo">
         SELECT tg.id,
                tg.sheep_id,
+               s.manage_tags AS manageTags,
                tg.fold_to,
                tg.fold_from,
                tg.reason,
@@ -35,6 +37,7 @@
                sf_from.sheepfold_name AS foldFromName,
                sf_to.sheepfold_name   AS foldToName
         FROM sc_trans_group tg
+                 LEFT JOIN bas_sheep s ON tg.sheep_id = s.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
@@ -44,6 +47,9 @@
         <include refid="selectScTransGroupVo"/>
         <where>
             <if test="sheepId != null">and sheep_id = #{sheepId}</if>
+            <if test="manageTags != null and manageTags != ''">
+                and s.manage_tags like concat('%', #{manageTags}, '%')
+            </if>
             <if test="foldTo != null and foldTo != ''">and fold_to = #{foldTo}</if>
             <if test="foldFrom != null and foldFrom != ''">and fold_from = #{foldFrom}</if>
             <if test="status != null">and status = #{status}</if>