From 76d76f7ef21ce544ff68e98e712184c2246a2229 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 23 Aug 2022 17:06:43 +0800
Subject: [PATCH] 小程序、后台数据统计产量统计显示采收总量和加工总量

---
 src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml |   32 ++++++++++++++++++++++++++++++++
 1 files changed, 32 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml b/src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml
index f496b0a..171625d 100644
--- a/src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml
+++ b/src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml
@@ -71,6 +71,22 @@
             and DATE_FORMAT(sr.create_time,'%Y-%m-%d') &lt;= #{recovery.endTime}
         </if>
         GROUP BY sr.strain_id
+        UNION
+        SELECT p.process_id,SUM(p.process_num),l.farm_id,m.machining_type,m.machining_tp
+        FROM sys_process p
+        LEFT JOIN sys_machining m ON p.process_id = m.id
+        LEFT JOIN sys_land l ON p.land_id = l.id
+        WHERE 1=1
+        <if test="recovery.deptId !=null and recovery.deptId !=''">
+            AND l.farm_id = #{recovery.deptId}
+        </if>
+        <if test="recovery.startTime != null and recovery.startTime !=''">
+            AND DATE_FORMAT(p.create_time,'%Y-%m-%d') &gt;= #{recovery.startTime}
+        </if>
+        <if test="recovery.endTime != null and recovery.endTime !=''">
+            and DATE_FORMAT(p.create_time,'%Y-%m-%d') &lt;= #{recovery.endTime}
+        </if>
+        GROUP BY p.process_id,l.farm_id
     </select>
     <select id="recoveryStatisticsx" resultType="org.springblade.modules.recovery.vo.RecoveryVO">
         SELECT sr.strain_id,SUM(sr.weight) AS weight,sr.dept_id,strain.strain_name,strain.url
@@ -90,5 +106,21 @@
             AND strain.strain_type = #{recovery.strainType}
         </if>
         GROUP BY sr.strain_id
+        UNION
+        SELECT p.process_id,SUM(p.process_num),l.farm_id,m.machining_type,m.machining_tp
+        FROM sys_process p
+        LEFT JOIN sys_machining m ON p.process_id = m.id
+        LEFT JOIN sys_land l ON p.land_id = l.id
+        WHERE 1=1
+        <if test="recovery.deptId !=null and recovery.deptId !=''">
+            AND l.farm_id = #{recovery.deptId}
+        </if>
+        <if test="recovery.startTime != null and recovery.startTime !=''">
+            AND DATE_FORMAT(p.create_time,'%Y-%m-%d') &gt;= #{recovery.startTime}
+        </if>
+        <if test="recovery.endTime != null and recovery.endTime !=''">
+            and DATE_FORMAT(p.create_time,'%Y-%m-%d') &lt;= #{recovery.endTime}
+        </if>
+        GROUP BY p.process_id,l.farm_id
     </select>
 </mapper>

--
Gitblit v1.9.3