From f6c0d66484330a909cb4c79222d5c9595bfe8368 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BC=82=E6=B3=8A?= <1913856125@qq.com>
Date: Tue, 13 Jan 2026 22:53:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E7=89=A9=E5=AE=89=E5=85=A8=E7=BE=8A?=
 =?UTF-8?q?=E5=8F=AA=E5=A4=9A=E8=80=B3=E5=8F=B7=E6=A8=A1=E7=B3=8A=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/zhyc/module/biosafety/domain/Deworm.java  |  2 ++
 .../com/zhyc/module/biosafety/domain/Diagnosis.java    |  1 +
 .../java/com/zhyc/module/biosafety/domain/Health.java  |  2 ++
 .../com/zhyc/module/biosafety/domain/Immunity.java     |  2 ++
 .../zhyc/module/biosafety/domain/QuarantineReport.java |  2 ++
 .../com/zhyc/module/biosafety/domain/Treatment.java    |  1 +
 .../biosafety/service/impl/DewormServiceImpl.java      |  9 +++++++++
 .../biosafety/service/impl/DiagnosisServiceImpl.java   | 10 ++++++++++
 .../biosafety/service/impl/HealthServiceImpl.java      |  9 +++++++++
 .../biosafety/service/impl/ImmunityServiceImpl.java    |  9 +++++++++
 .../service/impl/QuarantineReportServiceImpl.java      |  9 +++++++++
 .../biosafety/service/impl/TreatmentServiceImpl.java   |  9 +++++++++
 .../main/resources/mapper/biosafety/DewormMapper.xml   |  8 ++++++++
 .../resources/mapper/biosafety/DiagnosisMapper.xml     |  7 +++++++
 .../main/resources/mapper/biosafety/HealthMapper.xml   |  8 ++++++++
 .../main/resources/mapper/biosafety/ImmunityMapper.xml |  8 ++++++++
 .../mapper/biosafety/QuarantineReportMapper.xml        |  8 ++++++++
 .../resources/mapper/biosafety/TreatmentMapper.xml     |  8 ++++++++
 18 files changed, 112 insertions(+)

diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Deworm.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Deworm.java
index a062db2..dfbf2fa 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Deworm.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Deworm.java
@@ -34,6 +34,8 @@ public class Deworm extends BaseEntity
     /** 羊只id */
     @Excel(name = "羊只耳号")
     private String sheepNo;
+    private String[] sheepNos;
+
     @Excel(name = "品种")
     private String variety;
     @Excel(name = "羊只类别")
diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Diagnosis.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Diagnosis.java
index b394a6d..c594ce6 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Diagnosis.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Diagnosis.java
@@ -37,6 +37,7 @@ public class Diagnosis extends BaseEntity
     /** 羊只id */
     @Excel(name = "羊只耳号")
     private String sheepNo;
+    private String[] sheepNos;
 
     private Long sheepId;
 
diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Health.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Health.java
index 1a2c69d..f61fd2a 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Health.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Health.java
@@ -37,6 +37,8 @@ public class Health extends BaseEntity
     /** 羊只id */
     @Excel(name = "羊只耳号")
     private String sheepNo;
+    private String[] sheepNos;
+
     @Excel(name = "品种")
     private String variety;
     @Excel(name = "羊只类别")
diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Immunity.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Immunity.java
index ea3fe8b..062069f 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Immunity.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Immunity.java
@@ -36,6 +36,8 @@ public class Immunity extends BaseEntity
     /** 羊只id */
     @Excel(name = "羊只耳号")
     private String sheepNo;
+    private String[] sheepNos;
+
     @Excel(name = "品种")
 
     private String variety;
diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/QuarantineReport.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/QuarantineReport.java
index 665c4c3..73287f9 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/QuarantineReport.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/QuarantineReport.java
@@ -36,6 +36,8 @@ public class QuarantineReport extends BaseEntity
 
     @Excel(name = "羊只耳号")
     private String sheepNo;
+    private String[] sheepNos;
+
     @Excel(name = "羊只类别")
     private String sheepType;
     @Excel(name = "羊只性别")
diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Treatment.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Treatment.java
index 2fc778f..ed9c717 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Treatment.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Treatment.java
@@ -32,6 +32,7 @@ public class Treatment extends BaseEntity
     /** 羊只耳号 */
     @Excel(name = "羊只耳号")
     private String sheepNo;
+    private String[] sheepNos;
 
     private Long sheepId;
 //    用于批量新增
diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DewormServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DewormServiceImpl.java
index 6dfa036..d1d9502 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DewormServiceImpl.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DewormServiceImpl.java
@@ -59,6 +59,15 @@ public class DewormServiceImpl implements IDewormService
     @Override
     public List<Deworm> selectDewormList(Deworm deworm)
     {
+        String[] sheepNos = null;
+        if (deworm.getSheepNo() != null && !deworm.getSheepNo().isEmpty()) {
+            if (deworm.getSheepNo().contains(",")) {
+                sheepNos = deworm.getSheepNo().split(",");
+            } else {
+               sheepNos = new String[]{deworm.getSheepNo()};
+            }
+        }
+        deworm.setSheepNos(sheepNos);
         return dewormMapper.selectDewormList(deworm);
     }
 
diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DiagnosisServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DiagnosisServiceImpl.java
index 8447684..ac68499 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DiagnosisServiceImpl.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DiagnosisServiceImpl.java
@@ -49,6 +49,7 @@ public class DiagnosisServiceImpl implements IDiagnosisService
     @Override
     public Diagnosis selectDiagnosisById(Long id)
     {
+
         return diagnosisMapper.selectDiagnosisById(id);
     }
 
@@ -61,6 +62,15 @@ public class DiagnosisServiceImpl implements IDiagnosisService
     @Override
     public List<Diagnosis> selectDiagnosisList(Diagnosis diagnosis)
     {
+        String[] sheepNos = null;
+        if (diagnosis.getSheepNo() != null && !diagnosis.getSheepNo().isEmpty()) {
+            if (diagnosis.getSheepNo().contains(",")) {
+                sheepNos = diagnosis.getSheepNo().split(",");
+            } else {
+                sheepNos = new String[]{diagnosis.getSheepNo()};
+            }
+        }
+        diagnosis.setSheepNos(sheepNos);
         return diagnosisMapper.selectDiagnosisList(diagnosis);
     }
 
diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/HealthServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/HealthServiceImpl.java
index d7170bd..80140cf 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/HealthServiceImpl.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/HealthServiceImpl.java
@@ -64,6 +64,15 @@ public class HealthServiceImpl implements IHealthService
     @Override
     public List<Health> selectHealthList(Health health)
     {
+        String[] sheepNos = null;
+        if (health.getSheepNo() != null && !health.getSheepNo().isEmpty()) {
+            if (health.getSheepNo().contains(",")) {
+                sheepNos = health.getSheepNo().split(",");
+            } else {
+                sheepNos = new String[]{health.getSheepNo()};
+            }
+        }
+        health.setSheepNos(sheepNos);
         return healthMapper.selectHealthList(health);
     }
 
diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/ImmunityServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/ImmunityServiceImpl.java
index 2ec4e0f..61af3b2 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/ImmunityServiceImpl.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/ImmunityServiceImpl.java
@@ -63,6 +63,15 @@ public class ImmunityServiceImpl implements IImmunityService
     @Override
     public List<Immunity> selectImmunityList(Immunity immunity)
     {
+        String[] sheepNos = null;
+        if (immunity.getSheepNo() != null && !immunity.getSheepNo().isEmpty()) {
+            if (immunity.getSheepNo().contains(",")) {
+                sheepNos = immunity.getSheepNo().split(",");
+            } else {
+                sheepNos = new String[]{immunity.getSheepNo()};
+            }
+        }
+        immunity.setSheepNos(sheepNos);
         return immunityMapper.selectImmunityList(immunity);
     }
 
diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/QuarantineReportServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/QuarantineReportServiceImpl.java
index ce4fa2f..ae6b728 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/QuarantineReportServiceImpl.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/QuarantineReportServiceImpl.java
@@ -48,6 +48,15 @@ public class QuarantineReportServiceImpl implements IQuarantineReportService
     @Override
     public List<QuarantineReport> selectQuarantineReportList(QuarantineReport quarantineReport)
     {
+        String[] sheepNos = null;
+        if (quarantineReport.getSheepNo() != null && !quarantineReport.getSheepNo().isEmpty()) {
+            if (quarantineReport.getSheepNo().contains(",")) {
+                sheepNos = quarantineReport.getSheepNo().split(",");
+            } else {
+                sheepNos = new String[]{quarantineReport.getSheepNo()};
+            }
+        }
+        quarantineReport.setSheepNos(sheepNos);
         return quarantineReportMapper.selectQuarantineReportList(quarantineReport);
     }
 
diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/TreatmentServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/TreatmentServiceImpl.java
index da29233..293fdff 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/TreatmentServiceImpl.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/TreatmentServiceImpl.java
@@ -67,6 +67,15 @@ public class TreatmentServiceImpl implements ITreatmentService
     @Override
     public List<Treatment> selectTreatmentList(Treatment treatment)
     {
+        String[] sheepNos = null;
+        if (treatment.getSheepNo() != null && !treatment.getSheepNo().isEmpty()) {
+            if (treatment.getSheepNo().contains(",")) {
+                sheepNos = treatment.getSheepNo().split(",");
+            } else {
+                sheepNos = new String[]{treatment.getSheepNo()};
+            }
+        }
+        treatment.setSheepNos(sheepNos);
         return treatmentMapper.selectTreatmentList(treatment);
     }
 
