From 7d721071445730e519a8e807be1b6c5ae82371ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BC=82=E6=B3=8A?= <1913856125@qq.com>
Date: Thu, 26 Feb 2026 15:37:45 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=94=9F=E7=89=A9=E5=AE=89=E5=85=A8?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-druid.yml  |  6 +-
 .../zhyc/module/biosafety/domain/Deworm.java  |  1 +
 .../module/biosafety/domain/Diagnosis.java    |  3 +-
 .../module/biosafety/domain/Disinfect.java    |  7 +-
 .../zhyc/module/biosafety/domain/Health.java  |  3 +-
 .../module/biosafety/domain/Immunity.java     |  3 +-
 .../biosafety/domain/SwMedicineUsage.java     |  1 +
 .../module/biosafety/domain/Treatment.java    |  1 +
 .../biosafety/enums/DisinfectionMethod.java   | 74 +++++++++++++++++++
 .../common/controller/UserPostController.java |  4 +-
 .../mapper/biosafety/DewormMapper.xml         |  7 ++
 .../mapper/biosafety/DiagnosisMapper.xml      |  9 ++-
 .../mapper/biosafety/DisinfectMapper.xml      | 48 ++++++------
 .../mapper/biosafety/HealthMapper.xml         |  7 ++
 .../mapper/biosafety/ImmunityMapper.xml       |  9 ++-
 .../biosafety/QuarantineReportMapper.xml      |  9 ++-
 .../mapper/biosafety/SwMedicineMapper.xml     |  2 +-
 .../biosafety/SwMedicineUsageMapper.xml       |  8 +-
 .../mapper/biosafety/TreatmentMapper.xml      |  9 ++-
 .../resources/mapper/common/UserMapper.xml    | 26 ++++++-
 20 files changed, 196 insertions(+), 41 deletions(-)
 create mode 100644 zhyc-module/src/main/java/com/zhyc/module/biosafety/enums/DisinfectionMethod.java

diff --git a/zhyc-admin/src/main/resources/application-druid.yml b/zhyc-admin/src/main/resources/application-druid.yml
index 3c517de..2351abb 100644
--- a/zhyc-admin/src/main/resources/application-druid.yml
+++ b/zhyc-admin/src/main/resources/application-druid.yml
@@ -6,9 +6,9 @@ spring:
         druid:
             # 主库数据源
             master:
-#                url: jdbc:mysql://localhost:3306/zhyc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-#                username: root
-#                password: 123456
+#                url: jdbc:mysql://146.56.214.124:3306/zhyc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#                username: zhyc
+#                password: zhyc1234
                 url: jdbc:mysql://118.182.97.76:3306/zhyc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: zhyc
                 password: yszh123
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 235fbac..af37c87 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
@@ -26,6 +26,7 @@ public class Deworm extends BaseEntity
 
     /** $column.columnComment */
     private Long id;
+    private Long[] ids;
 
     private Long sheepId;
 
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 cffaa39..13a5417 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
@@ -26,9 +26,10 @@ public class Diagnosis extends BaseEntity
 
     /** $column.columnComment */
     private Long id;
+    private Long[] ids;
 
     /** 治疗记录id */
-    @Excel(name = "治疗记录")
+//    @Excel(name = "治疗记录")
     private Long treatId;
     private Integer[] treatIds;
     /** 时间日期 */
diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Disinfect.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Disinfect.java
index 6d24d82..b5f245a 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Disinfect.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Disinfect.java
@@ -25,6 +25,7 @@ public class Disinfect extends BaseEntity
 
     /** id */
     private Long id;
+    private Long[] ids;
 
     /** 羊舍id */
     @Excel(name = "羊舍")
@@ -43,12 +44,12 @@ public class Disinfect extends BaseEntity
     @Excel(name = "技术员")
     private String technician;
 
-    /** 消毒方式 */
-    @Excel(name = "消毒方式")
+    /** 消毒方式：0喷雾 1撒布 2浸泡 3熏蒸 4其他 */
+    @Excel(name = "消毒方式", readConverterExp = "0=喷雾,1=撒布,2=浸泡,3=熏蒸,4=其他")
     private String way;
 
     /** 药品使用记录id */
-    @Excel(name = "药品使用记录id")
+//    @Excel(name = "药品使用记录id")
     private Integer usageId;
 
     /** 比例 */
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 320c014..d973c29 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
@@ -22,6 +22,7 @@ public class Health extends BaseEntity
 
     /** $column.columnComment */
     private Long id;
+    private Long[] ids;
 
     /** 保健日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -57,7 +58,7 @@ public class Health extends BaseEntity
     private Long parity;
 
     /** 用药记录 */
-    @Excel(name = "用药记录")
+//    @Excel(name = "用药记录")
     private Integer usageId;
 
 
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 9b399ee..1cd4d9d 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
@@ -26,6 +26,7 @@ public class Immunity extends BaseEntity
 
     /** $column.columnComment */
     private Long id;
+    private Long[] ids;
 
     /** 羊只id */
     private Long sheepId;
@@ -59,7 +60,7 @@ public class Immunity extends BaseEntity
     private Long parity;
 
     /** 使用记录 */
-    @Excel(name = "使用记录")
+//    @Excel(name = "使用记录")
     private Integer usageId;
 
 
diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsage.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsage.java
index 8210e74..b668fef 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsage.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsage.java
@@ -28,6 +28,7 @@ public class SwMedicineUsage extends BaseEntity
 
     /** id */
     private Integer id;
+    private Long[] ids;
 
     /** 使用名称 */
     @Excel(name = "使用名称",width = 20, needMerge = true)
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 174889f..1173673 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
@@ -26,6 +26,7 @@ public class Treatment extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     private Long id;
+    private Long[] ids;
 
     /** 诊疗记录id */
     private Long diagId;
diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/enums/DisinfectionMethod.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/enums/DisinfectionMethod.java
new file mode 100644
index 0000000..84b7228
--- /dev/null
+++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/enums/DisinfectionMethod.java
@@ -0,0 +1,74 @@
+package com.zhyc.module.biosafety.enums;
+
+/**
+ * 消毒方式枚举
+ */
+public enum DisinfectionMethod {
+
+    SPRAY(0, "喷雾"),
+    SCATTER(1, "撒布"),
+    SOAK(2, "浸泡"),
+    FUMIGATE(3, "熏蒸"),
+    OTHER(4, "其他");
+
+    private final int code;
+    private final String desc;
+
+    DisinfectionMethod(int code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    /**
+     * 根据code获取描述
+     */
+    public static String getDescByCode(Integer code) {
+        if (code == null) {
+            return "";
+        }
+        for (DisinfectionMethod method : values()) {
+            if (method.code == code) {
+                return method.desc;
+            }
+        }
+        return "";
+    }
+
+    /**
+     * 根据code获取枚举
+     */
+    public static DisinfectionMethod getByCode(Integer code) {
+        if (code == null) {
+            return null;
+        }
+        for (DisinfectionMethod method : values()) {
+            if (method.code == code) {
+                return method;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 根据描述获取code
+     */
+    public static Integer getCodeByDesc(String desc) {
+        if (desc == null || desc.trim().isEmpty()) {
+            return null;
+        }
+        for (DisinfectionMethod method : values()) {
+            if (method.desc.equals(desc)) {
+                return method.code;
+            }
+        }
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/zhyc-module/src/main/java/com/zhyc/module/common/controller/UserPostController.java b/zhyc-module/src/main/java/com/zhyc/module/common/controller/UserPostController.java
index 9e30cc4..a359233 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/common/controller/UserPostController.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/common/controller/UserPostController.java
@@ -27,7 +27,9 @@ public class UserPostController {
     @GetMapping("/getUser")
     public AjaxResult getUserPost(String postCode){
         User user = new User();
-        user.setPostCode(postCode);
+        if (postCode != null){
+            user.setPostName(postCode);
+        }
         List<User> list = userService.getUserListByCode(user);
         return AjaxResult.success(list);
     }
diff --git a/zhyc-module/src/main/resources/mapper/biosafety/DewormMapper.xml b/zhyc-module/src/main/resources/mapper/biosafety/DewormMapper.xml
index e4b3b5d..e19566f 100644
--- a/zhyc-module/src/main/resources/mapper/biosafety/DewormMapper.xml
+++ b/zhyc-module/src/main/resources/mapper/biosafety/DewormMapper.xml
@@ -34,6 +34,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectDewormList" parameterType="Deworm" resultMap="DewormResult">
         <include refid="selectDewormVo"/>
         <where>
+            <!-- 根据ids数组查询 -->
+            <if test="ids != null and ids.length > 0">
+                AND s.id IN
+                <foreach collection="ids" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
             <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">
diff --git a/zhyc-module/src/main/resources/mapper/biosafety/DiagnosisMapper.xml b/zhyc-module/src/main/resources/mapper/biosafety/DiagnosisMapper.xml
index ef14557..5d5302c 100644
--- a/zhyc-module/src/main/resources/mapper/biosafety/DiagnosisMapper.xml
+++ b/zhyc-module/src/main/resources/mapper/biosafety/DiagnosisMapper.xml
@@ -42,7 +42,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectDiagnosisList" parameterType="Diagnosis" resultMap="DiagnosisResult">
         <include refid="selectDiagnosisVo"/>
-        <where>  
+        <where>
+            <!-- 根据ids数组查询 -->
+            <if test="ids != null and ids.length > 0">
+                AND sd.id IN
+                <foreach collection="ids" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
             <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">
diff --git a/zhyc-module/src/main/resources/mapper/biosafety/DisinfectMapper.xml b/zhyc-module/src/main/resources/mapper/biosafety/DisinfectMapper.xml
index 89cfa01..235f8dc 100644
--- a/zhyc-module/src/main/resources/mapper/biosafety/DisinfectMapper.xml
+++ b/zhyc-module/src/main/resources/mapper/biosafety/DisinfectMapper.xml
@@ -41,30 +41,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         sd.create_by,
         sd.create_time,
         ds.sheepfold_name
-        FROM   sw_disinfect sd
+        FROM sw_disinfect sd
         LEFT JOIN da_sheepfold ds ON ds.id = sd.sheepfold_id
         <where>1 = 1
-        <if test="sheepfoldId != null">            AND sd.sheepfold_id = #{sheepfoldId}</if>
-        <if test="datetime != null">               AND sd.datetime     = #{datetime}</if>
-        <if test="technician != null and technician != ''"> AND sd.technician = #{technician}</if>
-        <if test="way != null and way != ''">      AND sd.way          = #{way}</if>
-        <if test="usageId != null">                AND sd.usage_id     = #{usageId}</if>
-        <if test="ratio != null and ratio != ''">  AND sd.ratio        = #{ratio}</if>
-        <if test="comment != null and comment != ''"> AND sd.comment   = #{comment}</if>
-        <!-- 子表过滤条件：仅保留满足药品名称的记录 -->
-        <if test="mediName != null and mediName != ''">
-            AND EXISTS (
-            SELECT 1
-            FROM sw_medicine_usage_details mud
-            JOIN sw_medicine sm ON sm.id = mud.medi_id
-            WHERE mud.medi_usage = sd.usage_id
-            AND sm.name   like  concat('%',#{mediName},'%')
-            )
-        </if>
-        ${params.dataScope}
+            <!-- 根据ids数组查询 -->
+            <if test="ids != null and ids.length > 0">
+                AND sd.id IN
+                <foreach collection="ids" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+            <if test="sheepfoldId != null">            AND sd.sheepfold_id = #{sheepfoldId}</if>
+            <if test="datetime != null">               AND sd.datetime     = #{datetime}</if>
+            <if test="technician != null and technician != ''"> AND sd.technician = #{technician}</if>
+            <if test="way != null and way != ''">      AND sd.way          = #{way}</if>
+            <if test="usageId != null">                AND sd.usage_id     = #{usageId}</if>
+            <if test="ratio != null and ratio != ''">  AND sd.ratio        = #{ratio}</if>
+            <if test="comment != null and comment != ''"> AND sd.comment   = #{comment}</if>
+            <!-- 子表过滤条件：仅保留满足药品名称的记录 -->
+            <if test="mediName != null and mediName != ''">
+                AND EXISTS (
+                SELECT 1
+                FROM sw_medicine_usage_details mud
+                JOIN sw_medicine sm ON sm.id = mud.medi_id
+                WHERE mud.medi_usage = sd.usage_id
+                AND sm.name like concat('%',#{mediName},'%')
+                )
+            </if>
+            ${params.dataScope}
         </where>
-        ORDER BY datetime  DESC
-
+        ORDER BY datetime DESC
     </select>
     
     <select id="selectDisinfectById" parameterType="Long" resultMap="DisinfectResult">
diff --git a/zhyc-module/src/main/resources/mapper/biosafety/HealthMapper.xml b/zhyc-module/src/main/resources/mapper/biosafety/HealthMapper.xml
index cf0e788..68072d2 100644
--- a/zhyc-module/src/main/resources/mapper/biosafety/HealthMapper.xml
+++ b/zhyc-module/src/main/resources/mapper/biosafety/HealthMapper.xml
@@ -41,6 +41,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join bas_sheep bs on s.sheep_id = bs.id
 
         <where>
+            <!-- 根据ids数组查询 -->
+            <if test="ids != null and ids.length > 0">
+                AND s.id IN
+                <foreach collection="ids" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
             <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">
diff --git a/zhyc-module/src/main/resources/mapper/biosafety/ImmunityMapper.xml b/zhyc-module/src/main/resources/mapper/biosafety/ImmunityMapper.xml
index 118f84a..32e9a85 100644
--- a/zhyc-module/src/main/resources/mapper/biosafety/ImmunityMapper.xml
+++ b/zhyc-module/src/main/resources/mapper/biosafety/ImmunityMapper.xml
@@ -37,7 +37,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         bs.manage_tags sheep_no
         from sw_immunity s
         left join bas_sheep bs on s.sheep_id = bs.id
-        <where>  
+        <where>
+            <!-- 根据ids数组查询 -->
+            <if test="ids != null and ids.length > 0">
+                AND s.id IN
+                <foreach collection="ids" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
             <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>
diff --git a/zhyc-module/src/main/resources/mapper/biosafety/QuarantineReportMapper.xml b/zhyc-module/src/main/resources/mapper/biosafety/QuarantineReportMapper.xml
index 8dbd878..e585b03 100644
--- a/zhyc-module/src/main/resources/mapper/biosafety/QuarantineReportMapper.xml
+++ b/zhyc-module/src/main/resources/mapper/biosafety/QuarantineReportMapper.xml
@@ -44,7 +44,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectQuarantineReportList" parameterType="QuarantineReport" resultMap="QuarantineReportResult">
         <include refid="selectQuarantineReportVo"/>
-        <where>  
+        <where>
+            <!-- 根据ids数组查询 -->
+            <if test="ids != null and ids.length > 0">
+                AND sqr.id IN
+                <foreach collection="ids" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
             <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>
diff --git a/zhyc-module/src/main/resources/mapper/biosafety/SwMedicineMapper.xml b/zhyc-module/src/main/resources/mapper/biosafety/SwMedicineMapper.xml
index 663ff94..a8c4913 100644
--- a/zhyc-module/src/main/resources/mapper/biosafety/SwMedicineMapper.xml
+++ b/zhyc-module/src/main/resources/mapper/biosafety/SwMedicineMapper.xml
@@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectSwMedicineList" parameterType="SwMedicine" resultMap="SwMedicineResult">
         <include refid="selectSwMedicineVo"/>
-        <where>  
+        <where>
             <if test="medica != null  and medica != ''"> and medica = #{medica}</if>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
             <if test="medicType != null "> and medic_type = #{medicType}</if>
diff --git a/zhyc-module/src/main/resources/mapper/biosafety/SwMedicineUsageMapper.xml b/zhyc-module/src/main/resources/mapper/biosafety/SwMedicineUsageMapper.xml
index 72d37e7..a45c47d 100644
--- a/zhyc-module/src/main/resources/mapper/biosafety/SwMedicineUsageMapper.xml
+++ b/zhyc-module/src/main/resources/mapper/biosafety/SwMedicineUsageMapper.xml
@@ -63,7 +63,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN da_sheepfold ds ON ds.id = smu.sheepfold
         LEFT JOIN bas_sheep    bs ON bs.id = smu.sheep
         <where>
-
+            <!-- 根据ids数组查询 -->
+            <if test="ids != null and ids.length > 0">
+                AND smu.id IN
+                <foreach collection="ids" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
             <!-- 2. 使用类型 -->
             <if test="useType != null and useType != ''">
                 AND smu.use_type = #{useType}
diff --git a/zhyc-module/src/main/resources/mapper/biosafety/TreatmentMapper.xml b/zhyc-module/src/main/resources/mapper/biosafety/TreatmentMapper.xml
index 1628620..e9a045c 100644
--- a/zhyc-module/src/main/resources/mapper/biosafety/TreatmentMapper.xml
+++ b/zhyc-module/src/main/resources/mapper/biosafety/TreatmentMapper.xml
@@ -52,7 +52,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         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>  
+        <where>
+            <!-- 根据ids数组查询 -->
+            <if test="ids != null and ids.length > 0">
+                AND t.id IN
+                <foreach collection="ids" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
             <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">
diff --git a/zhyc-module/src/main/resources/mapper/common/UserMapper.xml b/zhyc-module/src/main/resources/mapper/common/UserMapper.xml
index f01c297..79ee392 100644
--- a/zhyc-module/src/main/resources/mapper/common/UserMapper.xml
+++ b/zhyc-module/src/main/resources/mapper/common/UserMapper.xml
@@ -15,13 +15,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <choose>
             <!-- deptId = 0：查询所有用户，不限制部门 -->
             <when test="deptId == 0">
-                SELECT DISTINCT u.user_id, u.nick_name, p.post_name, p.post_code
+                SELECT
+                MIN(u.user_id) as user_id,
+                u.nick_name,
+                MIN(p.post_name) as post_name,
+                MIN(p.post_code) as post_code
                 FROM sys_user u
                 JOIN sys_user_post up ON u.user_id = up.user_id
                 JOIN sys_post p ON up.post_id = p.post_id
-                WHERE p.post_code LIKE CONCAT('%', #{postCode}, '%')
+                <where>
+                    <if test="postCode!=null and postCode!=''">
+                        AND p.post_code LIKE CONCAT('%', #{postCode}, '%')
+                    </if>
+                </where>
                 AND u.status = 0
                 AND u.del_flag = 0
+                GROUP BY u.nick_name
             </when>
 
             <!-- deptId != 0：递归查询该部门及所有子部门 -->
@@ -33,14 +42,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 FROM sys_dept d
                 INNER JOIN dept_tree dt ON d.parent_id = dt.dept_id
                 )
-                SELECT DISTINCT u.user_id, u.nick_name, p.post_name, p.post_code
+                SELECT
+                MIN(u.user_id) as user_id,
+                u.nick_name,
+                MIN(p.post_name) as post_name,
+                MIN(p.post_code) as post_code
                 FROM dept_tree dt
                 JOIN sys_user u ON u.dept_id = dt.dept_id
                 JOIN sys_user_post up ON u.user_id = up.user_id
                 JOIN sys_post p ON up.post_id = p.post_id
-                WHERE p.post_code LIKE CONCAT('%', #{postCode}, '%')
+                <where>
+                    <if test="postCode!=null and postCode!=''">
+                        AND p.post_code LIKE CONCAT('%', #{postCode}, '%')
+                    </if>
+                </where>
                 AND u.status = 0
                 AND u.del_flag = 0
+                GROUP BY u.nick_name
             </otherwise>
         </choose>
     </select>

From 3443f080fbf510f83fb183af5a8b0ca5b6fce8e9 Mon Sep 17 00:00:00 2001
From: zyh <2066096076@qq.com>
Date: Sun, 1 Mar 2026 14:13:34 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BE=8A=E5=8F=AA?=
 =?UTF-8?q?=E6=97=B6=E7=9A=84=E7=BE=8A=E5=8F=AA=E7=B1=BB=E5=9E=8B=EF=BC=8C?=
 =?UTF-8?q?=E5=90=84=E9=A1=B5=E9=9D=A2=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E9=9C=80=E6=B1=82=EF=BC=8C=E6=94=B9=E5=93=81=E7=A7=8D=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E7=9A=84=E5=8E=9F=E5=93=81=E7=A7=8D=E5=9B=9E=E6=98=BE?=
 =?UTF-8?q?=E9=9C=80=E6=B1=82=EF=BC=8C=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/controller/BasSheepController.java   |   4 +-
 .../com/zhyc/module/frozen/domain/DdFe.java   | 208 +-----------------
 .../com/zhyc/module/frozen/domain/DdFs.java   | 152 +------------
 .../bodyManage/domain/ScBodyMeasure.java      |   2 +-
 .../bodyManage/domain/ScBodyScore.java        |   2 +-
 .../bodyManage/domain/ScBreastRating.java     |   2 +-
 .../manage_sheep/domain/ScChangeComment.java  |   2 +-
 .../manage_sheep/domain/ScChangeEar.java      |   2 +-
 .../manage_sheep/domain/ScChangeVariety.java  |   2 +-
 .../manage_sheep/domain/ScTransGroup.java     |   2 +-
 .../manage_sheep/domain/ScTransitionInfo.java |   2 +-
 .../mapper/ScChangeCommentMapper.java         |  11 +-
 .../service/impl/ScAddSheepServiceImpl.java   | 121 ++++++++--
 .../impl/ScChangeVarietyServiceImpl.java      |   8 +-
 .../produce/other/domain/ScCastrate.java      |   2 +-
 .../produce/other/domain/ScFixHoof.java       |   2 +-
 .../resources/mapper/frozen/DdFeMapper.xml    |   6 +
 .../resources/mapper/frozen/DdFsMapper.xml    |  14 +-
 .../bodyManage/ScBodyMeasureMapper.xml        | 176 ++++++++-------
 .../produce/bodyManage/ScBodyScoreMapper.xml  |  44 ++--
 .../bodyManage/ScBreastRatingMapper.xml       |  46 ++--
 .../manage_sheep/ScChangeCommentMapper.xml    |  54 +++--
 .../manage_sheep/ScChangeEarMapper.xml        |  50 +++--
 .../manage_sheep/ScChangeVarietyMapper.xml    |  52 +++--
 .../manage_sheep/ScTransGroupMapper.xml       |  46 ++--
 .../manage_sheep/ScTransitionInfoMapper.xml   | 127 ++++++-----
 .../mapper/produce/other/ScCastrateMapper.xml |  42 ++--
 .../mapper/produce/other/ScFixHoofMapper.xml  |  40 ++--
 28 files changed, 531 insertions(+), 690 deletions(-)

diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/controller/BasSheepController.java b/zhyc-module/src/main/java/com/zhyc/module/base/controller/BasSheepController.java
index f2722a1..20fbe9a 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/base/controller/BasSheepController.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/base/controller/BasSheepController.java
@@ -133,7 +133,9 @@ public class BasSheepController extends BaseController {
 
             // 查询所有存在的羊只
             List<BasSheep> existingSheep = basSheepService.selectBasSheepByManageTagsList(validTags);
-
+            if (validTags.size() == 1 && existingSheep.size() == 1) {
+                return success(existingSheep.get(0));  //直接返回羊只对象
+            }
             Set<String> existingTagSet = existingSheep.stream()
                     .map(BasSheep::getManageTags)
                     .collect(Collectors.toSet());
diff --git a/zhyc-module/src/main/java/com/zhyc/module/frozen/domain/DdFe.java b/zhyc-module/src/main/java/com/zhyc/module/frozen/domain/DdFe.java
index 1d8a3c7..0f40c36 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/frozen/domain/DdFe.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/frozen/domain/DdFe.java
@@ -2,6 +2,9 @@ package com.zhyc.module.frozen.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zhyc.common.annotation.Excel;
@@ -13,13 +16,16 @@ import com.zhyc.common.core.domain.BaseEntity;
  * @author ruoyi
  * @date 2025-11-29
  */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class DdFe extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** 主键 */
     private Long id;
-
+    private Long[] ids;
     /** 胚胎编号 YS+日期+序号 */
     @Excel(name = "胚胎编号")
     private String code;
@@ -95,205 +101,5 @@ public class DdFe extends BaseEntity
         this.id = id;
     }
 
-    public Long getId() 
-    {
-        return id;
-    }
 
-    public void setCode(String code) 
-    {
-        this.code = code;
-    }
-
-    public String getCode() 
-    {
-        return code;
-    }
-
-    public void setFreezeDate(Date freezeDate) 
-    {
-        this.freezeDate = freezeDate;
-    }
-
-    public Date getFreezeDate() 
-    {
-        return freezeDate;
-    }
-
-    public void setDrId(String drId) 
-    {
-        this.drId = drId;
-    }
-
-    public String getDrId() 
-    {
-        return drId;
-    }
-
-    public void setDrBreed(String drBreed) 
-    {
-        this.drBreed = drBreed;
-    }
-
-    public String getDrBreed() 
-    {
-        return drBreed;
-    }
-
-    public void setDeId(String deId) 
-    {
-        this.deId = deId;
-    }
-
-    public String getDeId() 
-    {
-        return deId;
-    }
-
-    public void setDeBreed(String deBreed) 
-    {
-        this.deBreed = deBreed;
-    }
-
-    public String getDeBreed() 
-    {
-        return deBreed;
-    }
-
-    public void setEmbBreed(String embBreed) 
-    {
-        this.embBreed = embBreed;
-    }
-
-    public String getEmbBreed() 
-    {
-        return embBreed;
-    }
-
-    public void setGrade(String grade) 
-    {
-        this.grade = grade;
-    }
-
-    public String getGrade() 
-    {
-        return grade;
-    }
-
-    public void setQty(Long qty) 
-    {
-        this.qty = qty;
-    }
-
-    public Long getQty() 
-    {
-        return qty;
-    }
-
-    public void setSexCtl(Integer sexCtl) 
-    {
-        this.sexCtl = sexCtl;
-    }
-
-    public Integer getSexCtl() 
-    {
-        return sexCtl;
-    }
-
-    public void setStatus(String status) 
-    {
-        this.status = status;
-    }
-
-    public String getStatus() 
-    {
-        return status;
-    }
-
-    public void setTech(String tech) 
-    {
-        this.tech = tech;
-    }
-
-    public String getTech() 
-    {
-        return tech;
-    }
-
-    public void setTankId(Long tankId) 
-    {
-        this.tankId = tankId;
-    }
-
-    public Long getTankId() 
-    {
-        return tankId;
-    }
-
-    public void setBucketId(Long bucketId) 
-    {
-        this.bucketId = bucketId;
-    }
-
-    public Long getBucketId() 
-    {
-        return bucketId;
-    }
-
-    public void setRackId(Long rackId) 
-    {
-        this.rackId = rackId;
-    }
-
-    public Long getRackId() 
-    {
-        return rackId;
-    }
-
-    public void setOutDate(Date outDate) 
-    {
-        this.outDate = outDate;
-    }
-
-    public Date getOutDate() 
-    {
-        return outDate;
-    }
-
-    public void setDiscardTxt(String discardTxt) 
-    {
-        this.discardTxt = discardTxt;
-    }
-
-    public String getDiscardTxt() 
-    {
-        return discardTxt;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("code", getCode())
-            .append("freezeDate", getFreezeDate())
-            .append("drId", getDrId())
-            .append("drBreed", getDrBreed())
-            .append("deId", getDeId())
-            .append("deBreed", getDeBreed())
-            .append("embBreed", getEmbBreed())
-            .append("grade", getGrade())
-            .append("qty", getQty())
-            .append("sexCtl", getSexCtl())
-            .append("status", getStatus())
-            .append("tech", getTech())
-            .append("tankId", getTankId())
-            .append("bucketId", getBucketId())
-            .append("rackId", getRackId())
-            .append("outDate", getOutDate())
-            .append("discardTxt", getDiscardTxt())
-            .append("remark", getRemark())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .toString();
-    }
 }
diff --git a/zhyc-module/src/main/java/com/zhyc/module/frozen/domain/DdFs.java b/zhyc-module/src/main/java/com/zhyc/module/frozen/domain/DdFs.java
index 50e7c1b..83ecc71 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/frozen/domain/DdFs.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/frozen/domain/DdFs.java
@@ -3,6 +3,9 @@ package com.zhyc.module.frozen.domain;
 import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zhyc.common.annotation.Excel;
@@ -14,6 +17,9 @@ import com.zhyc.common.core.domain.BaseEntity;
  * @author ruoyi
  * @date 2025-11-29
  */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class DdFs extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
@@ -21,7 +27,7 @@ public class DdFs extends BaseEntity {
      * 主键
      */
     private Long id;
-
+    private Long[] ids;
     /**
      * 冻精号/公羊耳号
      */
@@ -107,148 +113,4 @@ public class DdFs extends BaseEntity {
      */
     @Excel(name = "废弃原因")
     private String discardTxt;
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setFreezeDt(Date freezeDt) {
-        this.freezeDt = freezeDt;
-    }
-
-    public Date getFreezeDt() {
-        return freezeDt;
-    }
-
-    public void setBreed(String breed) {
-        this.breed = breed;
-    }
-
-    public String getBreed() {
-        return breed;
-    }
-
-    public void setBatch(String batch) {
-        this.batch = batch;
-    }
-
-    public String getBatch() {
-        return batch;
-    }
-
-    public void setSpec(String spec) {
-        this.spec = spec;
-    }
-
-    public String getSpec() {
-        return spec;
-    }
-
-    public void setQty(Long qty) {
-        this.qty = qty;
-    }
-
-    public Long getQty() {
-        return qty;
-    }
-
-    public void setSexCtl(Integer sexCtl) {
-        this.sexCtl = sexCtl;
-    }
-
-    public Integer getSexCtl() {
-        return sexCtl;
-    }
-
-    public void setStat(String stat) {
-        this.stat = stat;
-    }
-
-    public String getStat() {
-        return stat;
-    }
-
-    public void setTech(String tech) {
-        this.tech = tech;
-    }
-
-    public String getTech() {
-        return tech;
-    }
-
-    public void setTankId(Long tankId) {
-        this.tankId = tankId;
-    }
-
-    public Long getTankId() {
-        return tankId;
-    }
-
-    public void setBucketId(Long bucketId) {
-        this.bucketId = bucketId;
-    }
-
-    public Long getBucketId() {
-        return bucketId;
-    }
-
-    public void setRackId(Long rackId) {
-        this.rackId = rackId;
-    }
-
-    public Long getRackId() {
-        return rackId;
-    }
-
-    public void setOutDt(Date outDt) {
-        this.outDt = outDt;
-    }
-
-    public Date getOutDt() {
-        return outDt;
-    }
-
-    public void setDiscardTxt(String discardTxt) {
-        this.discardTxt = discardTxt;
-    }
-
-    public String getDiscardTxt() {
-        return discardTxt;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("code", getCode())
-                .append("freezeDt", getFreezeDt())
-                .append("breed", getBreed())
-                .append("batch", getBatch())
-                .append("spec", getSpec())
-                .append("qty", getQty())
-                .append("sexCtl", getSexCtl())
-                .append("stat", getStat())
-                .append("tech", getTech())
-                .append("tankId", getTankId())
-                .append("bucketId", getBucketId())
-                .append("rackId", getRackId())
-                .append("outDt", getOutDt())
-                .append("discardTxt", getDiscardTxt())
-                .append("remark", getRemark())
-                .append("createBy", getCreateBy())
-                .append("createTime", getCreateTime())
-                .toString();
-    }
 }
diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/domain/ScBodyMeasure.java b/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/domain/ScBodyMeasure.java
index 4a1ae39..57e1620 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/domain/ScBodyMeasure.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/domain/ScBodyMeasure.java
@@ -29,7 +29,7 @@ public class ScBodyMeasure extends BaseEntity {
      * $column.columnComment
      */
     private Long id;
-
+    private Long[] ids;
     /**
      * 耳号
      */
diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/domain/ScBodyScore.java b/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/domain/ScBodyScore.java
index 9035967..08729b4 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/domain/ScBodyScore.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/domain/ScBodyScore.java
@@ -26,7 +26,7 @@ public class ScBodyScore extends BaseEntity {
      * $column.columnComment
      */
     private Long id;
-
+    private Long[] ids;
     /**
      * 羊只id
      */
diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/domain/ScBreastRating.java b/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/domain/ScBreastRating.java
index e366749..a2da538 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/domain/ScBreastRating.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/domain/ScBreastRating.java
@@ -26,7 +26,7 @@ public class ScBreastRating extends BaseEntity {
      * $column.columnComment
      */
     private Long id;
-
+    private Long[] ids;
     /**
      * 羊只id
      */
diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScChangeComment.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScChangeComment.java
index 66c7247..76b8e32 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScChangeComment.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScChangeComment.java
@@ -26,7 +26,7 @@ public class ScChangeComment extends BaseEntity {
      * $column.columnComment
      */
     private Long id;
-
+    private Long[] ids;
     /**
      * 羊只id
      */
diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScChangeEar.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScChangeEar.java
index 9db0c0d..fb0887d 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScChangeEar.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScChangeEar.java
@@ -26,7 +26,7 @@ public class ScChangeEar extends BaseEntity {
      * id
      */
     private Integer id;
-
+    private Integer[] ids;
     /**
      * 羊只id
      */
diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScChangeVariety.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScChangeVariety.java
index 92cdd55..54651f6 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScChangeVariety.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScChangeVariety.java
@@ -26,7 +26,7 @@ public class ScChangeVariety extends BaseEntity {
      * $column.columnComment
      */
     private Integer id;
-
+    private Integer[] ids;
     /**
      * 羊只id
      */
diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScTransGroup.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScTransGroup.java
index c106749..a603801 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScTransGroup.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScTransGroup.java
@@ -24,7 +24,7 @@ public class ScTransGroup extends BaseEntity {
      * $column.columnComment
      */
     private Integer id;
-
+    private Integer[] ids;
     /**
      * 羊只id
      */
diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScTransitionInfo.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScTransitionInfo.java
index d1d3a4e..5fba386 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScTransitionInfo.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScTransitionInfo.java
@@ -25,7 +25,7 @@ public class ScTransitionInfo extends BaseEntity {
      *主键
      */
     private Integer id;
-
+    private Integer[] ids;
     /**
      * 羊只id
      */
diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/mapper/ScChangeCommentMapper.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/mapper/ScChangeCommentMapper.java
index 7f04ca2..accd718 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/mapper/ScChangeCommentMapper.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/mapper/ScChangeCommentMapper.java
@@ -22,11 +22,10 @@ public interface ScChangeCommentMapper
 
     /**
      * 查询改备注列表
-     * 
-     * @param scChangeComment 改备注
-     * @return 改备注集合
      */
-//    public List<ScChangeComment> selectScChangeCommentList(ScChangeComment scChangeComment);
+    List<ScChangeComment> selectScChangeCommentList(
+            @Param("sc") ScChangeComment sc,
+            @Param("manageTagsList") List<String> manageTagsList);
 
     /**
      * 新增改备注
@@ -60,10 +59,6 @@ public interface ScChangeCommentMapper
      */
     public int deleteScChangeCommentByIds(Long[] ids);
 
-    List<ScChangeComment> selectScChangeCommentList(
-            @Param("sc") ScChangeComment sc,
-            @Param("manageTagsList") List<String> manageTagsList);
-
     /**
      * 模糊搜索耳号
      */
diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScAddSheepServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScAddSheepServiceImpl.java
index 23949e0..23424e2 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScAddSheepServiceImpl.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScAddSheepServiceImpl.java
@@ -19,6 +19,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 
@@ -122,6 +124,61 @@ public class ScAddSheepServiceImpl implements IScAddSheepService {
         return scAddSheepMapper.deleteScAddSheepByIds(ids) > 0;
     }
 
+    /**
+     * 根据出生日期计算月龄
+     */
+    private int calculateMonthAge(Date birthday) {
+        if (birthday == null) return 0;
+
+        Calendar birthCal = Calendar.getInstance();
+        birthCal.setTime(birthday);
+
+        Calendar nowCal = Calendar.getInstance();
+
+        int yearDiff = nowCal.get(Calendar.YEAR) - birthCal.get(Calendar.YEAR);
+        int monthDiff = nowCal.get(Calendar.MONTH) - birthCal.get(Calendar.MONTH);
+
+        return yearDiff * 12 + monthDiff;
+    }
+
+    /**
+     * 根据月龄、断奶体重、性别自动判断羊只类别ID
+     */
+    private Long determineSheepType(BigDecimal weaningWeight, int monthAge, Integer gender) {
+        // 1. 断奶体重为空 -> 哺乳羊
+        if (weaningWeight == null) {
+            return 1L; // 哺乳羊
+        }
+
+        // 2. 断奶体重不为空 且 月龄 0-4 -> 断奶羊
+        if (monthAge >= 0 && monthAge <= 4) {
+            return 2L; // 断奶羊
+        }
+
+        // 3. 断奶体重不为空 且 月龄 4-7 -> 育成羊
+        if (monthAge > 4 && monthAge <= 7) {
+            return 3L; // 育成羊
+        }
+
+        // 4. 月龄 7-12 且 母羊 -> 青年羊
+        if (monthAge > 7 && monthAge < 12 && gender != null && gender == 1) { // 1=母
+            return 4L; // 青年羊
+        }
+
+        // 5. 月龄 >=12 且 公羊 -> 成年公羊
+        if (monthAge >= 12 && gender != null && gender == 2) { // 2=公
+            return 8L; // 成年公羊
+        }
+
+        // 6. 月龄 >=12 且 母羊 -> 超龄羊
+        if (monthAge >= 12 && gender != null && gender == 1) { // 1=母
+            return 5L; // 超龄羊
+        }
+
+        // 默认返回哺乳羊
+        return 1L;
+    }
+
     //导入羊只
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -136,6 +193,7 @@ public class ScAddSheepServiceImpl implements IScAddSheepService {
         for (int i = 0; i < list.size(); i++) {
             ScAddSheep sheep = list.get(i);
             try {
+                // 校验牧场名称
                 if (StringUtils.isBlank(sheep.getRanchName())) {
                     failure++;
                     failureMsg.append("<br/>第").append(i + 1).append("行：牧场名称不能为空");
@@ -153,6 +211,7 @@ public class ScAddSheepServiceImpl implements IScAddSheepService {
                 }
                 sheep.setRanchId(ranchList.get(0).getId().intValue());
 
+                // 校验品种名称
                 if (StringUtils.isNotBlank(sheep.getVarietyName())) {
                     Long varietyId = basSheepVarietyMapper.selectIdByName(sheep.getVarietyName());
                     if (varietyId == null) {
@@ -173,6 +232,7 @@ public class ScAddSheepServiceImpl implements IScAddSheepService {
                     continue;
                 }
 
+                // 校验羊舍名称
                 if (StringUtils.isNotBlank(sheep.getSheepfoldNameExcel())) {
                     DaSheepfold param = new DaSheepfold();
                     param.setSheepfoldName(sheep.getSheepfoldNameExcel());
@@ -190,23 +250,7 @@ public class ScAddSheepServiceImpl implements IScAddSheepService {
                     sheep.setSheepfold(foldList.get(0).getId().intValue());
                 }
 
-                if (StringUtils.isNotBlank(sheep.getTypeName())) {
-                    BasSheepType typeQuery = new BasSheepType();
-                    typeQuery.setName(sheep.getTypeName().trim());
-                    List<BasSheepType> typeList = basSheepTypeService.selectBasSheepTypeList(typeQuery);
-
-                    if (typeList == null || typeList.isEmpty()) {
-                        failure++;
-                        failureMsg.append("<br/>第")
-                                .append(i + 1)
-                                .append("行：羊只类型名称不存在【")
-                                .append(sheep.getTypeName())
-                                .append("】");
-                        continue;
-                    }
-                    sheep.setTypeId(typeList.get(0).getId().longValue());
-                }
-
+                // 校验耳号
                 if (StringUtils.isBlank(sheep.getEarNumber())) {
                     failure++;
                     failureMsg.append("<br/>第")
@@ -225,6 +269,8 @@ public class ScAddSheepServiceImpl implements IScAddSheepService {
                             .append("】");
                     continue;
                 }
+
+                // 校验父号（如果填写了）
                 if (StringUtils.isNotBlank(sheep.getFather())) {
                     BasSheep father = basSheepService.selectBasSheepByManageTags(sheep.getFather().trim());
                     if (father == null) {
@@ -234,6 +280,7 @@ public class ScAddSheepServiceImpl implements IScAddSheepService {
                     }
                 }
 
+                // 校验母号（如果填写了）
                 if (StringUtils.isNotBlank(sheep.getMother())) {
                     BasSheep mother = basSheepService.selectBasSheepByManageTags(sheep.getMother().trim());
                     if (mother == null) {
@@ -242,6 +289,46 @@ public class ScAddSheepServiceImpl implements IScAddSheepService {
                         continue;
                     }
                 }
+
+                // 校验出生日期必填
+                if (sheep.getBirthday() == null) {
+                    failure++;
+                    failureMsg.append("<br/>第").append(i + 1).append("行：出生日期不能为空");
+                    continue;
+                }
+
+                // 校验性别必填
+                if (sheep.getGender() == null) {
+                    failure++;
+                    failureMsg.append("<br/>第").append(i + 1).append("行：性别不能为空");
+                    continue;
+                }
+
+                // 自动判断羊只类别
+                int monthAge = calculateMonthAge(sheep.getBirthday());
+                Long autoTypeId = determineSheepType(sheep.getWeaningWeight(), monthAge, sheep.getGender());
+
+                // 如果Excel中填写了typeName，以Excel为准
+                if (StringUtils.isNotBlank(sheep.getTypeName())) {
+                    BasSheepType typeQuery = new BasSheepType();
+                    typeQuery.setName(sheep.getTypeName().trim());
+                    List<BasSheepType> typeList = basSheepTypeService.selectBasSheepTypeList(typeQuery);
+
+                    if (typeList == null || typeList.isEmpty()) {
+                        failure++;
+                        failureMsg.append("<br/>第")
+                                .append(i + 1)
+                                .append("行：羊只类型名称不存在【")
+                                .append(sheep.getTypeName())
+                                .append("】");
+                        continue;
+                    }
+                    sheep.setTypeId(typeList.get(0).getId().longValue());
+                } else {
+                    // 使用自动判断的类别
+                    sheep.setTypeId(autoTypeId);
+                }
+
                 // 数据分离：设置用户和部门
                 sheep.setUserId(userId);
                 sheep.setDeptId(deptId);
diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScChangeVarietyServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScChangeVarietyServiceImpl.java
index e8fac47..762688b 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScChangeVarietyServiceImpl.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScChangeVarietyServiceImpl.java
@@ -68,19 +68,15 @@ public class ScChangeVarietyServiceImpl implements IScChangeVarietyService
     @Transactional(rollbackFor = Exception.class)
     public int insertScChangeVariety(ScChangeVariety scChangeVariety)
     {
-        // ✅ 第1步：先查羊只（移到 insert 之前！）
         String manageTags = scChangeVariety.getManageTags();
         BasSheep sheep = basSheepService.selectBasSheepByManageTags(manageTags);
         if (sheep == null) {
             throw new RuntimeException("未找到耳号为【" + manageTags + "】的羊只，无法更新品种");
         }
 
-        // ✅ 第2步：设置所有字段（关键！）
-        scChangeVariety.setSheepId(sheep.getId().intValue());  // 设置羊只ID
+        scChangeVariety.setSheepId(sheep.getId().intValue());
 
-        // 查询当前品种作为旧品种（如果前端没传）
         if (StringUtils.isBlank(scChangeVariety.getVarietyOld())) {
-            // ✅ 修正：使用正确的方法名 selectBasSheepVarietyById
             BasSheepVariety oldVariety = varietyService.selectBasSheepVarietyById(sheep.getVarietyId());
             if (oldVariety != null) {
                 scChangeVariety.setVarietyOld(oldVariety.getVariety());
@@ -98,13 +94,11 @@ public class ScChangeVarietyServiceImpl implements IScChangeVarietyService
             throw new RuntimeException("事件日期不能为空");
         }
 
-        // ✅ 第3步：再执行 insert（此时所有字段都有值了）
         int rows = scChangeVarietyMapper.insertScChangeVariety(scChangeVariety);
         if (rows <= 0) {
             return rows;
         }
 
-        // 第4步：更新羊只品种（保持你的原逻辑）
         String newVarietyName = scChangeVariety.getVarietyNew();
         BasSheepVariety newVariety = varietyService.selectByVarietyName(newVarietyName);
         if (newVariety == null) {
diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/other/domain/ScCastrate.java b/zhyc-module/src/main/java/com/zhyc/module/produce/other/domain/ScCastrate.java
index f97a8a2..39ea449 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/produce/other/domain/ScCastrate.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/produce/other/domain/ScCastrate.java
@@ -25,7 +25,7 @@ public class ScCastrate extends BaseEntity {
      * $column.columnComment
      */
     private Long id;
-
+    private Long[] ids;
     /**
      * 羊只id
      */
diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/other/domain/ScFixHoof.java b/zhyc-module/src/main/java/com/zhyc/module/produce/other/domain/ScFixHoof.java
index 0329a66..df6edf8 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/produce/other/domain/ScFixHoof.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/produce/other/domain/ScFixHoof.java
@@ -25,7 +25,7 @@ public class ScFixHoof extends BaseEntity {
      * $column.columnComment
      */
     private Integer id;
-
+    private Integer[] ids;
     /**
      * 羊只id
      */
diff --git a/zhyc-module/src/main/resources/mapper/frozen/DdFeMapper.xml b/zhyc-module/src/main/resources/mapper/frozen/DdFeMapper.xml
index 8dd5084..2a875ec 100644
--- a/zhyc-module/src/main/resources/mapper/frozen/DdFeMapper.xml
+++ b/zhyc-module/src/main/resources/mapper/frozen/DdFeMapper.xml
@@ -56,6 +56,12 @@
     <select id="selectDdFeList" parameterType="DdFe" resultMap="DdFeResult">
         <include refid="selectDdFeVo"/>
         <where>
+            <if test="ids != null and ids.length > 0">
+                AND id IN
+                <foreach collection="ids" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
             <if test="code != null  and code != ''">and code like concat('%', #{code}, '%')</if>
             <if test="grade != null  and grade != ''">and grade = #{grade}</if>
             <if test="status != null  and status != ''">and status = #{status}</if>
diff --git a/zhyc-module/src/main/resources/mapper/frozen/DdFsMapper.xml b/zhyc-module/src/main/resources/mapper/frozen/DdFsMapper.xml
index cd335a9..9245cf9 100644
--- a/zhyc-module/src/main/resources/mapper/frozen/DdFsMapper.xml
+++ b/zhyc-module/src/main/resources/mapper/frozen/DdFsMapper.xml
@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zhyc.module.frozen.mapper.DdFsMapper">
-    
+
     <resultMap type="com.zhyc.module.frozen.domain.DdFs" id="DdFsResult">
         <result property="id"    column="id"    />
         <result property="code"    column="code"    />
@@ -31,7 +31,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectDdFsList" parameterType="DdFs" resultMap="DdFsResult">
         <include refid="selectDdFsVo"/>
-        <where>  
+        <where>
+            <if test="ids != null and ids.length > 0">
+                AND id IN
+                <foreach collection="ids" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
             <if test="code != null  and code != ''"> and code like concat('%', #{code}, '%')</if>
              <if test="stat != null and stat != ''">and stat = #{stat}</if>
             <if test="tech != null  and tech != ''"> and tech like concat('%', #{tech}, '%')</if>
@@ -44,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stat != null and stat != ''">and stat = #{stat}</if>
         </where>
     </select>
-    
+
     <select id="selectDdFsById" parameterType="Long" resultMap="DdFsResult">
         <include refid="selectDdFsVo"/>
         where id = #{id}
@@ -121,7 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteDdFsByIds" parameterType="String">
-        delete from dd_fs where id in 
+        delete from dd_fs where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
diff --git a/zhyc-module/src/main/resources/mapper/produce/bodyManage/ScBodyMeasureMapper.xml b/zhyc-module/src/main/resources/mapper/produce/bodyManage/ScBodyMeasureMapper.xml
index c6c2fc0..16b4bcf 100644
--- a/zhyc-module/src/main/resources/mapper/produce/bodyManage/ScBodyMeasureMapper.xml
+++ b/zhyc-module/src/main/resources/mapper/produce/bodyManage/ScBodyMeasureMapper.xml
@@ -50,97 +50,105 @@
 
     <sql id="selectScBodyMeasureVo">
         select sm.id,
-        sm.sheep_id,
-        sm.user_id,
-        sm.dept_id,
-        bs.manage_tags,
-        ds.id             as sheepfold_id,
-        ds.sheepfold_name,
-        bsv.id            as variety_id,
-        bsv.variety       as variety_name,
-        '体尺测量'        as event_type,
-        bst.name          as sheep_type_name,
-        sm.measure_date,
-        bs.gender,
-        bs.parity,
-        bs.birth_weight   as birth_weight,
-        bs.weaning_weight as weaning_weight,
-        sm.current_weight as current_weight,
-        sm.height,
-        sm.bust,
-        sm.body_length,
-        sm.pipe_length,
-        sm.chest_depth,
-        sm.hip_height,
-        sm.rump_width,
-        sm.rump_heignt,
-        sm.hip_width,
-        sm.hip_cross_height,
-        sm.month_age,
-        sm.breast_depth,
-        sm.breast_position,
-        sm.breast_length,
-        sm.breast_adbere,
-        sm.breast_spacing,
-        sm.breast_score,
-        sm.body_score,
-        sm.lactation_day,
-        sm.gestation_day,
-        sm.post_mating_day,
-        bbs.breed as breed_status_name,
-        sm.comment,
-        sm.technician,
-        sm.create_by,
-        sm.create_time
+               sm.sheep_id,
+               sm.user_id,
+               sm.dept_id,
+               bs.manage_tags,
+               ds.id             as sheepfold_id,
+               ds.sheepfold_name,
+               bsv.id            as variety_id,
+               bsv.variety       as variety_name,
+               '体尺测量'        as event_type,
+               bst.name          as sheep_type_name,
+               sm.measure_date,
+               bs.gender,
+               bs.parity,
+               bs.birth_weight   as birth_weight,
+               bs.weaning_weight as weaning_weight,
+               sm.current_weight as current_weight,
+               sm.height,
+               sm.bust,
+               sm.body_length,
+               sm.pipe_length,
+               sm.chest_depth,
+               sm.hip_height,
+               sm.rump_width,
+               sm.rump_heignt,
+               sm.hip_width,
+               sm.hip_cross_height,
+               sm.month_age,
+               sm.breast_depth,
+               sm.breast_position,
+               sm.breast_length,
+               sm.breast_adbere,
+               sm.breast_spacing,
+               sm.breast_score,
+               sm.body_score,
+               sm.lactation_day,
+               sm.gestation_day,
+               sm.post_mating_day,
+               bbs.breed         as breed_status_name,
+               sm.comment,
+               sm.technician,
+               sm.create_by,
+               sm.create_time
         from sc_body_measure sm
-        LEFT JOIN bas_sheep bs ON sm.sheep_id = bs.id
-        LEFT JOIN bas_breed_status bbs ON bs.breed_status_id = bbs.id
-        LEFT JOIN da_sheepfold ds ON bs.sheepfold_id = ds.id
-        LEFT JOIN bas_sheep_type bst ON bs.type_id = bst.id
-        LEFT JOIN bas_sheep_variety bsv ON bs.variety_id = bsv.id
+                 LEFT JOIN bas_sheep bs ON sm.sheep_id = bs.id
+                 LEFT JOIN bas_breed_status bbs ON bs.breed_status_id = bbs.id
+                 LEFT JOIN da_sheepfold ds ON bs.sheepfold_id = ds.id
+                 LEFT JOIN bas_sheep_type bst ON bs.type_id = bst.id
+                 LEFT JOIN bas_sheep_variety bsv ON bs.variety_id = bsv.id
     </sql>
 
     <select id="selectScBodyMeasureList" resultMap="ScBodyMeasureResult">
         <include refid="selectScBodyMeasureVo"/>
         <where>
-            <if test="manageTagsList != null and manageTagsList.size() > 0">
-                <foreach collection="manageTagsList" item="tag" separator="or" open="and (" close=")">
-                    bs.manage_tags like concat('%', #{tag}, '%')
+            <if test="sc.ids != null and sc.ids.length > 0">
+                AND sm.id IN
+                <foreach collection="sc.ids" item="id" open="(" separator="," close=")">
+                    #{id}
                 </foreach>
             </if>
-            <if test="sc.sheepId != null">and sm.sheep_id = #{sc.sheepId}</if>
-            <if test="sc.sheepfoldId != null">and bs.sheepfold_id = #{sc.sheepfoldId}</if>
-            <if test="sc.varietyId != null">and bsv.id = #{sc.varietyId}</if>
-            <if test="sc.sheepTypeId != null">and bs.type_id = #{sc.sheepTypeId}</if>
-            <if test="sc.params != null and sc.params.beginMeasureDate != null and sc.params.beginMeasureDate != '' and sc.params.endMeasureDate != null and sc.params.endMeasureDate != ''">
-                and sm.measure_date between #{sc.params.beginMeasureDate} and #{sc.params.endMeasureDate}
-            </if>
-            <if test="sc.params != null and sc.params.beginCreateTime != null and sc.params.beginCreateTime != '' and sc.params.endCreateTime != null and sc.params.endCreateTime != ''">
-                and sm.create_time between #{sc.params.beginCreateTime} and #{sc.params.endCreateTime}
-            </if>
-            <if test="sc.gender != null and sc.gender != ''">
-                and bs.gender = #{sc.gender}
-            </if>
-            <if test="sc.technician != null and sc.technician != ''">
-                and sm.technician like concat('%', #{sc.technician}, '%')
-            </if>
-            <if test="sc.isDelete != null">
-                and bs.is_delete = #{sc.isDelete}
-            </if>
-            <if test="sc.monthAgeStart != null">
-                and <![CDATA[ sm.month_age >= #{sc.monthAgeStart} ]]>
-            </if>
-            <if test="sc.monthAgeEnd != null">
-                and <![CDATA[ sm.month_age <= #{sc.monthAgeEnd} ]]>
-            </if>
-            <if test="sc.breedStatusName != null and sc.breedStatusName != ''">
-                and bbs.breed = #{sc.breedStatusName}
-            </if>
-            <if test="sc.deptId != null">
-                and sm.dept_id = #{sc.deptId}
-            </if>
-            <if test="sc.userId != null">
-                and sm.user_id = #{sc.userId}
+            <if test="sc.ids == null or sc.ids.length == 0">
+                <if test="manageTagsList != null and manageTagsList.size() > 0">
+                    <foreach collection="manageTagsList" item="tag" separator="or" open="and (" close=")">
+                        bs.manage_tags like concat('%', #{tag}, '%')
+                    </foreach>
+                </if>
+                <if test="sc.sheepId != null">and sm.sheep_id = #{sc.sheepId}</if>
+                <if test="sc.sheepfoldId != null">and bs.sheepfold_id = #{sc.sheepfoldId}</if>
+                <if test="sc.varietyId != null">and bsv.id = #{sc.varietyId}</if>
+                <if test="sc.sheepTypeId != null">and bs.type_id = #{sc.sheepTypeId}</if>
+                <if test="sc.params != null and sc.params.beginMeasureDate != null and sc.params.beginMeasureDate != '' and sc.params.endMeasureDate != null and sc.params.endMeasureDate != ''">
+                    and sm.measure_date between #{sc.params.beginMeasureDate} and #{sc.params.endMeasureDate}
+                </if>
+                <if test="sc.params != null and sc.params.beginCreateTime != null and sc.params.beginCreateTime != '' and sc.params.endCreateTime != null and sc.params.endCreateTime != ''">
+                    and sm.create_time between #{sc.params.beginCreateTime} and #{sc.params.endCreateTime}
+                </if>
+                <if test="sc.gender != null and sc.gender != ''">
+                    and bs.gender = #{sc.gender}
+                </if>
+                <if test="sc.technician != null and sc.technician != ''">
+                    and sm.technician like concat('%', #{sc.technician}, '%')
+                </if>
+                <if test="sc.isDelete != null">
+                    and bs.is_delete = #{sc.isDelete}
+                </if>
+                <if test="sc.monthAgeStart != null">
+                    and <![CDATA[ sm.month_age >= #{sc.monthAgeStart} ]]>
+                </if>
+                <if test="sc.monthAgeEnd != null">
+                    and <![CDATA[ sm.month_age <= #{sc.monthAgeEnd} ]]>
+                </if>
+                <if test="sc.breedStatusName != null and sc.breedStatusName != ''">
+                    and bbs.breed = #{sc.breedStatusName}
+                </if>
+                <if test="sc.deptId != null">
+                    and sm.dept_id = #{sc.deptId}
+                </if>
+                <if test="sc.userId != null">
+                    and sm.user_id = #{sc.userId}
+                </if>
             </if>
             ${sc.params.dataScope}
         </where>
@@ -272,7 +280,7 @@
         SELECT DISTINCT bs.manage_tags
         FROM bas_sheep bs
         WHERE bs.manage_tags LIKE CONCAT('%', #{query}, '%')
-        AND bs.is_delete = 0
+          AND bs.is_delete = 0
         ORDER BY bs.manage_tags
     </select>
 
diff --git a/zhyc-module/src/main/resources/mapper/produce/bodyManage/ScBodyScoreMapper.xml b/zhyc-module/src/main/resources/mapper/produce/bodyManage/ScBodyScoreMapper.xml
index 6500661..d11793d 100644
--- a/zhyc-module/src/main/resources/mapper/produce/bodyManage/ScBodyScoreMapper.xml
+++ b/zhyc-module/src/main/resources/mapper/produce/bodyManage/ScBodyScoreMapper.xml
@@ -46,26 +46,34 @@
     <select id="selectScBodyScoreList" resultMap="ScBodyScoreResult">
         <include refid="selectScBodyScoreVo"/>
         <where>
-            <if test="manageTagsList != null and manageTagsList.size() > 0">
-                <foreach collection="manageTagsList" item="tag" separator="or" open="and (" close=")">
-                    bs.manage_tags like concat('%', #{tag}, '%')
+            <if test="sc.ids != null and sc.ids.length > 0">
+                AND sbs.id IN
+                <foreach collection="sc.ids" item="id" open="(" separator="," close=")">
+                    #{id}
                 </foreach>
             </if>
-            <if test="sc.sheepId != null  and sc.sheepId != ''">and sbs.sheep_id = #{sc.sheepId}</if>
-            <if test="sc.varietyId != null">and bsv.id = #{sc.varietyId}</if>
-            <if test="sc.sheepfold != null">and bs.sheepfold_id = #{sc.sheepfold}</if>
-            <if test="sc.score != null ">and sbs.score = #{sc.score}</if>
-            <if test="sc.params != null and sc.params.beginDatetime != null and sc.params.beginDatetime != '' and sc.params.endDatetime != null and sc.params.endDatetime != ''">
-                and sbs.datetime between #{sc.params.beginDatetime} and #{sc.params.endDatetime}
-            </if>
-            <if test="sc.params != null and sc.params.beginCreateTime != null and sc.params.beginCreateTime != '' and sc.params.endCreateTime != null and sc.params.endCreateTime != ''">
-                and sbs.create_time between #{sc.params.beginCreateTime} and #{sc.params.endCreateTime}
-            </if>
-            <if test="sc.isDelete != null">
-                and bs.is_delete = #{sc.isDelete}
-            </if>
-            <if test="sc.technician != null and sc.technician != ''">
-                and sbs.technician like concat('%', #{sc.technician}, '%')
+            <if test="sc.ids == null or sc.ids.length == 0">
+                <if test="manageTagsList != null and manageTagsList.size() > 0">
+                    <foreach collection="manageTagsList" item="tag" separator="or" open="and (" close=")">
+                        bs.manage_tags like concat('%', #{tag}, '%')
+                    </foreach>
+                </if>
+                <if test="sc.sheepId != null  and sc.sheepId != ''">and sbs.sheep_id = #{sc.sheepId}</if>
+                <if test="sc.varietyId != null">and bsv.id = #{sc.varietyId}</if>
+                <if test="sc.sheepfold != null">and bs.sheepfold_id = #{sc.sheepfold}</if>
+                <if test="sc.score != null ">and sbs.score = #{sc.score}</if>
+                <if test="sc.params != null and sc.params.beginDatetime != null and sc.params.beginDatetime != '' and sc.params.endDatetime != null and sc.params.endDatetime != ''">
+                    and sbs.datetime between #{sc.params.beginDatetime} and #{sc.params.endDatetime}
+                </if>
+                <if test="sc.params != null and sc.params.beginCreateTime != null and sc.params.beginCreateTime != '' and sc.params.endCreateTime != null and sc.params.endCreateTime != ''">
+                    and sbs.create_time between #{sc.params.beginCreateTime} and #{sc.params.endCreateTime}
+                </if>
+                <if test="sc.isDelete != null">
+                    and bs.is_delete = #{sc.isDelete}
+                </if>
+                <if test="sc.technician != null and sc.technician != ''">
+                    and sbs.technician like concat('%', #{sc.technician}, '%')
+                </if>
             </if>
             ${sc.params.dataScope}
         </where>
diff --git a/zhyc-module/src/main/resources/mapper/produce/bodyManage/ScBreastRatingMapper.xml b/zhyc-module/src/main/resources/mapper/produce/bodyManage/ScBreastRatingMapper.xml
index 44b9222..00e843d 100644
--- a/zhyc-module/src/main/resources/mapper/produce/bodyManage/ScBreastRatingMapper.xml
+++ b/zhyc-module/src/main/resources/mapper/produce/bodyManage/ScBreastRatingMapper.xml
@@ -48,27 +48,35 @@
     <select id="selectScBreastRatingList" resultMap="ScBreastRatingResult">
         <include refid="selectScBreastRatingVo"/>
         <where>
-            <if test="manageTagsList != null and manageTagsList.size() > 0">
-                <foreach collection="manageTagsList" item="tag" separator="or" open="and (" close=")">
-                    bs.manage_tags like concat('%', #{tag}, '%')
+            <if test="sc.ids != null and sc.ids.length > 0">
+                AND sbr.id IN
+                <foreach collection="sc.ids" item="id" open="(" separator="," close=")">
+                    #{id}
                 </foreach>
             </if>
-            <if test="sc.varietyId != null">and bsv.id = #{sc.varietyId}</if>
-            <if test="sc.sheepfoldId != null">and sf.id = #{sc.sheepfoldId}</if>
-            <if test="sc.params != null and sc.params.beginEventDate != null and sc.params.endEventDate != null">
-                and sbr.event_date between #{sc.params.beginEventDate} and #{sc.params.endEventDate}
-            </if>
-            <if test="sc.params != null and sc.params.beginCreateTime != null and sc.params.endCreateTime != null">
-                and sbr.create_time between #{sc.params.beginCreateTime} and #{sc.params.endCreateTime}
-            </if>
-            <if test="sc.isDelete != null">
-                and bs.is_delete = #{sc.isDelete}
-            </if>
-            <if test="sc.technician != null and sc.technician != ''">
-                and sbr.technician = #{sc.technician}
-            </if>
-            <if test="sc.score != null">
-                and sbr.score = #{sc.score}
+            <if test="sc.ids == null or sc.ids.length == 0">
+                <if test="manageTagsList != null and manageTagsList.size() > 0">
+                    <foreach collection="manageTagsList" item="tag" separator="or" open="and (" close=")">
+                        bs.manage_tags like concat('%', #{tag}, '%')
+                    </foreach>
+                </if>
+                <if test="sc.varietyId != null">and bsv.id = #{sc.varietyId}</if>
+                <if test="sc.sheepfoldId != null">and sf.id = #{sc.sheepfoldId}</if>
+                <if test="sc.params != null and sc.params.beginEventDate != null and sc.params.endEventDate != null">
+                    and sbr.event_date between #{sc.params.beginEventDate} and #{sc.params.endEventDate}
+                </if>
+                <if test="sc.params != null and sc.params.beginCreateTime != null and sc.params.endCreateTime != null">
+                    and sbr.create_time between #{sc.params.beginCreateTime} and #{sc.params.endCreateTime}
+                </if>
+                <if test="sc.isDelete != null">
+                    and bs.is_delete = #{sc.isDelete}
+                </if>
+                <if test="sc.technician != null and sc.technician != ''">
+                    and sbr.technician = #{sc.technician}
+                </if>
+                <if test="sc.score != null">
+                    and sbr.score = #{sc.score}
+                </if>
             </if>
             ${sc.params.dataScope}
         </where>
diff --git a/zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScChangeCommentMapper.xml b/zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScChangeCommentMapper.xml
index a574a3e..32748e5 100644
--- a/zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScChangeCommentMapper.xml
+++ b/zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScChangeCommentMapper.xml
@@ -40,33 +40,41 @@
     <select id="selectScChangeCommentList" resultMap="ScChangeCommentResult">
         <include refid="selectScChangeCommentVo"/>
         <where>
-            <if test="manageTagsList != null and manageTagsList.size() > 0">
-                <foreach collection="manageTagsList" item="tag" separator="or" open="and (" close=")">
-                    bs.manage_tags like concat('%', #{tag}, '%')
+            <if test="sc.ids != null and sc.ids.length > 0">
+                AND scc.id IN
+                <foreach collection="sc.ids" item="id" open="(" separator="," close=")">
+                    #{id}
                 </foreach>
             </if>
-            <!--            <if test="sc.sheepfoldId != null">-->
-            <!--                and bs.sheepfold_id = #{sc.sheepfoldId}-->
-            <!--            </if>-->
-            <if test="sc.technician != null and sc.technician != ''">
-                and scc.technician like concat('%', #{sc.technician}, '%')
-            </if>
-            <if test="sc.newComment != null and sc.newComment != ''">
-                and scc.new_comment like concat('%', #{sc.newComment}, '%')
-            </if>
-            <if test="sc.oldComment != null and sc.oldComment != ''">
-                and scc.old_comment like concat('%', #{sc.oldComment}, '%')
-            </if>
-            <if test="sc.params != null and sc.params.beginCreateTime != null and sc.params.beginCreateTime != ''
+            <if test="sc.ids == null or sc.ids.length == 0">
+                <if test="manageTagsList != null and manageTagsList.size() > 0">
+                    <foreach collection="manageTagsList" item="tag" separator="or" open="and (" close=")">
+                        bs.manage_tags like concat('%', #{tag}, '%')
+                    </foreach>
+                </if>
+                <!--            <if test="sc.sheepfoldId != null">-->
+                <!--                and bs.sheepfold_id = #{sc.sheepfoldId}-->
+                <!--            </if>-->
+                <if test="sc.technician != null and sc.technician != ''">
+                    and scc.technician like concat('%', #{sc.technician}, '%')
+                </if>
+                <if test="sc.newComment != null and sc.newComment != ''">
+                    and scc.new_comment like concat('%', #{sc.newComment}, '%')
+                </if>
+                <if test="sc.oldComment != null and sc.oldComment != ''">
+                    and scc.old_comment like concat('%', #{sc.oldComment}, '%')
+                </if>
+                <if test="sc.params != null and sc.params.beginCreateTime != null and sc.params.beginCreateTime != ''
       and sc.params.endCreateTime != null and sc.params.endCreateTime != ''">
-                and scc.create_time between #{sc.params.beginCreateTime} and #{sc.params.endCreateTime}
-            </if>
-            <if test="sc.params != null and sc.params.beginEventDate != null and sc.params.beginEventDate != ''
+                    and scc.create_time between #{sc.params.beginCreateTime} and #{sc.params.endCreateTime}
+                </if>
+                <if test="sc.params != null and sc.params.beginEventDate != null and sc.params.beginEventDate != ''
       and sc.params.endEventDate != null and sc.params.endEventDate != ''">
-                and scc.event_date between #{sc.params.beginEventDate} and #{sc.params.endEventDate}
-            </if>
-            <if test="sc.isDelete != null">
-                and bs.is_delete = #{sc.isDelete}
+                    and scc.event_date between #{sc.params.beginEventDate} and #{sc.params.endEventDate}
+                </if>
+                <if test="sc.isDelete != null">
+                    and bs.is_delete = #{sc.isDelete}
+                </if>
             </if>
             ${sc.params.dataScope}
         </where>
diff --git a/zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScChangeEarMapper.xml b/zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScChangeEarMapper.xml
index f33c1f7..bde3d71 100644
--- a/zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScChangeEarMapper.xml
+++ b/zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScChangeEarMapper.xml
@@ -48,30 +48,40 @@
     <select id="selectScChangeEarList" resultMap="ScChangeEarResult">
         <include refid="selectScChangeEarVo"/>
         <where>
-            <if test="sc.sheepId != null">and sce.sheep_id = #{sc.sheepId}</if>
-            <if test="manageTagsList != null and manageTagsList.size() > 0">
-                <foreach collection="manageTagsList" item="tag" separator="or" open="and (" close=")">
-                    (bs.manage_tags like concat('%', #{tag}, '%')
-                    or bs.electronic_tags like concat('%', #{tag}, '%'))
+            <if test="sc.ids != null and sc.ids.length > 0">
+                AND sce.id IN
+                <foreach collection="sc.ids" item="id" open="(" separator="," close=")">
+                    #{id}
                 </foreach>
             </if>
-            <if test="sc.technician != null and sc.technician != ''">and sce.technician like concat('%', #{sc.technician}, '%')</if>
-            <if test="sc.earType != null">and sce.ear_type = #{sc.earType}</if>
-            <if test="sc.newTag != null and sc.newTag != ''">and sce.newTag like concat('%', #{sc.newTag}, '%')</if>
-            <if test="sc.oldTag != null and sc.oldTag != ''">and sce.oldTag like concat('%', #{sc.oldTag}, '%')</if>
-            <if test="sc.params != null and sc.params.beginCreateTime != null and sc.params.beginCreateTime != ''
+            <if test="sc.ids == null or sc.ids.length == 0">
+                <if test="sc.sheepId != null">and sce.sheep_id = #{sc.sheepId}</if>
+                <if test="manageTagsList != null and manageTagsList.size() > 0">
+                    <foreach collection="manageTagsList" item="tag" separator="or" open="and (" close=")">
+                        (bs.manage_tags like concat('%', #{tag}, '%')
+                        or bs.electronic_tags like concat('%', #{tag}, '%'))
+                    </foreach>
+                </if>
+                <if test="sc.technician != null and sc.technician != ''">and sce.technician like concat('%',
+                    #{sc.technician}, '%')
+                </if>
+                <if test="sc.earType != null">and sce.ear_type = #{sc.earType}</if>
+                <if test="sc.newTag != null and sc.newTag != ''">and sce.newTag like concat('%', #{sc.newTag}, '%')</if>
+                <if test="sc.oldTag != null and sc.oldTag != ''">and sce.oldTag like concat('%', #{sc.oldTag}, '%')</if>
+                <if test="sc.params != null and sc.params.beginCreateTime != null and sc.params.beginCreateTime != ''
               and sc.params.endCreateTime != null and sc.params.endCreateTime != ''">
-                and sce.create_time between #{sc.params.beginCreateTime} and #{sc.params.endCreateTime}
-            </if>
-            <if test="sc.params != null and sc.params.beginEventDate != null and sc.params.beginEventDate != ''
+                    and sce.create_time between #{sc.params.beginCreateTime} and #{sc.params.endCreateTime}
+                </if>
+                <if test="sc.params != null and sc.params.beginEventDate != null and sc.params.beginEventDate != ''
               and sc.params.endEventDate != null and sc.params.endEventDate != ''">
-                and sce.event_date between #{sc.params.beginEventDate} and #{sc.params.endEventDate}
-            </if>
-            <if test="sc.inGroup != null">
-                <choose>
-                    <when test="sc.inGroup == 1">and bs.is_delete = 0</when>
-                    <when test="sc.inGroup == 2">and bs.is_delete = 1</when>
-                </choose>
+                    and sce.event_date between #{sc.params.beginEventDate} and #{sc.params.endEventDate}
+                </if>
+                <if test="sc.inGroup != null">
+                    <choose>
+                        <when test="sc.inGroup == 1">and bs.is_delete = 0</when>
+                        <when test="sc.inGroup == 2">and bs.is_delete = 1</when>
+                    </choose>
+                </if>
             </if>
             ${sc.params.dataScope}
         </where>
diff --git a/zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScChangeVarietyMapper.xml b/zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScChangeVarietyMapper.xml
index c3b9bf4..11bef91 100644
--- a/zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScChangeVarietyMapper.xml
+++ b/zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScChangeVarietyMapper.xml
@@ -40,30 +40,38 @@
     <select id="selectScChangeVarietyList" resultMap="ScChangeVarietyResult">
         <include refid="selectScChangeVarietyVo"/>
         <where>
-            <if test="manageTagsList != null and manageTagsList.size() > 0">
-                <foreach collection="manageTagsList" item="tag" separator="or" open="and (" close=")">
-                    bs.manage_tags like concat('%', #{tag}, '%')
+            <if test="sc.ids != null and sc.ids.length > 0">
+                and scv.id IN
+                <foreach collection="sc.ids" item="id" open="(" separator="," close=")">
+                    #{id}
                 </foreach>
             </if>
-            <if test="sc.sheepId != null">and scv.sheep_id = #{sc.sheepId}</if>
-            <!--            <if test="sc.sheepfoldId != null">and bs.sheepfold_id = #{sc.sheepfoldId}</if>-->
-            <if test="sc.technician != null and sc.technician != ''">and scv.technician like concat('%',
-                #{sc.technician}, '%')
-            </if>
-            <if test="sc.varietyOld != null and sc.varietyOld != ''">and scv.variety_old like concat('%',
-                #{sc.varietyOld}, '%')
-            </if>
-            <if test="sc.varietyNew != null and sc.varietyNew != ''">and scv.variety_new like concat('%',
-                #{sc.varietyNew}, '%')
-            </if>
-            <if test="sc.params != null and sc.params.beginCreateTime != null and sc.params.beginCreateTime != '' and sc.params.endCreateTime != null and sc.params.endCreateTime != ''">
-                and scv.create_time between #{sc.params.beginCreateTime} and #{sc.params.endCreateTime}
-            </if>
-            <if test="sc.params != null and sc.params.beginEventDate != null and sc.params.beginEventDate != '' and sc.params.endEventDate != null and sc.params.endEventDate != ''">
-                and scv.event_date between #{sc.params.beginEventDate} and #{sc.params.endEventDate}
-            </if>
-            <if test="sc.isDelete != null">
-                and bs.is_delete = #{sc.isDelete}
+            <if test="sc.ids == null or sc.ids.length == 0">
+                <if test="manageTagsList != null and manageTagsList.size() > 0">
+                    <foreach collection="manageTagsList" item="tag" separator="or" open="and (" close=")">
+                        bs.manage_tags like concat('%', #{tag}, '%')
+                    </foreach>
+                </if>
+                <if test="sc.sheepId != null">and scv.sheep_id = #{sc.sheepId}</if>
+                <!--            <if test="sc.sheepfoldId != null">and bs.sheepfold_id = #{sc.sheepfoldId}</if>-->
+                <if test="sc.technician != null and sc.technician != ''">and scv.technician like concat('%',
+                    #{sc.technician}, '%')
+                </if>
+                <if test="sc.varietyOld != null and sc.varietyOld != ''">and scv.variety_old like concat('%',
+                    #{sc.varietyOld}, '%')
+                </if>
+                <if test="sc.varietyNew != null and sc.varietyNew != ''">and scv.variety_new like concat('%',
+                    #{sc.varietyNew}, '%')
+                </if>
+                <if test="sc.params != null and sc.params.beginCreateTime != null and sc.params.beginCreateTime != '' and sc.params.endCreateTime != null and sc.params.endCreateTime != ''">
+                    and scv.create_time between #{sc.params.beginCreateTime} and #{sc.params.endCreateTime}
+                </if>
+                <if test="sc.params != null and sc.params.beginEventDate != null and sc.params.beginEventDate != '' and sc.params.endEventDate != null and sc.params.endEventDate != ''">
+                    and scv.event_date between #{sc.params.beginEventDate} and #{sc.params.endEventDate}
+                </if>
+                <if test="sc.isDelete != null">
+                    and bs.is_delete = #{sc.isDelete}
+                </if>
             </if>
             ${sc.params.dataScope}
         </where>
diff --git a/zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScTransGroupMapper.xml b/zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScTransGroupMapper.xml
index 03cbb40..49de8f1 100644
--- a/zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScTransGroupMapper.xml
+++ b/zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScTransGroupMapper.xml
@@ -54,27 +54,35 @@
     <select id="selectScTransGroupList" resultMap="ScTransGroupResult">
         <include refid="selectScTransGroupVo"/>
         <where>
-            <if test="sc.manageTagsList != null and sc.manageTagsList.size() > 0">
-                <foreach collection="sc.manageTagsList" item="tag" separator="or" open="and (" close=")">
-                    s.manage_tags LIKE CONCAT('%', #{tag}, '%')
+            <if test="sc.ids != null and sc.ids.length > 0">
+                and tg.id IN
+                <foreach collection="sc.ids" item="id" open="(" separator="," close=")">
+                    #{id}
                 </foreach>
             </if>
-            <if test="sc.sheepId != null">and tg.sheep_id = #{sc.sheepId}</if>
-            <if test="sc.foldTo != null and sc.foldTo != ''">and tg.fold_to = #{sc.foldTo}</if>
-            <if test="sc.foldFrom != null and sc.foldFrom != ''">and tg.fold_from = #{sc.foldFrom}</if>
-            <if test="sc.varietyId != null">and tg.variety_id = #{sc.varietyId}</if>
-            <if test="sc.sheepTypeId != null">and st.id = #{sc.sheepTypeId}</if>
-            <if test="sc.params != null and sc.params.beginTransDate != null and sc.params.beginTransDate != '' and sc.params.endTransDate != null and sc.params.endTransDate != ''">
-                and tg.trans_date between #{sc.params.beginTransDate} and #{sc.params.endTransDate}
-            </if>
-            <if test="sc.eventType != null and sc.eventType != ''">
-                and tg.event_type like concat('%', #{sc.eventType}, '%')
-            </if>
-            <if test="sc.technician != null and sc.technician != ''">
-                and tg.technician like concat('%', #{sc.technician}, '%')
-            </if>
-            <if test="sc.isDelete != null">
-                and s.is_delete = #{sc.isDelete}
+            <if test="sc.ids == null or sc.ids.length == 0">
+                <if test="sc.manageTagsList != null and sc.manageTagsList.size() > 0">
+                    <foreach collection="sc.manageTagsList" item="tag" separator="or" open="and (" close=")">
+                        s.manage_tags LIKE CONCAT('%', #{tag}, '%')
+                    </foreach>
+                </if>
+                <if test="sc.sheepId != null">and tg.sheep_id = #{sc.sheepId}</if>
+                <if test="sc.foldTo != null and sc.foldTo != ''">and tg.fold_to = #{sc.foldTo}</if>
+                <if test="sc.foldFrom != null and sc.foldFrom != ''">and tg.fold_from = #{sc.foldFrom}</if>
+                <if test="sc.varietyId != null">and tg.variety_id = #{sc.varietyId}</if>
+                <if test="sc.sheepTypeId != null">and st.id = #{sc.sheepTypeId}</if>
+                <if test="sc.params != null and sc.params.beginTransDate != null and sc.params.beginTransDate != '' and sc.params.endTransDate != null and sc.params.endTransDate != ''">
+                    and tg.trans_date between #{sc.params.beginTransDate} and #{sc.params.endTransDate}
+                </if>
+                <if test="sc.eventType != null and sc.eventType != ''">
+                    and tg.event_type like concat('%', #{sc.eventType}, '%')
+                </if>
+                <if test="sc.technician != null and sc.technician != ''">
+                    and tg.technician like concat('%', #{sc.technician}, '%')
+                </if>
+                <if test="sc.isDelete != null">
+                    and s.is_delete = #{sc.isDelete}
+                </if>
             </if>
             ${sc.params.dataScope}
         </where>
diff --git a/zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScTransitionInfoMapper.xml b/zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScTransitionInfoMapper.xml
index 103a98d..8f39fa9 100644
--- a/zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScTransitionInfoMapper.xml
+++ b/zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScTransitionInfoMapper.xml
@@ -55,31 +55,39 @@
     <select id="selectScTransitionInfoList" resultMap="ScTransitionInfoResult">
         <include refid="selectScTransitionInfoVo"/>
         <where>
-            <if test="manageTagsList != null and manageTagsList.size() > 0">
-                <foreach collection="manageTagsList" item="tag" separator="or" open="and (" close=")">
-                    bs.manage_tags like concat('%', #{tag}, '%')
+            <if test="sc.ids != null and sc.ids.length > 0">
+                and t.id IN
+                <foreach collection="sc.ids" item="id" open="(" separator="," close=")">
+                    #{id}
                 </foreach>
             </if>
-            <if test="sc.sheepId != null">and t.sheep_id = #{sc.sheepId}</if>
-            <if test="sc.transType != null">and t.trans_type = #{sc.transType}</if>
-            <if test="sc.varietyId != null">and bs.variety_id = #{sc.varietyId}</if>
-            <if test="sc.transTo != null and sc.transTo != ''">and t.trans_to = #{sc.transTo}</if>
-            <if test="sc.transFrom != null and sc.transFrom != ''">and t.trans_from = #{sc.transFrom}</if>
-            <if test="sc.status != null">and t.status = #{sc.status}</if>
-            <if test="sc.params != null and sc.params.beginTransitionDate != null and sc.params.beginTransitionDate != '' and sc.params.endTransitionDate != null and sc.params.endTransitionDate != ''">
-                and t.transition_date between #{sc.params.beginTransitionDate} and #{sc.params.endTransitionDate}
-            </if>
-            <if test="sc.technician != null and sc.technician != ''">
-                and t.technician like concat('%', #{sc.technician}, '%')
-            </if>
-            <if test="sc.isDelete != null">
-                and bs.is_delete = #{sc.isDelete}
-            </if>
-            <if test="sc.sheepTypeId != null">
-                and bs.type_id = #{sc.sheepTypeId}
-            </if>
-            <if test="sc.currentRanchId != null">
-                and bs.ranch_id = #{sc.currentRanchId}
+            <if test="sc.ids == null or sc.ids.length == 0">
+                <if test="manageTagsList != null and manageTagsList.size() > 0">
+                    <foreach collection="manageTagsList" item="tag" separator="or" open="and (" close=")">
+                        bs.manage_tags like concat('%', #{tag}, '%')
+                    </foreach>
+                </if>
+                <if test="sc.sheepId != null">and t.sheep_id = #{sc.sheepId}</if>
+                <if test="sc.transType != null">and t.trans_type = #{sc.transType}</if>
+                <if test="sc.varietyId != null">and bs.variety_id = #{sc.varietyId}</if>
+                <if test="sc.transTo != null and sc.transTo != ''">and t.trans_to = #{sc.transTo}</if>
+                <if test="sc.transFrom != null and sc.transFrom != ''">and t.trans_from = #{sc.transFrom}</if>
+                <if test="sc.status != null">and t.status = #{sc.status}</if>
+                <if test="sc.params != null and sc.params.beginTransitionDate != null and sc.params.beginTransitionDate != '' and sc.params.endTransitionDate != null and sc.params.endTransitionDate != ''">
+                    and t.transition_date between #{sc.params.beginTransitionDate} and #{sc.params.endTransitionDate}
+                </if>
+                <if test="sc.technician != null and sc.technician != ''">
+                    and t.technician like concat('%', #{sc.technician}, '%')
+                </if>
+                <if test="sc.isDelete != null">
+                    and bs.is_delete = #{sc.isDelete}
+                </if>
+                <if test="sc.sheepTypeId != null">
+                    and bs.type_id = #{sc.sheepTypeId}
+                </if>
+                <if test="sc.currentRanchId != null">
+                    and bs.ranch_id = #{sc.currentRanchId}
+                </if>
             </if>
             ${sc.params.dataScope}
         </where>
@@ -91,41 +99,41 @@
         WHERE t.id = #{id}
     </select>
 
-<!--    <insert id="insertScTransitionInfo" parameterType="ScTransitionInfo" useGeneratedKeys="true" keyProperty="id">-->
-<!--        insert into sc_transition_info-->
-<!--        <trim prefix="(" suffix=")" suffixOverrides=",">-->
-<!--            <if test="sheepId != null">sheep_id,</if>-->
-<!--            <if test="varietyId != null">variety_id,</if>-->
-<!--            <if test="transTo != null and transTo != ''">trans_to,</if>-->
-<!--            <if test="transFrom != null and transFrom != ''">trans_from,</if>-->
-<!--            <if test="eventType != null and eventType != ''">event_type,</if>-->
-<!--            <if test="transType != null">trans_type,</if>-->
-<!--            <if test="transitionDate != null">transition_date,</if>-->
-<!--            <if test="technician != null and technician != ''">technician,</if>-->
-<!--            <if test="status != null">status,</if>-->
-<!--            <if test="comment != null">comment,</if>-->
-<!--            <if test="createBy != null">create_by,</if>-->
-<!--            <if test="createTime != null">create_time,</if>-->
-<!--            <if test="userId != null">user_id,</if>-->
-<!--            <if test="deptId != null">dept_id,</if>-->
-<!--        </trim>-->
-<!--        <trim prefix="values (" suffix=")" suffixOverrides=",">-->
-<!--            <if test="sheepId != null">#{sheepId},</if>-->
-<!--            <if test="varietyId != null">#{varietyId},</if>-->
-<!--            <if test="transTo != null and transTo != ''">#{transTo},</if>-->
-<!--            <if test="transFrom != null and transFrom != ''">#{transFrom},</if>-->
-<!--            <if test="eventType != null and eventType != ''">#{eventType},</if>-->
-<!--            <if test="transType != null">#{transType},</if>-->
-<!--            <if test="transitionDate != null">#{transitionDate},</if>-->
-<!--            <if test="technician != null and technician != ''">#{technician},</if>-->
-<!--            <if test="status != null">#{status},</if>-->
-<!--            <if test="comment != null">#{comment},</if>-->
-<!--            <if test="createBy != null">#{createBy},</if>-->
-<!--            <if test="createTime != null">#{createTime},</if>-->
-<!--            <if test="userId != null">#{userId},</if>-->
-<!--            <if test="deptId != null">#{deptId},</if>-->
-<!--        </trim>-->
-<!--    </insert>-->
+    <!--    <insert id="insertScTransitionInfo" parameterType="ScTransitionInfo" useGeneratedKeys="true" keyProperty="id">-->
+    <!--        insert into sc_transition_info-->
+    <!--        <trim prefix="(" suffix=")" suffixOverrides=",">-->
+    <!--            <if test="sheepId != null">sheep_id,</if>-->
+    <!--            <if test="varietyId != null">variety_id,</if>-->
+    <!--            <if test="transTo != null and transTo != ''">trans_to,</if>-->
+    <!--            <if test="transFrom != null and transFrom != ''">trans_from,</if>-->
+    <!--            <if test="eventType != null and eventType != ''">event_type,</if>-->
+    <!--            <if test="transType != null">trans_type,</if>-->
+    <!--            <if test="transitionDate != null">transition_date,</if>-->
+    <!--            <if test="technician != null and technician != ''">technician,</if>-->
+    <!--            <if test="status != null">status,</if>-->
+    <!--            <if test="comment != null">comment,</if>-->
+    <!--            <if test="createBy != null">create_by,</if>-->
+    <!--            <if test="createTime != null">create_time,</if>-->
+    <!--            <if test="userId != null">user_id,</if>-->
+    <!--            <if test="deptId != null">dept_id,</if>-->
+    <!--        </trim>-->
+    <!--        <trim prefix="values (" suffix=")" suffixOverrides=",">-->
+    <!--            <if test="sheepId != null">#{sheepId},</if>-->
+    <!--            <if test="varietyId != null">#{varietyId},</if>-->
+    <!--            <if test="transTo != null and transTo != ''">#{transTo},</if>-->
+    <!--            <if test="transFrom != null and transFrom != ''">#{transFrom},</if>-->
+    <!--            <if test="eventType != null and eventType != ''">#{eventType},</if>-->
+    <!--            <if test="transType != null">#{transType},</if>-->
+    <!--            <if test="transitionDate != null">#{transitionDate},</if>-->
+    <!--            <if test="technician != null and technician != ''">#{technician},</if>-->
+    <!--            <if test="status != null">#{status},</if>-->
+    <!--            <if test="comment != null">#{comment},</if>-->
+    <!--            <if test="createBy != null">#{createBy},</if>-->
+    <!--            <if test="createTime != null">#{createTime},</if>-->
+    <!--            <if test="userId != null">#{userId},</if>-->
+    <!--            <if test="deptId != null">#{deptId},</if>-->
+    <!--        </trim>-->
+    <!--    </insert>-->
 
     <insert id="insertScTransitionInfoBatch">
         INSERT INTO sc_transition_info (
@@ -135,7 +143,8 @@
         ) VALUES
         <foreach collection="list" item="item" separator=",">
             (
-            #{item.sheepId},#{item.sheepfoldId}, #{item.varietyId}, #{item.transTo}, #{item.transFrom}, #{item.eventType},
+            #{item.sheepId},#{item.sheepfoldId}, #{item.varietyId}, #{item.transTo}, #{item.transFrom},
+            #{item.eventType},
             #{item.transType},#{item.transitionDate}, #{item.technician}, #{item.status}, #{item.comment},
             #{item.createBy}, now(), #{item.userId},
             #{item.deptId}
diff --git a/zhyc-module/src/main/resources/mapper/produce/other/ScCastrateMapper.xml b/zhyc-module/src/main/resources/mapper/produce/other/ScCastrateMapper.xml
index 66d31e2..fee83f9 100644
--- a/zhyc-module/src/main/resources/mapper/produce/other/ScCastrateMapper.xml
+++ b/zhyc-module/src/main/resources/mapper/produce/other/ScCastrateMapper.xml
@@ -24,7 +24,7 @@
         select sc.id,
                sc.sheep_id,
                bs.manage_tags    as manageTags,
-               '去势' as event_type,
+               '去势'            as event_type,
                bs.sheepfold_id   as sheepfold,
                sf.sheepfold_name as sheepfoldName,
                bs.variety_id     as varietyId,
@@ -43,24 +43,32 @@
     <select id="selectScCastrateList" resultMap="ScCastrateResult">
         <include refid="selectScCastrateVo"/>
         <where>
-            <if test="manageTagsList != null and manageTagsList.size() > 0">
-                <foreach collection="manageTagsList" item="tag" separator="or" open="and (" close=")">
-                    bs.manage_tags like concat('%', #{tag}, '%')
+            <if test="sc.ids != null and sc.ids.length > 0">
+                and sc.id IN
+                <foreach collection="sc.ids" item="id" open="(" separator="," close=")">
+                    #{id}
                 </foreach>
             </if>
-            <if test="sc.sheepfold != null">and bs.sheepfold_id = #{sc.sheepfold}</if>
-            <if test="sc.varietyId != null">and bs.variety_id = #{sc.varietyId}</if>
-            <if test="sc.technician != null and sc.technician != ''">
-                and sc.technician like concat('%', #{sc.technician}, '%')
-            </if>
-            <if test="sc.params != null and sc.params.beginCreateTime != null and sc.params.beginCreateTime != '' and sc.params.endCreateTime != null and sc.params.endCreateTime != ''">
-                and sc.create_time between #{sc.params.beginCreateTime} and #{sc.params.endCreateTime}
-            </if>
-            <if test="sc.params != null and sc.params.beginEventDate != null and sc.params.beginEventDate != '' and sc.params.endEventDate != null and sc.params.endEventDate != ''">
-                and sc.event_date between #{sc.params.beginEventDate} and #{sc.params.endEventDate}
-            </if>
-            <if test="sc.isDelete != null">
-                and bs.is_delete = #{sc.isDelete}
+            <if test="sc.ids == null or sc.ids.length == 0">
+                <if test="manageTagsList != null and manageTagsList.size() > 0">
+                    <foreach collection="manageTagsList" item="tag" separator="or" open="and (" close=")">
+                        bs.manage_tags like concat('%', #{tag}, '%')
+                    </foreach>
+                </if>
+                <if test="sc.sheepfold != null">and bs.sheepfold_id = #{sc.sheepfold}</if>
+                <if test="sc.varietyId != null">and bs.variety_id = #{sc.varietyId}</if>
+                <if test="sc.technician != null and sc.technician != ''">
+                    and sc.technician like concat('%', #{sc.technician}, '%')
+                </if>
+                <if test="sc.params != null and sc.params.beginCreateTime != null and sc.params.beginCreateTime != '' and sc.params.endCreateTime != null and sc.params.endCreateTime != ''">
+                    and sc.create_time between #{sc.params.beginCreateTime} and #{sc.params.endCreateTime}
+                </if>
+                <if test="sc.params != null and sc.params.beginEventDate != null and sc.params.beginEventDate != '' and sc.params.endEventDate != null and sc.params.endEventDate != ''">
+                    and sc.event_date between #{sc.params.beginEventDate} and #{sc.params.endEventDate}
+                </if>
+                <if test="sc.isDelete != null">
+                    and bs.is_delete = #{sc.isDelete}
+                </if>
             </if>
             ${sc.params.dataScope}
         </where>
diff --git a/zhyc-module/src/main/resources/mapper/produce/other/ScFixHoofMapper.xml b/zhyc-module/src/main/resources/mapper/produce/other/ScFixHoofMapper.xml
index 6622a68..c36f433 100644
--- a/zhyc-module/src/main/resources/mapper/produce/other/ScFixHoofMapper.xml
+++ b/zhyc-module/src/main/resources/mapper/produce/other/ScFixHoofMapper.xml
@@ -40,24 +40,32 @@
     <select id="selectScFixHoofList" resultMap="ScFixHoofResult">
         <include refid="selectScFixHoofVo"/>
         <where>
-            <if test="manageTagsList != null and manageTagsList.size() > 0">
-                <foreach collection="manageTagsList" item="tag" separator="or" open="and (" close=")">
-                    bs.manage_tags like concat('%', #{tag}, '%')
+            <if test="sc.ids != null and sc.ids.length > 0">
+                and fh.id IN
+                <foreach collection="sc.ids" item="id" open="(" separator="," close=")">
+                    #{id}
                 </foreach>
             </if>
-            <if test="sc.sheepfold != null">and bs.sheepfold_id = #{sc.sheepfold}</if>
-            <if test="sc.varietyId != null">and bs.variety_id = #{sc.varietyId}</if>
-            <if test="sc.technician != null and sc.technician != ''">and fh.technician like concat('%',
-                #{sc.technician}, '%')
-            </if>
-            <if test="sc.params != null and sc.params.beginCreateTime != null and sc.params.beginCreateTime != '' and sc.params.endCreateTime != null and sc.params.endCreateTime != ''">
-                and fh.create_time between #{sc.params.beginCreateTime} and #{sc.params.endCreateTime}
-            </if>
-            <if test="sc.params != null and sc.params.beginEventDate != null and sc.params.beginEventDate != '' and sc.params.endEventDate != null and sc.params.endEventDate != ''">
-                and fh.event_date between #{sc.params.beginEventDate} and #{sc.params.endEventDate}
-            </if>
-            <if test="sc.isDelete != null">
-                and bs.is_delete = #{sc.isDelete}
+            <if test="sc.ids == null or sc.ids.length == 0">
+                <if test="manageTagsList != null and manageTagsList.size() > 0">
+                    <foreach collection="manageTagsList" item="tag" separator="or" open="and (" close=")">
+                        bs.manage_tags like concat('%', #{tag}, '%')
+                    </foreach>
+                </if>
+                <if test="sc.sheepfold != null">and bs.sheepfold_id = #{sc.sheepfold}</if>
+                <if test="sc.varietyId != null">and bs.variety_id = #{sc.varietyId}</if>
+                <if test="sc.technician != null and sc.technician != ''">and fh.technician like concat('%',
+                    #{sc.technician}, '%')
+                </if>
+                <if test="sc.params != null and sc.params.beginCreateTime != null and sc.params.beginCreateTime != '' and sc.params.endCreateTime != null and sc.params.endCreateTime != ''">
+                    and fh.create_time between #{sc.params.beginCreateTime} and #{sc.params.endCreateTime}
+                </if>
+                <if test="sc.params != null and sc.params.beginEventDate != null and sc.params.beginEventDate != '' and sc.params.endEventDate != null and sc.params.endEventDate != ''">
+                    and fh.event_date between #{sc.params.beginEventDate} and #{sc.params.endEventDate}
+                </if>
+                <if test="sc.isDelete != null">
+                    and bs.is_delete = #{sc.isDelete}
+                </if>
             </if>
             ${sc.params.dataScope}
         </where>