修改根据耳号进行查询

zhyc-module/src/main/resources/mapper/biosafety/DewormMapper.xml

@@ -35,6 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectDewormVo"/>
         <where>  
             <if test="sheepId != null "> and sheep_id = #{sheepId}</if>
+            <if test="sheepNo != null and sheepNo != ''">and bs.manage_tags like concat('%',#{sheepNo},'%')</if>
             <if test="params.beginDatetime != null and params.beginDatetime != '' and params.endDatetime != null and params.endDatetime != ''"> and datetime between #{params.beginDatetime} and #{params.endDatetime}</if>
             <if test="technical != null  and technical != ''"> and technical = #{technical}</if>
         </where>

zhyc-module/src/main/resources/mapper/biosafety/HealthMapper.xml

@@ -34,9 +34,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectHealthList" parameterType="Health" resultMap="HealthResult">
-        <include refid="selectHealthVo"/>
+        select s.id, datetime, sheep_id, usage_id, variety, sheep_type, s.gender, month_age, s.parity, breed, technical,
+        s.comment, s.update_by, s.update_time, s.create_by, s.create_time,
+        bs.manage_tags sheep_no
+        from sw_health s
+        left join bas_sheep bs on s.sheep_id = bs.id
+
         <where>  
             <if test="datetime != null "> and datetime = #{datetime}</if>
+            <if test="sheepNo != null and sheepNo != ''">and bs.manage_tags like concat('%',#{sheepNo},'%')</if>
+            <if test="params.beginDatetime != null and params.beginDatetime != '' and params.endDatetime != null and params.endDatetime != ''"> and datetime between #{params.beginDatetime} and #{params.endDatetime}</if>
             <if test="technical != null  and technical != ''"> and technical = #{technical}</if>
         </where>
         ORDER BY datetime  DESC

zhyc-module/src/main/resources/mapper/biosafety/ImmunityMapper.xml

@@ -32,10 +32,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectImmunityList" parameterType="Immunity" resultMap="ImmunityResult">
-        <include refid="selectImmunityVo"/>
+        select s.id, datetime, sheep_id, usage_id, variety, sheep_type, s.gender, month_age, s.parity, breed, technical,
+        s.comment, s.update_by, s.update_time, s.create_by, s.create_time,
+        bs.manage_tags sheep_no
+        from sw_immunity s
+        left join bas_sheep bs on s.sheep_id = bs.id
         <where>  
             <if test="sheepId != null "> and sheep_id = #{sheepId}</if>
             <if test="sheepType != null "> and sheep_type = #{sheepType}</if>
+            <if test="sheepNo != null and sheepNo != ''">and bs.manage_tags like concat('%',#{sheepNo},'%')</if>
             <if test="params.beginDatetime != null and params.beginDatetime != '' and params.endDatetime != null and params.endDatetime != ''"> and datetime between #{params.beginDatetime} and #{params.endDatetime}</if>
             <if test="technical != null  and technical != ''"> and technical = #{technical}</if>
         </where>

zhyc-module/src/main/resources/mapper/biosafety/TreatmentMapper.xml

@@ -44,9 +44,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectTreatmentList" parameterType="Treatment" resultMap="TreatmentResult">
-        <include refid="selectTreatmentVo"/>
+        select t.id, diag_id, sheep_id, variety, sheep_type, month_age, t.gender, t.parity, breed, lact_day, gest_day, datetime, disease_id, disease_pid, veterinary, usage_id,status, t.comment, t.update_by, t.update_time, t.create_by, t.create_time,
+        bs.manage_tags,
+        sd.name disease_name,
+        sd2.name disease_pname
+        from sw_treatment t
+        left join bas_sheep bs on t.sheep_id = bs.id
+        left join sw_disease sd on t.disease_id = sd.id
+        left join sw_disease sd2 on t.disease_pid = sd2.id
         <where>  
             <if test="sheepId != null "> and sheep_id = #{sheepId}</if>
+            <if test="sheepNo != null and sheepNo != ''">and bs.manage_tags like concat('%',#{sheepNo},'%')</if>
             <if test="params.beginDatetime != null and params.beginDatetime != '' and params.endDatetime != null and params.endDatetime != ''"> and datetime between #{params.beginDatetime} and #{params.endDatetime}</if>
             <if test="diseaseId != null "> and disease_id = #{diseaseId}</if>
             <if test="status != null and status !=''"> and status = #{status}</if>