From 0309c10a354d8509faac6a5d52cbdc2b6ea2ffd4 Mon Sep 17 00:00:00 2001
From: "862857010@qq.com" <862857010@>
Date: Wed, 27 Mar 2024 11:03:01 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E5=9F=BA=E5=9C=B0id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/admin/growrecord/vo/GrowRecordPageReqVO.java   | 2 ++
 .../src/main/resources/mapper/growrecord/GrowRecordMapper.xml | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/growrecord/vo/GrowRecordPageReqVO.java b/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/growrecord/vo/GrowRecordPageReqVO.java
index 36054b1..16d3d01 100644
--- a/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/growrecord/vo/GrowRecordPageReqVO.java
+++ b/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/growrecord/vo/GrowRecordPageReqVO.java
@@ -43,5 +43,7 @@ public class GrowRecordPageReqVO extends PageParam {
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
+    //地块id
+    private Integer baseId;
 
 }
\ No newline at end of file
diff --git a/cjy-module-traceability/cjy-module-traceability-biz/src/main/resources/mapper/growrecord/GrowRecordMapper.xml b/cjy-module-traceability/cjy-module-traceability-biz/src/main/resources/mapper/growrecord/GrowRecordMapper.xml
index 24b87e4..61f2268 100644
--- a/cjy-module-traceability/cjy-module-traceability-biz/src/main/resources/mapper/growrecord/GrowRecordMapper.xml
+++ b/cjy-module-traceability/cjy-module-traceability-biz/src/main/resources/mapper/growrecord/GrowRecordMapper.xml
@@ -35,7 +35,9 @@
         <if test="reqVO.productName !=null and reqVO.productName!=''">
             and t2.product_name like concat('%',#{reqVO.productName},'%')
         </if>
-
+        <if test="reqVO.baseId !=null and reqVO.baseId !=''">
+            and t5.base_id=#{reqVO.baseId}
+        </if>
         <if test="reqVO.plantTime !=null and reqVO.plantTime!=''">
             and t1.plant_time  between #{reqVO.plantTime[0]} and #{reqVO.plantTime[1]}
         </if>