From 1c55502da56e929ed124facc16afc8112cb30260 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A1=BE=E5=90=9B=E7=A6=B9?= <2673609096@qq.com>
Date: Sun, 14 Sep 2025 20:19:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=BA=AF=E6=BA=90=E7=A0=81=E5=88=86=E7=BB=84?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TraceabilityCodeMapper.java               | 40 --------
 .../TraceabilityCodeMapper.xml                | 97 +++++++++++++++++++
 2 files changed, 97 insertions(+), 40 deletions(-)

diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/traceabilitycode/TraceabilityCodeMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/traceabilitycode/TraceabilityCodeMapper.java
index 2c7ae93d..de4b964a 100644
--- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/traceabilitycode/TraceabilityCodeMapper.java
+++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/traceabilitycode/TraceabilityCodeMapper.java
@@ -7,7 +7,6 @@ import cn.iocoder.yudao.module.farm.controller.admin.traceabilitycode.vo.Traceab
 import cn.iocoder.yudao.module.farm.dal.dataobject.traceabilitycode.TraceabilityCodeDO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
 
 import java.util.Collections;
 import java.util.List;
@@ -70,45 +69,6 @@ public interface TraceabilityCodeMapper extends BaseMapperX<TraceabilityCodeDO>
      * 根据CodeOutBatch分组查询，获取每个批次的最新记录
      * 使用子查询方式避免GROUP BY的SQL兼容性问题
      */
