From 8e65eb751d8e3c18d9d2134df084d349e55f1985 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 15 Aug 2022 11:42:28 +0800
Subject: [PATCH] 首页执行农事操作要使用农资时，农资库存表会进行相应的变化
---
src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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 a39fdd5..86c9044 100644
--- a/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml
+++ b/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml
@@ -4,7 +4,9 @@
<!--自定义查询农场养殖记录分页数据-->
<select id="selectFarmPlantPage" resultType="org.springblade.modules.farmplant.vo.FarmPlantVO">
- select sfp.*,ss.strain_name strainName,ss.url,sl.land_name landName,sl.land_area area,land_unit landUnit from
+ select sfp.*,ss.strain_name strainName,ss.url,sl.land_name landName,sl.land_area area,land_unit landUnit
+ ,(SELECT IFNULL(SUM(r.weight),0) from sys_recovery r where sfp.land_id = r.land_id and sfp.strain_id = r.strain_id) as outputNum
+ from
sys_farm_plant sfp
left join sys_strain ss on ss.id = sfp.strain_id
left join sys_land sl on sl.id = sfp.land_id
@@ -51,12 +53,18 @@
<if test="farmPlant.farmId!=null and farmPlant.farmId!=''">
and sl.farm_id = #{farmPlant.farmId}
</if>
+ <if test="farmPlant.transplanTimeStart !=null and farmPlant.transplanTimeStart!= ''">
+ and sfp.transplan_time >= #{farmPlant.transplanTimeStart}
+ </if>
+ <if test="farmPlant.transplanTimeEnd !=null and farmPlant.transplanTimeEnd!= ''">
+ and sfp.transplan_time < #{farmPlant.transplanTimeEnd}
+ </if>
order by sfp.id desc
</select>
<select id="selectFarmPlantPageCount" resultType="org.springblade.modules.farmplant.vo.FarmPlantVO">
SELECT
- a.strain_id,a.strainName,SUM(FORMAT(a.land_area,3)) area,a.url,a.tenant_id,a.dept_id
+ a.strain_id,a.strainName,SUM(TRUNCATE(a.land_area,3)) area,a.url,a.tenant_id,a.dept_id
FROM
(
SELECT
@@ -123,7 +131,7 @@
<!--自定义查询农场养殖记录分页数据-->
<select id="getFarmPlantStatistics" resultType="org.springblade.modules.farmplant.vo.FarmPlantVO">
- select sfp.strain_id,ss.strain_name strainName,sum(sl.land_area) areas,land_unit landUnit from sys_farm_plant
+ select sfp.strain_id,ss.strain_name strainName,sum(TRUNCATE(sl.land_area,3)) areas,land_unit landUnit from sys_farm_plant
sfp
left join sys_strain ss on ss.id = sfp.strain_id
left join sys_land sl on sl.id = sfp.land_id
--
Gitblit v1.9.3