From 1d829b91fcfa295ecc3e32dd7c105fe372789065 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 13 Sep 2022 17:44:01 +0800
Subject: [PATCH] 农事记录content添加品种名称，大屏查询未删除数据，农产品投入

---
 src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml |   69 ++++++++++++++++++++++++++++++++++
 1 files changed, 69 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 f3ce2eb..f00b69c 100644
--- a/src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml
+++ b/src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml
@@ -29,10 +29,12 @@
         </if>
         <if test="recovery.farmId != null and recovery.farmId != ''">
             and sl.farm_id = #{recovery.farmId}
+            and sr.dept_id = #{recovery.farmId}
         </if>
         <if test="recovery.tenantId!=null and recovery.tenantId!=''">
             and sr.tenant_id = #{recovery.tenantId}
         </if>
+        ORDER BY sr.create_time DESC
     </select>
 
     <!--查询当前前缀已有的溯源码编号,取倒数7位的最大值-->
@@ -55,4 +57,71 @@
         left join sys_land sl on sl.id = sr.land_id
         where sr.id = #{recoveryId}
     </select>
+    <select id="recoveryStatistics" resultType="org.springblade.modules.recovery.vo.RecoveryVO">
+        SELECT sr.strain_id,SUM(sr.weight) AS weight,sr.dept_id,strain.strain_name,strain.url
+        FROM sys_recovery sr
+        LEFT JOIN sys_strain strain ON sr.strain_id = strain.id
+        WHERE 1=1
+        <if test="recovery.deptId !=null and recovery.deptId !=''">
+            AND sr.dept_id = #{recovery.deptId}
+        </if>
+        <if test="recovery.startTime != null and recovery.startTime !=''">
+            AND DATE_FORMAT(sr.create_time,'%Y-%m-%d') &gt;= #{recovery.startTime}
+        </if>
+        <if test="recovery.endTime != null and recovery.endTime !=''">
+            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
+        FROM sys_recovery sr
+        LEFT JOIN sys_strain strain ON sr.strain_id = strain.id
+        WHERE 1=1
+        <if test="recovery.deptId !=null and recovery.deptId !=''">
+            AND sr.dept_id = #{recovery.deptId}
+        </if>
+        <if test="recovery.startTime != null and recovery.startTime !=''">
+            AND DATE_FORMAT(sr.create_time,'%Y-%m-%d') &gt;= #{recovery.startTime}
+        </if>
+        <if test="recovery.endTime != null and recovery.endTime !=''">
+            and DATE_FORMAT(sr.create_time,'%Y-%m-%d') &lt;= #{recovery.endTime}
+        </if>
+        <if test="recovery.strainType != null and recovery.strainType !=''">
+            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