-    @Select("<script>" +
-            "SELECT t1.* FROM farm_traceability_code t1 " +
-            "INNER JOIN ( " +
-            "    SELECT code_out_batch, MAX(create_time) as max_create_time " +
-            "    FROM farm_traceability_code " +
-            "    WHERE 1=1 " +
-            "<if test='tenantId != null'> AND tenant_id = #{tenantId} </if>" +
-            "<if test='speciesCode != null'> AND species_code = #{speciesCode} </if>" +
-            "<if test='speciesName != null and speciesName != \"\"'> AND species_name LIKE CONCAT('%', #{speciesName}, '%') </if>" +
-            "<if test='baseId != null'> AND base_id = #{baseId} </if>" +
-            "<if test='baseName != null and baseName != \"\"'> AND base_name LIKE CONCAT('%', #{baseName}, '%') </if>" +
-            "<if test='plotId != null'> AND plot_id = #{plotId} </if>" +
-            "<if test='plotName != null and plotName != \"\"'> AND plot_name LIKE CONCAT('%', #{plotName}, '%') </if>" +
-            "<if test='harvestDateStart != null'> AND harvest_date &gt;= #{harvestDateStart} </if>" +
-            "<if test='harvestDateEnd != null'> AND harvest_date &lt;= #{harvestDateEnd} </if>" +
-            "<if test='farmingInputCount != null'> AND farming_input_count = #{farmingInputCount} </if>" +
-            "<if test='productId != null'> AND product_id = #{productId} </if>" +
-            "<if test='productName != null and productName != \"\"'> AND product_name LIKE CONCAT('%', #{productName}, '%') </if>" +
-            "<if test='codeOutBatch != null and codeOutBatch != \"\"'> AND code_out_batch = #{codeOutBatch} </if>" +
-            "<if test='status != null'> AND status = #{status} </if>" +
-            "    GROUP BY code_out_batch " +
-            ") t2 ON t1.code_out_batch = t2.code_out_batch AND t1.create_time = t2.max_create_time " +
-            "WHERE 1=1 " +
-            "<if test='tenantId != null'> AND t1.tenant_id = #{tenantId} </if>" +
-            "<if test='speciesCode != null'> AND t1.species_code = #{speciesCode} </if>" +
-            "<if test='speciesName != null and speciesName != \"\"'> AND t1.species_name LIKE CONCAT('%', #{speciesName}, '%') </if>" +
-            "<if test='baseId != null'> AND t1.base_id = #{baseId} </if>" +
-            "<if test='baseName != null and baseName != \"\"'> AND t1.base_name LIKE CONCAT('%', #{baseName}, '%') </if>" +
-            "<if test='plotId != null'> AND t1.plot_id = #{plotId} </if>" +
-            "<if test='plotName != null and plotName != \"\"'> AND t1.plot_name LIKE CONCAT('%', #{plotName}, '%') </if>" +
-            "<if test='harvestDateStart != null'> AND t1.harvest_date &gt;= #{harvestDateStart} </if>" +
-            "<if test='harvestDateEnd != null'> AND t1.harvest_date &lt;= #{harvestDateEnd} </if>" +
-            "<if test='farmingInputCount != null'> AND t1.farming_input_count = #{farmingInputCount} </if>" +
-            "<if test='productId != null'> AND t1.product_id = #{productId} </if>" +
-            "<if test='productName != null and productName != \"\"'> AND t1.product_name LIKE CONCAT('%', #{productName}, '%') </if>" +
-            "<if test='codeOutBatch != null and codeOutBatch != \"\"'> AND t1.code_out_batch = #{codeOutBatch} </if>" +
-            "<if test='status != null'> AND t1.status = #{status} </if>" +
-            "ORDER BY t1.create_time DESC" +
-            "</script>")
     List<TraceabilityCodeDO> selectLatestByCodeOutBatch(@Param("tenantId") String tenantId,
                                                         @Param("speciesCode") String speciesCode,
                                                         @Param("speciesName") String speciesName,
diff --git a/yudao-module-farm/src/main/resources/mapper/traceabilitycode/TraceabilityCodeMapper.xml b/yudao-module-farm/src/main/resources/mapper/traceabilitycode/TraceabilityCodeMapper.xml
index 1197fb1f..dc15b32d 100644
--- a/yudao-module-farm/src/main/resources/mapper/traceabilitycode/TraceabilityCodeMapper.xml
+++ b/yudao-module-farm/src/main/resources/mapper/traceabilitycode/TraceabilityCodeMapper.xml
@@ -9,4 +9,101 @@
         文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
      -->
 
+    <!-- 根据CodeOutBatch分组查询，获取每个批次的最新记录 -->
+    <select id="selectLatestByCodeOutBatch" resultType="cn.iocoder.yudao.module.farm.dal.dataobject.traceabilitycode.TraceabilityCodeDO">
+        SELECT t1.* FROM farm_traceability_code t1 
+        INNER JOIN ( 
+            SELECT code_out_batch, MAX(create_time) as max_create_time 
+            FROM farm_traceability_code 
+            WHERE 1=1 
+            <if test="tenantId != null">
+                AND tenant_id = #{tenantId}
+            </if>
+            <if test="speciesCode != null">
+                AND species_code = #{speciesCode}
+            </if>
+            <if test="speciesName != null and speciesName != ''">
+                AND species_name LIKE CONCAT('%', #{speciesName}, '%')
+            </if>
+            <if test="baseId != null">
+                AND base_id = #{baseId}
+            </if>
+            <if test="baseName != null and baseName != ''">
+                AND base_name LIKE CONCAT('%', #{baseName}, '%')
+            </if>
+            <if test="plotId != null">
+                AND plot_id = #{plotId}
+            </if>
+            <if test="plotName != null and plotName != ''">
+                AND plot_name LIKE CONCAT('%', #{plotName}, '%')
+            </if>
+            <if test="harvestDateStart != null">
+                AND harvest_date &gt;= #{harvestDateStart}
+            </if>
+            <if test="harvestDateEnd != null">
+                AND harvest_date &lt;= #{harvestDateEnd}
+            </if>
+            <if test="farmingInputCount != null">
+                AND farming_input_count = #{farmingInputCount}
+            </if>
+            <if test="productId != null">
+                AND product_id = #{productId}
+            </if>
+            <if test="productName != null and productName != ''">
+                AND product_name LIKE CONCAT('%', #{productName}, '%')
+            </if>
+            <if test="codeOutBatch != null and codeOutBatch != ''">
+                AND code_out_batch = #{codeOutBatch}
+            </if>
+            <if test="status != null">
+                AND status = #{status}
+            </if>
+            GROUP BY code_out_batch 
+        ) t2 ON t1.code_out_batch = t2.code_out_batch AND t1.create_time = t2.max_create_time 
+        WHERE 1=1 
+        <if test="tenantId != null">
+            AND t1.tenant_id = #{tenantId}
+        </if>
+        <if test="speciesCode != null">
+            AND t1.species_code = #{speciesCode}
+        </if>
+        <if test="speciesName != null and speciesName != ''">
+            AND t1.species_name LIKE CONCAT('%', #{speciesName}, '%')
+        </if>
+        <if test="baseId != null">
+            AND t1.base_id = #{baseId}
+        </if>
+        <if test="baseName != null and baseName != ''">
+            AND t1.base_name LIKE CONCAT('%', #{baseName}, '%')
+        </if>
+        <if test="plotId != null">
+            AND t1.plot_id = #{plotId}
+        </if>
+        <if test="plotName != null and plotName != ''">
+            AND t1.plot_name LIKE CONCAT('%', #{plotName}, '%')
+        </if>
+        <if test="harvestDateStart != null">
+            AND t1.harvest_date &gt;= #{harvestDateStart}
+        </if>
+        <if test="harvestDateEnd != null">
+            AND t1.harvest_date &lt;= #{harvestDateEnd}
+        </if>
+        <if test="farmingInputCount != null">
+            AND t1.farming_input_count = #{farmingInputCount}
+        </if>
+        <if test="productId != null">
+            AND t1.product_id = #{productId}
+        </if>
+        <if test="productName != null and productName != ''">
+            AND t1.product_name LIKE CONCAT('%', #{productName}, '%')
+        </if>
+        <if test="codeOutBatch != null and codeOutBatch != ''">
+            AND t1.code_out_batch = #{codeOutBatch}
+        </if>
+        <if test="status != null">
+            AND t1.status = #{status}
+        </if>
+        ORDER BY t1.create_time DESC
+    </select>
+
 </mapper>
\ No newline at end of file