diff --git a/zhyc-module/src/main/resources/mapper/biosafety/DewormMapper.xml b/zhyc-module/src/main/resources/mapper/biosafety/DewormMapper.xml
index 7ac6e53..f15b440 100644
--- a/zhyc-module/src/main/resources/mapper/biosafety/DewormMapper.xml
+++ b/zhyc-module/src/main/resources/mapper/biosafety/DewormMapper.xml
@@ -36,6 +36,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <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="sheepNos != null and sheepNos.length > 0">
+                AND (
+                <foreach collection="sheepNos" item="item" separator=" OR " open="" close="">
+                    bs.manage_tags LIKE CONCAT('%', #{item}, '%')
+                </foreach>
+                )
+            </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>
diff --git a/zhyc-module/src/main/resources/mapper/biosafety/DiagnosisMapper.xml b/zhyc-module/src/main/resources/mapper/biosafety/DiagnosisMapper.xml
index 7786273..11ec16b 100644
--- a/zhyc-module/src/main/resources/mapper/biosafety/DiagnosisMapper.xml
+++ b/zhyc-module/src/main/resources/mapper/biosafety/DiagnosisMapper.xml
@@ -45,6 +45,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="sheepId != null "> and sd.sheep_id = #{sheepId}</if>
             <if test="sheepNo != null"> and sf.bs_manage_tags like concat('%', #{sheepNo}, '%')</if>
+            <if test="sheepNos != null and sheepNos.length > 0">
+                AND (
+                <foreach collection="sheepNos" item="item" separator=" OR " open="" close="">
+                    bs.manage_tags LIKE CONCAT('%', #{item}, '%')
+                </foreach>
+                )
+            </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="diseasePid != null "> and disease_pid = #{diseasePid}</if>
             <if test="diseaseId != null "> and disease_id = #{diseaseId}</if>
diff --git a/zhyc-module/src/main/resources/mapper/biosafety/HealthMapper.xml b/zhyc-module/src/main/resources/mapper/biosafety/HealthMapper.xml
index 8c520e0..c769afb 100644
--- a/zhyc-module/src/main/resources/mapper/biosafety/HealthMapper.xml
+++ b/zhyc-module/src/main/resources/mapper/biosafety/HealthMapper.xml
@@ -43,6 +43,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <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="sheepNos != null and sheepNos.length > 0">
+                AND (
+                <foreach collection="sheepNos" item="item" separator=" OR " open="" close="">
+                    bs.manage_tags LIKE CONCAT('%', #{item}, '%')
+                </foreach>
+                )
+            </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>
diff --git a/zhyc-module/src/main/resources/mapper/biosafety/ImmunityMapper.xml b/zhyc-module/src/main/resources/mapper/biosafety/ImmunityMapper.xml
index c0ac758..4a27ef6 100644
--- a/zhyc-module/src/main/resources/mapper/biosafety/ImmunityMapper.xml
+++ b/zhyc-module/src/main/resources/mapper/biosafety/ImmunityMapper.xml
@@ -41,6 +41,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="sheepNos != null and sheepNos.length > 0">
+                AND (
+                <foreach collection="sheepNos" item="item" separator=" OR " open="" close="">
+                    bs.manage_tags LIKE CONCAT('%', #{item}, '%')
+                </foreach>
+                )
+            </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>
diff --git a/zhyc-module/src/main/resources/mapper/biosafety/QuarantineReportMapper.xml b/zhyc-module/src/main/resources/mapper/biosafety/QuarantineReportMapper.xml
index 748148e..6d18f13 100644
--- a/zhyc-module/src/main/resources/mapper/biosafety/QuarantineReportMapper.xml
+++ b/zhyc-module/src/main/resources/mapper/biosafety/QuarantineReportMapper.xml
@@ -45,7 +45,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectQuarantineReportVo"/>
         <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="sheepNos != null and sheepNos.length > 0">
+                AND (
+                <foreach collection="sheepNos" item="item" separator=" OR " open="" close="">
+                    bs.manage_tags LIKE CONCAT('%', #{item}, '%')
+                </foreach>
+                )
+            </if>
             <if test="quarItem != null "> and quar_item = #{quarItem}</if>
             <if test="sampleType != null "> and sample_type = #{sampleType}</if>
             <if test="sampler != null  and sampler != ''"> and sampler like concat('%',#{sampler},'%') </if>
diff --git a/zhyc-module/src/main/resources/mapper/biosafety/TreatmentMapper.xml b/zhyc-module/src/main/resources/mapper/biosafety/TreatmentMapper.xml
index a6dad45..b02ab4a 100644
--- a/zhyc-module/src/main/resources/mapper/biosafety/TreatmentMapper.xml
+++ b/zhyc-module/src/main/resources/mapper/biosafety/TreatmentMapper.xml
@@ -55,6 +55,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <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="sheepNos != null and sheepNos.length > 0">
+                AND (
+                <foreach collection="sheepNos" item="item" separator=" OR " open="" close="">
+                    bs.manage_tags LIKE CONCAT('%', #{item}, '%')
+                </foreach>
+                )
+            </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>