From fe371739b664c4e87914bcc7f3f550fec7e93121 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 18 Aug 2022 11:42:27 +0800
Subject: [PATCH] 保留农资退回记录，修复当农资库存为1时出库再退回，农资库存数据有误

---
 src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml |   33 ++++++++++++++++++++-------------
 1 files changed, 20 insertions(+), 13 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..89a0c58 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 &lt; #{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
@@ -403,19 +411,18 @@
         <if test="farmPlant.endTime!=null and farmPlant.endTime!=''">
             and sfp.transplan_time &lt;= #{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>
 

--
Gitblit v1.9.3