From 2554204fef319bf429e3932799488de817aa5b47 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 16 Aug 2022 10:21:40 +0800
Subject: [PATCH] 小程序数据统计
---
src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml | 19 +++++++++----------
src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml | 4 ++++
2 files changed, 13 insertions(+), 10 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 86c9044..89a0c58 100644
--- a/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml
+++ b/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml
@@ -411,19 +411,18 @@
<if test="farmPlant.endTime!=null and farmPlant.endTime!=''">
and sfp.transplan_time <= #{farmPlant.endTime}
</if>
-<!-- 小程序端会传farmId和status的值过来，但是为了和web端统一所以不加入查询条件 -->
-<!-- <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.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}
</if>
- <if test=" farmPlant.deptId !=null and farmPlant.deptId != ''">
- and sfp.dept_id = #{farmPlant.deptId}
- </if>
+<!-- <if test=" farmPlant.deptId !=null and farmPlant.deptId != ''">-->
+<!-- and sfp.dept_id = #{farmPlant.deptId}-->
+<!-- </if>-->
group by sfp.strain_id,strain_name,land_unit
</select>
diff --git a/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml b/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml
index 6fd13c1..89e7661 100644
--- a/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml
+++ b/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml
@@ -390,6 +390,7 @@
select sfps.strain_id strainId,sfps.weight,ss.url,ss.strain_name strainName from
sys_farm_product_stock sfps
left join sys_strain ss on ss.id = sfps.strain_id
+ LEFT JOIN sys_land land ON land.id = sfps.land_id
where 1=1
<if test="farmProductStock.strainId!=null and farmProductStock.strainId!=''">
and sfps.strain_id = #{farmProductStock.strainId}
@@ -412,6 +413,9 @@
<if test="farmProductStock.strainType !=null and farmProductStock.strainType !='' ">
and ss.strain_type = #{farmProductStock.strainType}
</if>
+ <if test="farmProductStock.farmId !=null and farmProductStock.farmId !='' ">
+ and land.farm_id = #{farmProductStock.farmId}
+ </if>
</select>
<!--销售对比库存是否充足-->
--
Gitblit v1.9.3