From 981a3d85848753a799da2d909089c2fe4fcd3ccf Mon Sep 17 00:00:00 2001
From: zhongrj <123456>
Date: Mon, 18 Jul 2022 14:53:15 +0800
Subject: [PATCH] 农产品库存，操作人列表查询修改，溯源码详情查询修改，

---
 src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml b/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml
index c8e5b5e..77ab691 100644
--- a/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml
+++ b/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml
@@ -48,6 +48,9 @@
         <if test="farmPlant.tenantId!=null and farmPlant.tenantId!=''">
             and sfp.tenant_id = #{farmPlant.tenantId}
         </if>
+        <if test="farmPlant.farmId!=null and farmPlant.farmId!=''">
+            and sl.farm_id = #{farmPlant.farmId}
+        </if>
         order by sfp.id desc
     </select>
 
@@ -86,11 +89,14 @@
         <if test="farmPlant.endTime!=null and farmPlant.endTime!=''">
             and sfp.transplan_time &lt;= #{farmPlant.endTime}
         </if>
-        <if test="farmPlant.deptId!=null and farmPlant.deptId!=''">
-            and sfp.dept_id = #{farmPlant.deptId}
+        <if test="farmPlant.farmId!=null and farmPlant.farmId!=''">
+            and sl.farm_id = #{farmPlant.farmId}
         </if>
         <if test="farmPlant.tenantId!=null and farmPlant.tenantId!=''">
             and sfp.tenant_id = #{farmPlant.tenantId}
+        </if>
+        <if test="farmPlant.status!=null and farmPlant.status!=''">
+            and sfp.status = #{farmPlant.status}
         </if>
         group by sfp.strain_id,strain_name,land_unit
     </select>
@@ -295,8 +301,11 @@
         <if test="farmPlant.endTime!=null and farmPlant.endTime!=''">
             and sfp.transplan_time &lt;= #{farmPlant.endTime}
         </if>
-        <if test="farmPlant.deptId!=null and farmPlant.deptId!=''">
-            and sfp.dept_id = #{farmPlant.deptId}
+        <if test="farmPlant.farmId!=null and farmPlant.farmId!=''">
+            and sl.farm_id = #{farmPlant.farmId}
+        </if>
+        <if test="farmPlant.status!=null and farmPlant.status!=''">
+            and sfp.status = #{farmPlant.status}
         </if>
         <if test="farmPlant.tenantId!=null and farmPlant.tenantId!=''">
             and sfp.tenant_id = #{farmPlant.tenantId}
@@ -309,6 +318,8 @@
         SELECT
         sfp.*,
         ss.strain_name strainName,
+        ss.url,
+        sl.land_area area,
         sl.land_unit landUnit
         FROM
         sys_farm_plant sfp

--
Gitblit v1.9.3