From ed2daf6cfa2d7477940106a25ddd48b462ce6c80 Mon Sep 17 00:00:00 2001
From: HashMap <xiaojingye0817@gmail.com>
Date: Sun, 18 Jan 2026 15:46:39 +0800
Subject: [PATCH 1/5] =?UTF-8?q?perf(module/feed):=20=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=94=AF=E6=8C=81=E6=A8=A1=E7=B3=8A=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修改SQL Mapper使用`CONCAT('%',?,'%')`支持模糊查询
---
 .../src/main/resources/mapper/feed/SgFeedListMapper.xml     | 6 +++---
 .../src/main/resources/mapper/feed/SgFeedPlanMapper.xml     | 6 +++---
 .../main/resources/mapper/feed/SgFeedStatisticMapper.xml    | 4 ++--
 .../src/main/resources/mapper/feed/SgFormulaListMapper.xml  | 6 +++---
 .../resources/mapper/feed/SgFormulaManagementMapper.xml     | 6 +++---
 .../src/main/resources/mapper/feed/SgMaterialMapper.xml     | 2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/zhyc-module/src/main/resources/mapper/feed/SgFeedListMapper.xml b/zhyc-module/src/main/resources/mapper/feed/SgFeedListMapper.xml
index 86932be..ae43230 100644
--- a/zhyc-module/src/main/resources/mapper/feed/SgFeedListMapper.xml
+++ b/zhyc-module/src/main/resources/mapper/feed/SgFeedListMapper.xml
@@ -19,9 +19,9 @@
     <select id="selectSgFeedListList" parameterType="SgFeedList" resultMap="SgFeedListResult">
         <include refid="selectSgFeedListVo"/>
         <where>
-            <if test="formulaId != null  and formulaId != ''"> and formula_id = #{formulaId}</if>
-            <if test="formulaBatchId != null  and formulaBatchId != ''"> and formula_batch_id = #{formulaBatchId}</if>
-            <if test="zookeeper != null  and zookeeper != ''"> and zookeeper = #{zookeeper}</if>
+            <if test="formulaId != null  and formulaId != ''"> and formula_id LIKE CONCAT('%',#{formulaId},'%')</if>
+            <if test="formulaBatchId != null  and formulaBatchId != ''"> and formula_batch_id LIKE CONCAT('%',#{formulaBatchId},'%')</if>
+            <if test="zookeeper != null  and zookeeper != ''"> and zookeeper LIKE CONCAT('%',#{zookeeper},'%')</if>
             <if test="deployDate != null "> and deploy_date = #{deployDate}</if>
         </where>
         ORDER BY deploy_date ASC, formula_id ASC, formula_batch_id ASC
diff --git a/zhyc-module/src/main/resources/mapper/feed/SgFeedPlanMapper.xml b/zhyc-module/src/main/resources/mapper/feed/SgFeedPlanMapper.xml
index cf23ac3..8d7af3f 100644
--- a/zhyc-module/src/main/resources/mapper/feed/SgFeedPlanMapper.xml
+++ b/zhyc-module/src/main/resources/mapper/feed/SgFeedPlanMapper.xml
@@ -36,9 +36,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectSgFeedPlanList" parameterType="SgFeedPlan" resultMap="SgFeedPlanResult">
         <include refid="selectSgFeedPlanVo"/>
         <where>  
-            <if test="formulaId != null  and formulaId != ''"> and formula_id = #{formulaId}</if>
-            <if test="batchId != null  and batchId != ''"> and batch_id = #{batchId}</if>
-            <if test="sheepHouseId != null "> and sheep_house_id = #{sheepHouseId}</if>
+            <if test="formulaId != null  and formulaId != ''"> and formula_id LIKE CONCAT('%',#{formulaId},'%')</if>
+            <if test="batchId != null  and batchId != ''"> and batch_id LIKE CONCAT('%',#{batchId},'%')</if>
+            <if test="sheepHouseId != null "> and sheep_house_id LIKE CONCAT('%',#{sheepHouseId},'%')</if>
             <if test="planDate != null "> and plan_date = #{planDate}</if>
         </where>
         ORDER BY plan_date ASC, formula_id ASC , batch_id ASC
diff --git a/zhyc-module/src/main/resources/mapper/feed/SgFeedStatisticMapper.xml b/zhyc-module/src/main/resources/mapper/feed/SgFeedStatisticMapper.xml
index 0bd9657..4cd4a36 100644
--- a/zhyc-module/src/main/resources/mapper/feed/SgFeedStatisticMapper.xml
+++ b/zhyc-module/src/main/resources/mapper/feed/SgFeedStatisticMapper.xml
@@ -31,8 +31,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectSgFeedStatisticList" parameterType="SgFeedStatistic" resultMap="SgFeedStatisticResult">
         <include refid="selectSgFeedStatisticVo"/>
         <where>  
-            <if test="formulaId != null  and formulaId != ''"> and formula_id = #{formulaId}</if>
-            <if test="formulaBatchId != null  and formulaBatchId != ''"> and formula_batch_id = #{formulaBatchId}</if>
+            <if test="formulaId != null  and formulaId != ''"> and formula_id LIKE CONCAT('%',#{formulaId},'%')</if>
+            <if test="formulaBatchId != null  and formulaBatchId != ''"> and formula_batch_id = LIKE CONCAT('%',#{formulaBatchId},'%')</if>
             <if test="silageLossRate != null  and silageLossRate != ''"> and silage_loss_rate = #{silageLossRate}</if>
         </where>
     </select>
diff --git a/zhyc-module/src/main/resources/mapper/feed/SgFormulaListMapper.xml b/zhyc-module/src/main/resources/mapper/feed/SgFormulaListMapper.xml
index f422ccb..98d1018 100644
--- a/zhyc-module/src/main/resources/mapper/feed/SgFormulaListMapper.xml
+++ b/zhyc-module/src/main/resources/mapper/feed/SgFormulaListMapper.xml
@@ -22,9 +22,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectSgFormulaListList" parameterType="SgFormulaList" resultMap="SgFormulaListResult">
         <include refid="selectSgFormulaListVo"/>
         <where>
-            <if test="materialId != null  and materialId != ''">material_id = #{materialId}</if>
-            <if test="formulaId != null  and formulaId != ''">and formula_id = #{formulaId}</if>
-            <if test="batchId != null  and batchId != ''"> and batch_id = #{batchId}</if>
+            <if test="materialId != null  and materialId != ''">material_id LIKE CONCAT('%',#{materialId},'%')</if>
+            <if test="formulaId != null  and formulaId != ''">and formula_id LIKE CONCAT('%',#{formulaId},'%')</if>
+            <if test="batchId != null  and batchId != ''"> and batch_id LIKE CONCAT('%',#{batchId},'%')</if>
         </where>
     </select>
     
diff --git a/zhyc-module/src/main/resources/mapper/feed/SgFormulaManagementMapper.xml b/zhyc-module/src/main/resources/mapper/feed/SgFormulaManagementMapper.xml
index 17602f1..38f923a 100644
--- a/zhyc-module/src/main/resources/mapper/feed/SgFormulaManagementMapper.xml
+++ b/zhyc-module/src/main/resources/mapper/feed/SgFormulaManagementMapper.xml
@@ -21,9 +21,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectSgFormulaManagementList" parameterType="SgFormulaManagement" resultMap="SgFormulaManagementResult">
         <include refid="selectSgFormulaManagementVo"/>
         <where>
-            <if test="formulaId != null  and formulaId != ''"> and formula_id = #{formulaId}</if>
-            <if test="feedStage != null  and feedStage != ''"> and feed_stage = #{feedStage}</if>
-            <if test="batchId != null  and batchId != ''"> and batch_id = #{batchId}</if>
+            <if test="formulaId != null  and formulaId != ''"> and formula_id LIKE CONCAT('%',#{formulaId},'%')</if>
+            <if test="feedStage != null  and feedStage != ''"> and feed_stage LIKE CONCAT('%',#{feedStage},'%')</if>
+            <if test="batchId != null  and batchId != ''"> and batch_id LIKE CONCAT('%',#{batchId},'%')</if>
         </where>
     </select>
     
diff --git a/zhyc-module/src/main/resources/mapper/feed/SgMaterialMapper.xml b/zhyc-module/src/main/resources/mapper/feed/SgMaterialMapper.xml
index 6129720..c593ff4 100644
--- a/zhyc-module/src/main/resources/mapper/feed/SgMaterialMapper.xml
+++ b/zhyc-module/src/main/resources/mapper/feed/SgMaterialMapper.xml
@@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectSgMaterialList" parameterType="SgMaterial" resultMap="SgMaterialResult">
         <include refid="selectSgMaterialVo"/>
         <where>  
-            <if test="materialId != null  and materialId != ''"> and material_id = #{materialId}</if>
+            <if test="materialId != null  and materialId != ''"> and material_id LIKE CONCAT('%',#{materialId},'%')</if>
             <if test="materialName != null  and materialName != ''"> and material_name like concat('%', #{materialName}, '%')</if>
             <if test="isGranular != null "> and is_granular = #{isGranular}</if>
         </where>

From c6d94f5a147a8b5bf990aa1e558adbed5ed091a5 Mon Sep 17 00:00:00 2001
From: zyh <2066096076@qq.com>
Date: Mon, 19 Jan 2026 11:50:37 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=BD=8D=E7=BD=AE?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service}/impl/ScAddSheepServiceImpl.java                    | 2 +-
 .../service}/impl/ScChangeCommentServiceImpl.java               | 2 +-
 .../service}/impl/ScChangeEarServiceImpl.java                   | 2 +-
 .../service}/impl/ScChangeVarietyServiceImpl.java               | 2 +-
 .../service}/impl/ScTransGroupServiceImpl.java                  | 2 +-
 .../service}/impl/ScTransitionInfoServiceImpl.java              | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename zhyc-module/src/main/java/com/zhyc/module/produce/{other/controller => manage_sheep/service}/impl/ScAddSheepServiceImpl.java (99%)
 rename zhyc-module/src/main/java/com/zhyc/module/produce/{other/controller => manage_sheep/service}/impl/ScChangeCommentServiceImpl.java (98%)
 rename zhyc-module/src/main/java/com/zhyc/module/produce/{other/controller => manage_sheep/service}/impl/ScChangeEarServiceImpl.java (99%)
 rename zhyc-module/src/main/java/com/zhyc/module/produce/{other/controller => manage_sheep/service}/impl/ScChangeVarietyServiceImpl.java (98%)
 rename zhyc-module/src/main/java/com/zhyc/module/produce/{other/controller => manage_sheep/service}/impl/ScTransGroupServiceImpl.java (99%)
 rename zhyc-module/src/main/java/com/zhyc/module/produce/{other/controller => manage_sheep/service}/impl/ScTransitionInfoServiceImpl.java (99%)

diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/other/controller/impl/ScAddSheepServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScAddSheepServiceImpl.java
similarity index 99%
rename from zhyc-module/src/main/java/com/zhyc/module/produce/other/controller/impl/ScAddSheepServiceImpl.java
rename to zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScAddSheepServiceImpl.java
index 17f20ec..4f3b0f2 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/produce/other/controller/impl/ScAddSheepServiceImpl.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScAddSheepServiceImpl.java
@@ -1,4 +1,4 @@
-package com.zhyc.module.produce.other.controller.impl;
+package com.zhyc.module.produce.manage_sheep.service.impl;
 
 import com.zhyc.common.exception.ServiceException;
 import com.zhyc.common.utils.StringUtils;
diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/other/controller/impl/ScChangeCommentServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScChangeCommentServiceImpl.java
similarity index 98%
rename from zhyc-module/src/main/java/com/zhyc/module/produce/other/controller/impl/ScChangeCommentServiceImpl.java
rename to zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScChangeCommentServiceImpl.java
index 8f34141..9d582d4 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/produce/other/controller/impl/ScChangeCommentServiceImpl.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScChangeCommentServiceImpl.java
@@ -1,4 +1,4 @@
-package com.zhyc.module.produce.other.controller.impl;
+package com.zhyc.module.produce.manage_sheep.service.impl;
 
 import java.util.Date;
 import java.util.List;
diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/other/controller/impl/ScChangeEarServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScChangeEarServiceImpl.java
similarity index 99%
rename from zhyc-module/src/main/java/com/zhyc/module/produce/other/controller/impl/ScChangeEarServiceImpl.java
rename to zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScChangeEarServiceImpl.java
index fcea6a2..fd968ff 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/produce/other/controller/impl/ScChangeEarServiceImpl.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScChangeEarServiceImpl.java
@@ -1,4 +1,4 @@
-package com.zhyc.module.produce.other.controller.impl;
+package com.zhyc.module.produce.manage_sheep.service.impl;
 
 import java.util.List;
 import com.zhyc.common.utils.DateUtils;
diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/other/controller/impl/ScChangeVarietyServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScChangeVarietyServiceImpl.java
similarity index 98%
rename from zhyc-module/src/main/java/com/zhyc/module/produce/other/controller/impl/ScChangeVarietyServiceImpl.java
rename to zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScChangeVarietyServiceImpl.java
index eaf93ae..be56bde 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/produce/other/controller/impl/ScChangeVarietyServiceImpl.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScChangeVarietyServiceImpl.java
@@ -1,4 +1,4 @@
-package com.zhyc.module.produce.other.controller.impl;
+package com.zhyc.module.produce.manage_sheep.service.impl;
 
 import java.util.Date;
 import java.util.List;
diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/other/controller/impl/ScTransGroupServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScTransGroupServiceImpl.java
similarity index 99%
rename from zhyc-module/src/main/java/com/zhyc/module/produce/other/controller/impl/ScTransGroupServiceImpl.java
rename to zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScTransGroupServiceImpl.java
index 3956ffc..59f8d59 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/produce/other/controller/impl/ScTransGroupServiceImpl.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScTransGroupServiceImpl.java
@@ -1,4 +1,4 @@
-package com.zhyc.module.produce.other.controller.impl;
+package com.zhyc.module.produce.manage_sheep.service.impl;
 
 import java.util.Arrays;
 import java.util.HashMap;
diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/other/controller/impl/ScTransitionInfoServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScTransitionInfoServiceImpl.java
similarity index 99%
rename from zhyc-module/src/main/java/com/zhyc/module/produce/other/controller/impl/ScTransitionInfoServiceImpl.java
rename to zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScTransitionInfoServiceImpl.java
index 0e4e329..1831c5d 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/produce/other/controller/impl/ScTransitionInfoServiceImpl.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScTransitionInfoServiceImpl.java
@@ -1,4 +1,4 @@
-package com.zhyc.module.produce.other.controller.impl;
+package com.zhyc.module.produce.manage_sheep.service.impl;
 
 import java.util.*;
 

From 32718378c9820f661107bbc4b815c0646259a45c Mon Sep 17 00:00:00 2001
From: zyh <2066096076@qq.com>
Date: Mon, 19 Jan 2026 12:46:49 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BE=8A=E5=8F=AA?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E6=A8=A1=E6=9D=BF=EF=BC=8C=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=96=AD=E5=A5=B6?=
 =?UTF-8?q?=E4=BD=93=E9=87=8D=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zhyc/module/produce/manage_sheep/domain/ScAddSheep.java   | 4 +++-
 .../manage_sheep/service/impl/ScAddSheepServiceImpl.java      | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScAddSheep.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScAddSheep.java
index e462111..4bb4444 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScAddSheep.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScAddSheep.java
@@ -90,7 +90,9 @@ public class ScAddSheep extends BaseEntity {
     @Excel(name = "技术员")
     private String technician;
 
-
+    /** 断奶体重(仅接收，不入库) */
+    @Excel(name = "断奶体重")
+    private BigDecimal weaningWeight;
     private String createBy;
     private Date createTime;
 
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 4f3b0f2..073a562 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
@@ -61,6 +61,7 @@ public class ScAddSheepServiceImpl implements IScAddSheepService {
         bs.setFatherId(null);
         bs.setMotherId(null);
         bs.setBirthWeight(scAddSheep.getBornWeight().longValue());
+        bs.setWeaningWeight(scAddSheep.getWeaningWeight().longValue());
         bs.setSource(String.valueOf(2));
         bs.setBirthday(scAddSheep.getBirthday());
         bs.setGender(scAddSheep.getGender().longValue());
@@ -72,6 +73,7 @@ public class ScAddSheepServiceImpl implements IScAddSheepService {
         bs.setVarietyId(scAddSheep.getVarietyId().longValue());
         bs.setSourceDate(scAddSheep.getJoinDate());
         bs.setComment(scAddSheep.getComment());
+
         bs.setCreateBy(scAddSheep.getCreateBy());
         bs.setCreateTime(new Date());
         if (scAddSheep.getTypeId() != null) {

From b911a291678765898c353494d72dd77223084fa7 Mon Sep 17 00:00:00 2001
From: ll <1079863556@qq.com>
Date: Mon, 19 Jan 2026 20:42:27 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=A4=9A=E8=80=B3=E5=8F=B7=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=B8=8E=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../NpMilkProdClassesController.java          | 38 ++++++++++++++----
 .../NpSheepMilkAnalysisController.java        | 40 ++++++++++++++++---
 .../domain/NpMilkProdClasses.java             | 23 ++++++++---
 .../domain/NpSheepMilkAnalysis.java           | 15 +++++++
 .../mapper/NpMilkProdClassesMapper.java       | 10 +++--
 .../mapper/NpSheepMilkAnalysisMapper.java     |  8 +++-
 .../service/INpMilkProdClassesService.java    | 10 +++--
 .../service/INpSheepMilkAnalysisService.java  |  3 ++
 .../impl/NpMilkProdClassesServiceImpl.java    | 18 ++++-----
 .../impl/NpSheepMilkAnalysisServiceImpl.java  | 11 ++++-
 .../dairyProducts/NpMilkProdClassesMapper.xml | 36 +++++++++++------
 .../NpSheepMilkAnalysisMapper.xml             | 39 ++++++++++++------
 12 files changed, 188 insertions(+), 63 deletions(-)

diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/NpMilkProdClassesController.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/NpMilkProdClassesController.java
index da0cde1..82c2c46 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/NpMilkProdClassesController.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/NpMilkProdClassesController.java
@@ -28,16 +28,35 @@ public class NpMilkProdClassesController extends BaseController {
     public TableDataInfo list(
             @RequestParam(required = false) Date datetimeStart,
             @RequestParam(required = false) Date datetimeEnd,
-            @RequestParam(required = false) String manageEarNo,   // 改为单个字符串，模糊
+            @RequestParam(required = false) List<String> allEarNumbers, // 修改处：接收多耳号数组
             @RequestParam(required = false) String factory,
             @RequestParam(required = false) Integer classes) {
         startPage();
+        // 修改处：将参数封装进实体，以便 Service 和 Mapper 统一处理
+        NpMilkProdClasses params = new NpMilkProdClasses();
+        params.setAllEarNumbers(allEarNumbers);
+        params.setFactory(factory);
+        params.setClasses(classes);
+
         List<NpMilkProdClasses> list = npMilkProdClassesService
-                .selectNpMilkProdClassesList(datetimeStart, datetimeEnd,
-                        manageEarNo, factory, classes);
+                .selectNpMilkProdClassesList(params, datetimeStart, datetimeEnd);
         return getDataTable(list);
     }
 
+    /**
+     * 修改处：新增耳号模糊查询接口
+     */
+    @PreAuthorize("@ss.hasPermi('milkProdclasses:milkProdclasses:list')")
+    @GetMapping("/search_ear_numbers")
+    public AjaxResult searchEarNumbers(@RequestParam("query") String query) {
+        try {
+            List<String> earNumbers = npMilkProdClassesService.searchEarNumbers(query);
+            return success(earNumbers);
+        } catch (Exception e) {
+            return error("搜索耳号失败：" + e.getMessage());
+        }
+    }
+
     @PreAuthorize("@ss.hasPermi('milkProdclasses:milkProdclasses:import')")
     @Log(title = "班次产奶", businessType = BusinessType.IMPORT)
     @PostMapping("/import")
@@ -58,14 +77,19 @@ public class NpMilkProdClassesController extends BaseController {
     public void export(HttpServletResponse response,
                        @RequestParam(required = false) Date datetimeStart,
                        @RequestParam(required = false) Date datetimeEnd,
-                       @RequestParam(required = false) String manageEarNo,
+                       @RequestParam(required = false) List<String> allEarNumbers, // 修改处：接收多耳号
                        @RequestParam(required = false) String factory,
                        @RequestParam(required = false) Integer classes) {
+
+        NpMilkProdClasses params = new NpMilkProdClasses();
+        params.setAllEarNumbers(allEarNumbers);
+        params.setFactory(factory);
+        params.setClasses(classes);
+
         List<NpMilkProdClasses> list = npMilkProdClassesService.selectNpMilkProdClassesList(
-                datetimeStart, datetimeEnd, manageEarNo, factory, classes);
+                params, datetimeStart, datetimeEnd);
 
         ExcelUtil<NpMilkProdClasses> util = new ExcelUtil<>(NpMilkProdClasses.class);
         util.exportExcel(response, list, "班次产奶数据");
     }
-}
-
+}
\ No newline at end of file
diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/NpSheepMilkAnalysisController.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/NpSheepMilkAnalysisController.java
index bce4136..a802550 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/NpSheepMilkAnalysisController.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/NpSheepMilkAnalysisController.java
@@ -15,7 +15,7 @@ import java.util.List;
 
 /**
  * 奶产量分析控制器
- * 只保留：分页列表（只读） + 单条查询 + 导出
+ * 保留：分页列表（只读） + 单条查询 + 导出 + 耳号模糊查询
  */
 @RestController
 @RequestMapping("/dairyProducts/sheepMilkAnalysis")
@@ -26,15 +26,36 @@ public class NpSheepMilkAnalysisController extends BaseController {
 
     /**
      * 查询奶产量分析列表（只读，分页）
-     * 支持参数 manageEarTag（耳号模糊） 和 screenDays（筛选天数）
+     * 支持参数 allEarNumbers（多耳号） 和 screenDays（筛选天数）
      */
     @GetMapping("/list")
-    public TableDataInfo list(NpSheepMilkAnalysis analysis) {
-        startPage(); // 使用PageHelper分页（注意service中第一个DB调用是distinct sheep id）
+    public TableDataInfo list(
+            @RequestParam(required = false) List<String> allEarNumbers, // 修改处：接收多耳号参数
+            NpSheepMilkAnalysis analysis) {
+        startPage();
+
+        // 修改处：将接收到的 list 设置进对象
+        if (allEarNumbers != null && !allEarNumbers.isEmpty()) {
+            analysis.setAllEarNumbers(allEarNumbers);
+        }
+
         List<NpSheepMilkAnalysis> list = npSheepMilkAnalysisService.selectNpSheepMilkAnalysisList(analysis);
         return getDataTable(list);
     }
 
+    /**
+     * 修改处：新增搜索耳号接口
+     */
+    @GetMapping("/search_ear_numbers")
+    public AjaxResult searchEarNumbers(@RequestParam("query") String query) {
+        try {
+            List<String> earNumbers = npSheepMilkAnalysisService.searchEarNumbers(query);
+            return success(earNumbers);
+        } catch (Exception e) {
+            return error("搜索耳号失败：" + e.getMessage());
+        }
+    }
+
     /**
      * 获取单个分析记录详细信息（按sheepId）
      */
@@ -45,11 +66,18 @@ public class NpSheepMilkAnalysisController extends BaseController {
 
     /**
      * 导出奶产量分析记录（Excel）
-     * 支持manageEarTag与screenDays两个查询条件
+     * 支持 allEarNumbers 与 screenDays 两个查询条件
      */
     @Log(title = "奶产量分析 导出", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(NpSheepMilkAnalysis analysis) {
+    public AjaxResult export(
+            @RequestParam(required = false) List<String> allEarNumbers, // 修改处：接收多耳号参数
+            NpSheepMilkAnalysis analysis) {
+
+        if (allEarNumbers != null && !allEarNumbers.isEmpty()) {
+            analysis.setAllEarNumbers(allEarNumbers);
+        }
+
         List<NpSheepMilkAnalysis> list = npSheepMilkAnalysisService.selectNpSheepMilkAnalysisForExport(analysis);
         ExcelUtil<NpSheepMilkAnalysis> util = new ExcelUtil<>(NpSheepMilkAnalysis.class);
         return util.exportExcel(list, "羊奶产量分析数据");
diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpMilkProdClasses.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpMilkProdClasses.java
index 43d388d..c2df329 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpMilkProdClasses.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpMilkProdClasses.java
@@ -2,20 +2,19 @@ package com.zhyc.module.dairyProducts.domain;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List; // 引入 List
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zhyc.common.annotation.Excel;
 
-
-
 public class NpMilkProdClasses implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    private Long id;  // 主键ID
-    private Date createTime;  // 创建时间
-    private Date updateTime;  // 更新时间
+    private Long id;
+    private Date createTime;
+    private Date updateTime;
 
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "日期", dateFormat = "yyyy-MM-dd")  // 添加日期格式
+    @Excel(name = "日期", dateFormat = "yyyy-MM-dd")
     private Date datetime;
 
     @Excel(name = "管理耳号")
@@ -41,7 +40,19 @@ public class NpMilkProdClasses implements Serializable {
 
     private String sheepId;
 
+    // 修改处：新增字段用于多耳号查询
+    /** 全部羊耳号列表（用于多耳号查询） */
+    private List<String> allEarNumbers;
+
     // Getters and Setters
+    public List<String> getAllEarNumbers() {
+        return allEarNumbers;
+    }
+
+    public void setAllEarNumbers(List<String> allEarNumbers) {
+        this.allEarNumbers = allEarNumbers;
+    }
+
     public Long getId() { return id; }
     public void setId(Long id) { this.id = id; }
 
diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpSheepMilkAnalysis.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpSheepMilkAnalysis.java
index 84cedc0..0d48d2b 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpSheepMilkAnalysis.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpSheepMilkAnalysis.java
@@ -2,6 +2,7 @@ package com.zhyc.module.dairyProducts.domain;
 
 import com.zhyc.common.annotation.Excel;
 import java.util.Date;
+import java.util.List; // 导入List
 
 public class NpSheepMilkAnalysis {
     // 唯一键（可用于前端 row-key）
@@ -12,6 +13,10 @@ public class NpSheepMilkAnalysis {
     @Excel(name = "耳号")
     private String manageEarTag;
 
+    // 修改处：新增多耳号字段
+    /** 全部羊耳号列表（用于多耳号查询） */
+    private List<String> allEarNumbers;
+
     @Excel(name = "品种")
     private String variety;
 
@@ -139,6 +144,16 @@ public class NpSheepMilkAnalysis {
     private Date lastUpdate;
 
     // getters and setters
+
+    // 修改处：添加 allEarNumbers 的 getter/setter
+    public List<String> getAllEarNumbers() {
+        return allEarNumbers;
+    }
+
+    public void setAllEarNumbers(List<String> allEarNumbers) {
+        this.allEarNumbers = allEarNumbers;
+    }
+
     public String getSheepId() { return sheepId; }
     public void setSheepId(String sheepId) { this.sheepId = sheepId; }
 
diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/NpMilkProdClassesMapper.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/NpMilkProdClassesMapper.java
index 82a3238..7e2a03b 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/NpMilkProdClassesMapper.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/NpMilkProdClassesMapper.java
@@ -6,12 +6,14 @@ import java.util.Date;
 import java.util.List;
 
 public interface NpMilkProdClassesMapper {
+    // 修改处：参数改为接收实体类
     List<NpMilkProdClasses> selectNpMilkProdClassesList(
+            @Param("npMilkProdClasses") NpMilkProdClasses npMilkProdClasses,
             @Param("datetimeStart") Date datetimeStart,
-            @Param("datetimeEnd") Date datetimeEnd,
-            @Param("manageEarNo") String manageEarNo,
-            @Param("factory") String factory,
-            @Param("classes") Integer classes);
+            @Param("datetimeEnd") Date datetimeEnd);
+
+    // 修改处：新增搜索方法
+    List<String> searchEarNumbers(@Param("query") String query);
 
     int insertNpMilkProdClasses(NpMilkProdClasses row);
 
diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/NpSheepMilkAnalysisMapper.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/NpSheepMilkAnalysisMapper.java
index 1e35d56..09d02af 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/NpSheepMilkAnalysisMapper.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/NpSheepMilkAnalysisMapper.java
@@ -20,8 +20,14 @@ public interface NpSheepMilkAnalysisMapper {
 
     /**
      * 根据管理耳标筛选，返回distinct的sheepId列表
+     * 修改处：参数改为对象，支持 allEarNumbers
      */
-    List<String> selectDistinctSheepIds(@Param("manageEarTag") String manageEarTag);
+    List<String> selectDistinctSheepIds(NpSheepMilkAnalysis analysis);
+
+    /**
+     * 修改处：新增耳号模糊查询接口
+     */
+    List<String> searchEarNumbers(@Param("query") String query);
 
     /**
      * 根据羊只ID查询羊只档案信息，返回Map结构
diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/INpMilkProdClassesService.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/INpMilkProdClassesService.java
index b582994..d64d0cd 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/INpMilkProdClassesService.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/INpMilkProdClassesService.java
@@ -5,12 +5,14 @@ import java.util.List;
 import com.zhyc.module.dairyProducts.domain.NpMilkProdClasses;
 
 public interface INpMilkProdClassesService {
+    // 修改处：参数改为接收实体类，以包含多耳号列表
     List<NpMilkProdClasses> selectNpMilkProdClassesList(
+            NpMilkProdClasses npMilkProdClasses,
             Date datetimeStart,
-            Date datetimeEnd,
-            String manageEarNo,  // 改为单个 String
-            String factory,
-            Integer classes);
+            Date datetimeEnd);
+
+    // 修改处：新增耳号搜索方法
+    List<String> searchEarNumbers(String query);
 
     int importMilkProdClasses(List<NpMilkProdClasses> list);
 }
\ No newline at end of file
diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/INpSheepMilkAnalysisService.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/INpSheepMilkAnalysisService.java
index 5dded5c..82eda7e 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/INpSheepMilkAnalysisService.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/INpSheepMilkAnalysisService.java
@@ -9,6 +9,9 @@ public interface INpSheepMilkAnalysisService {
 
     List<NpSheepMilkAnalysis> selectNpSheepMilkAnalysisList(NpSheepMilkAnalysis analysis);
 
+    // 修改处：新增模糊查询方法定义
+    List<String> searchEarNumbers(String query);
+
     /**
      * 导出奶产量分析记录
      */
diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/impl/NpMilkProdClassesServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/impl/NpMilkProdClassesServiceImpl.java
index 1c26057..3db595c 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/impl/NpMilkProdClassesServiceImpl.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/impl/NpMilkProdClassesServiceImpl.java
@@ -16,26 +16,29 @@ public class NpMilkProdClassesServiceImpl implements INpMilkProdClassesService {
     private NpMilkProdClassesMapper mapper;
 
     @Override
-    public List<NpMilkProdClasses> selectNpMilkProdClassesList(Date datetimeStart, Date datetimeEnd,
-                                                               String manageEarNo, String factory, Integer classes) {
-        return mapper.selectNpMilkProdClassesList(datetimeStart, datetimeEnd, manageEarNo, factory, classes);
+    public List<NpMilkProdClasses> selectNpMilkProdClassesList(NpMilkProdClasses npMilkProdClasses, Date datetimeStart, Date datetimeEnd) {
+        // 修改处：传递实体对象
+        return mapper.selectNpMilkProdClassesList(npMilkProdClasses, datetimeStart, datetimeEnd);
+    }
+
+    // 修改处：实现搜索方法
+    @Override
+    public List<String> searchEarNumbers(String query) {
+        return mapper.searchEarNumbers(query);
     }
 
     @Override
     public int importMilkProdClasses(List<NpMilkProdClasses> list) {
         int count = 0;
         for (NpMilkProdClasses item : list) {
-            // 根据管理耳号查 sheep_id
             String sheepId = mapper.selectSheepIdByManageEarNo(item.getManageEarNo());
             if (sheepId == null) continue;
 
             item.setSheepId(sheepId);
 
-            // 计算校正奶量
             Double correctedMilk = calculateCorrectedMilk(item);
             item.setCorrectedMilk(correctedMilk);
 
-            // 插入数据
             count += mapper.insertNpMilkProdClasses(item);
         }
         return count;
@@ -45,15 +48,12 @@ public class NpMilkProdClassesServiceImpl implements INpMilkProdClassesService {
         Double milk = item.getMilk();
         if (milk == null) return null;
 
-        // 1. 称重矫正系数
         Double weightCorrection = mapper.getWeightCorrection(item.getDatetime(), item.getFactory());
         if (weightCorrection == null) weightCorrection = 1.0;
 
-        // 2. 胎次矫正系数
         Double parityCorrection = mapper.getParityCorrection(item.getParity());
         if (parityCorrection == null) parityCorrection = 1.0;
 
-        // 3. 干物质矫正系数
         Double dryMatterCorrection = mapper.getDryMatterCorrection(item.getDatetime(), item.getFactory());
         if (dryMatterCorrection == null) dryMatterCorrection = 1.0;
 
diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/impl/NpSheepMilkAnalysisServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/impl/NpSheepMilkAnalysisServiceImpl.java
index 7100ca4..ef861c7 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/impl/NpSheepMilkAnalysisServiceImpl.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/impl/NpSheepMilkAnalysisServiceImpl.java
@@ -47,12 +47,19 @@ public class NpSheepMilkAnalysisServiceImpl implements INpSheepMilkAnalysisServi
         return ana;
     }
 
+    // 修改处：新增模糊查询实现
+    @Override
+    public List<String> searchEarNumbers(String query) {
+        return npSheepMilkAnalysisMapper.searchEarNumbers(query);
+    }
+
     @Override
     public List<NpSheepMilkAnalysis> selectNpSheepMilkAnalysisList(NpSheepMilkAnalysis analysis) {
         int screenDays = (analysis != null && analysis.getScreenDays() != null) ? analysis.getScreenDays() : 100;
-        String manageEarTagFilter = (analysis != null) ? analysis.getManageEarTag() : null;
 
-        List<String> sheepIds = npSheepMilkAnalysisMapper.selectDistinctSheepIds(manageEarTagFilter);
+        // 修改处：这里改为直接传 analysis 对象，以便 mapper 可以处理 allEarNumbers
+        List<String> sheepIds = npSheepMilkAnalysisMapper.selectDistinctSheepIds(analysis);
+
         if (CollectionUtils.isEmpty(sheepIds)) return Collections.emptyList();
 
         List<NpSheepMilkAnalysis> resultList = new ArrayList<>();
diff --git a/zhyc-module/src/main/resources/mapper/dairyProducts/NpMilkProdClassesMapper.xml b/zhyc-module/src/main/resources/mapper/dairyProducts/NpMilkProdClassesMapper.xml
index cc20df3..5175020 100644
--- a/zhyc-module/src/main/resources/mapper/dairyProducts/NpMilkProdClassesMapper.xml
+++ b/zhyc-module/src/main/resources/mapper/dairyProducts/NpMilkProdClassesMapper.xml
@@ -19,14 +19,13 @@
         SELECT
         mpc.id,
         mpc.datetime,
-        v.bs_manage_tags,          <!-- 取消别名，使用原列名 -->
+        v.bs_manage_tags,
         v.electronic_tags,
         v.parity,
         v.dr_ranch,
         mpc.classes,
         mpc.milk,
         mpc.corrected_milk AS corrected_milk
-        <!-- 修改为与 resultMap 对应的列名 -->
         FROM np_milk_prod_classes mpc
         JOIN sheep_file v ON mpc.sheep_id = v.id
         LEFT JOIN xz_wegih_correction wc ON DATE(mpc.datetime) = DATE(wc.datetime) AND v.dr_ranch = wc.factory
@@ -39,19 +38,34 @@
             <if test="datetimeEnd != null">
                 AND mpc.datetime &lt;= #{datetimeEnd}
             </if>
-            <if test="manageEarNo != null and manageEarNo != ''">
-                AND v.bs_manage_tags LIKE CONCAT('%', #{manageEarNo}, '%')
+
+            <if test="npMilkProdClasses.allEarNumbers != null and npMilkProdClasses.allEarNumbers.size() > 0">
+                AND (
+                v.bs_manage_tags IN
+                <foreach collection="npMilkProdClasses.allEarNumbers" item="earNumber" open="(" separator="," close=")">
+                    #{earNumber}
+                </foreach>
+                )
             </if>
-            <if test="factory != null and factory != ''">
-                AND v.dr_ranch = #{factory}
+
+            <if test="npMilkProdClasses.factory != null and npMilkProdClasses.factory != ''">
+                AND v.dr_ranch = #{npMilkProdClasses.factory}
             </if>
-            <if test="classes != null">
-                AND mpc.classes = #{classes}
+            <if test="npMilkProdClasses.classes != null">
+                AND mpc.classes = #{npMilkProdClasses.classes}
             </if>
         </where>
     </select>
 
-    <!-- 称重矫正系数 -->
+    <select id="searchEarNumbers" resultType="java.lang.String">
+        SELECT DISTINCT sf.bs_manage_tags
+        FROM sheep_file sf
+        WHERE sf.bs_manage_tags LIKE CONCAT(#{query}, '%')
+          AND sf.is_delete = 0
+        ORDER BY sf.bs_manage_tags
+            LIMIT 50
+    </select>
+
     <select id="getWeightCorrection" resultType="java.lang.Double">
         SELECT actual / system_milk
         FROM xz_wegih_correction
@@ -60,7 +74,6 @@
           AND system_milk > 0
     </select>
 
-    <!-- 胎次矫正系数 -->
     <select id="getParityCorrection" resultType="java.lang.Double">
         SELECT
             CASE
@@ -72,7 +85,6 @@
         WHERE parity = #{parity}
     </select>
 
-    <!-- 干物质矫正系数 -->
     <select id="getDryMatterCorrection" resultType="java.lang.Double">
         SELECT coefficient
         FROM xz_dry_matter_correction
@@ -90,4 +102,4 @@
         FROM sheep_file
         WHERE bs_manage_tags = #{manageEarNo}
     </select>
-</mapper>
+</mapper>
\ No newline at end of file
diff --git a/zhyc-module/src/main/resources/mapper/dairyProducts/NpSheepMilkAnalysisMapper.xml b/zhyc-module/src/main/resources/mapper/dairyProducts/NpSheepMilkAnalysisMapper.xml
index af77171..0b7c83c 100644
--- a/zhyc-module/src/main/resources/mapper/dairyProducts/NpSheepMilkAnalysisMapper.xml
+++ b/zhyc-module/src/main/resources/mapper/dairyProducts/NpSheepMilkAnalysisMapper.xml
@@ -4,8 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zhyc.module.dairyProducts.mapper.NpSheepMilkAnalysisMapper">
 
-    <!-- 1) 获取distinct sheep_id（支持按sheep_file.bs_manage_tags模糊搜索） -->
-    <select id="selectDistinctSheepIds" resultType="string" parameterType="map">
+    <select id="selectDistinctSheepIds" resultType="string" parameterType="com.zhyc.module.dairyProducts.domain.NpSheepMilkAnalysis">
         SELECT DISTINCT a.sheep_id
         FROM np_milk_prod_classes a
         LEFT JOIN sheep_file sf ON a.sheep_id = sf.id
@@ -13,12 +12,27 @@
             <if test="manageEarTag != null and manageEarTag != ''">
                 AND sf.bs_manage_tags LIKE CONCAT('%', #{manageEarTag}, '%')
             </if>
+            <if test="allEarNumbers != null and allEarNumbers.size() > 0">
+                AND (
+                sf.bs_manage_tags IN
+                <foreach collection="allEarNumbers" item="earNumber" open="(" separator="," close=")">
+                    #{earNumber}
+                </foreach>
+                )
+            </if>
         </where>
         ORDER BY a.sheep_id
     </select>
 
-    <!-- 2) 获取某只羊的所有班次记录（按班次日期升序） -->
-    <!-- 假设表中字段：class_date, system_milk, corrected_milk, parity -->
+    <select id="searchEarNumbers" resultType="java.lang.String">
+        SELECT DISTINCT sf.bs_manage_tags
+        FROM sheep_file sf
+        WHERE sf.bs_manage_tags LIKE CONCAT(#{query}, '%')
+          AND sf.is_delete = 0
+        ORDER BY sf.bs_manage_tags
+            LIMIT 50
+    </select>
+
     <select id="selectMilkRecordsBySheepId" resultType="map" parameterType="string">
         SELECT
             datetime AS classDate,
@@ -30,8 +44,6 @@
         ORDER BY datetime ASC
     </select>
 
-    <!-- 3) 获取该羊在sheep_file视图中的基础信息 -->
-    <!-- 假设字段名称：bs_manage_tags、variety、lactation_day、name、birthday、parity、month_age、current_weight、breed、father_manage_tags、mother_manage_tags、dr_ranch、family -->
     <select id="selectSheepFileBySheepId" resultType="map" parameterType="string">
         SELECT
             id AS sheep_id,
@@ -52,27 +64,30 @@
         WHERE id = #{sheepId}
     </select>
 
-    <!-- 4) 兼容旧list查询（返回domain对象列表），但在我们的实现中service会构造最终的NpSheepMilkAnalysis列表 -->
     <select id="selectNpSheepMilkAnalysisList" resultType="com.zhyc.module.dairyProducts.domain.NpSheepMilkAnalysis" parameterType="com.zhyc.module.dairyProducts.domain.NpSheepMilkAnalysis">
-        <!-- 如果你仍需基于某张表的简单映射，可在此实现；当前我们在ServiceImpl中组装对象，所以该查询不做复杂实现 -->
         SELECT 1 FROM dual WHERE 1=0
     </select>
 
-    <!-- 5) 导出奶产量分析记录 -->
     <select id="selectNpSheepMilkAnalysisForExport" resultType="com.zhyc.module.dairyProducts.domain.NpSheepMilkAnalysis" parameterType="com.zhyc.module.dairyProducts.domain.NpSheepMilkAnalysis">
-        <!-- 这里需要根据实际表结构编写SQL查询 -->
-        <!-- 示例SQL，需要根据实际表结构调整 -->
         SELECT
         sf.id as sheepId,
         sf.bs_manage_tags as manageEarTag,
         sf.variety,
-        <!-- 其他字段 -->
+        m.datetime as milkingStartTime
         FROM sheep_file sf
         LEFT JOIN np_milk_prod_classes m ON sf.id = m.sheep_id
         <where>
             <if test="manageEarTag != null and manageEarTag != ''">
                 AND sf.bs_manage_tags LIKE CONCAT('%', #{manageEarTag}, '%')
             </if>
+            <if test="allEarNumbers != null and allEarNumbers.size() > 0">
+                AND (
+                sf.bs_manage_tags IN
+                <foreach collection="allEarNumbers" item="earNumber" open="(" separator="," close=")">
+                    #{earNumber}
+                </foreach>
+                )
+            </if>
         </where>
         GROUP BY sf.id
     </select>

From 25cef5dd15c7bf35a54a1be7d1c0dbe1773f7c75 Mon Sep 17 00:00:00 2001
From: zyh <2066096076@qq.com>
Date: Tue, 20 Jan 2026 16:14:38 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E5=86=BB=E8=83=9A=E5=86=BB=E7=B2=BE?=
 =?UTF-8?q?=E4=B8=8D=E5=90=8C=E7=8A=B6=E6=80=81=E6=B7=BB=E5=8A=A0=E5=8C=BA?=
 =?UTF-8?q?=E5=88=86=E6=A0=87=E8=AF=86=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E7=8A=B6=E6=80=81=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 zhyc-module/src/main/resources/mapper/frozen/DdFeMapper.xml | 1 +
 zhyc-module/src/main/resources/mapper/frozen/DdFsMapper.xml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/zhyc-module/src/main/resources/mapper/frozen/DdFeMapper.xml b/zhyc-module/src/main/resources/mapper/frozen/DdFeMapper.xml
index 83264bd..8dd5084 100644
--- a/zhyc-module/src/main/resources/mapper/frozen/DdFeMapper.xml
+++ b/zhyc-module/src/main/resources/mapper/frozen/DdFeMapper.xml
@@ -69,6 +69,7 @@
             <if test="params.beginOutDate != null and params.endOutDate != null">
                 and out_date between #{params.beginOutDate} and #{params.endOutDate}
             </if>
+            <if test="status != null and status != ''">and status = #{status}</if>
         </where>
     </select>
 
diff --git a/zhyc-module/src/main/resources/mapper/frozen/DdFsMapper.xml b/zhyc-module/src/main/resources/mapper/frozen/DdFsMapper.xml
index 20eda36..cd335a9 100644
--- a/zhyc-module/src/main/resources/mapper/frozen/DdFsMapper.xml
+++ b/zhyc-module/src/main/resources/mapper/frozen/DdFsMapper.xml
@@ -41,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="params.beginOutDt != null and params.endOutDt != null">
                 and out_dt between #{params.beginOutDt} and #{params.endOutDt}
             </if>
+            <if test="stat != null and stat != ''">and stat = #{stat}</if>
         </where>
     </select>