From cc1239bf95ee3f1880b0b4fa462a7fd40664cfb2 Mon Sep 17 00:00:00 2001
From: xiebin <123456>
Date: Thu, 22 Sep 2022 16:41:53 +0800
Subject: [PATCH] 图片服务器地址更换

---
 src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml |   58 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 50 insertions(+), 8 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..81bcf81 100644
--- a/src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml
+++ b/src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml
@@ -4,10 +4,11 @@
 
     <!--自定义查询采收记录分页数据-->
     <select id="selectRecoveryPage" resultType="org.springblade.modules.recovery.vo.RecoveryVO">
-        select sr.*,sl.land_name landName,ss.strain_name strainName,user.real_name as realName from sys_recovery sr
+        select sr.*,sl.land_name landName,ss.strain_name strainName,user.real_name as realName,GROUP_CONCAT(tr.id) AS trIds from sys_recovery sr
         left join sys_land sl on sl.id = sr.land_id
         left join sys_strain ss on ss.id = sr.strain_id
         left join blade_user user ON user.id = sr.operator
+        LEFT JOIN sys_traceability tr ON tr.recovery_id = sr.id
         where 1=1
         <if test="recovery.strainName!=null and recovery.strainName!=''">
             and ss.strain_name like concat ('%',#{recovery.strainName},'%')
@@ -29,10 +30,18 @@
         </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>
+        <if test="recovery.startTime != null and recovery.startTime !=''">
+            AND DATE_FORMAT(sr.time,'%Y-%m-%d') &gt;= #{recovery.startTime}
+        </if>
+        <if test="recovery.endTime != null and recovery.endTime !=''">
+            and DATE_FORMAT(sr.time,'%Y-%m-%d') &lt;= #{recovery.endTime}
+        </if>
+        GROUP BY sr.id
         ORDER BY sr.create_time DESC
     </select>
 
@@ -65,12 +74,30 @@
             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}
+            AND DATE_FORMAT(sr.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}
+            and DATE_FORMAT(sr.time,'%Y-%m-%d') &lt;= #{recovery.endTime}
         </if>
         GROUP BY sr.strain_id
+
+        UNION
+
+        SELECT p.process_id,SUM(p.process_num),inv.fps_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_process_inv inv ON inv.product_id = p.process_id
+        WHERE 1=1 AND p.is_deleted = 0
+        <if test="recovery.deptId !=null and recovery.deptId !=''">
+            AND inv.fps_id = #{recovery.deptId}
+        </if>
+        <if test="recovery.startTime != null and recovery.startTime !=''">
+            AND DATE_FORMAT(p.sale_time,'%Y-%m-%d') &gt;= #{recovery.startTime}
+        </if>
+        <if test="recovery.endTime != null and recovery.endTime !=''">
+            and DATE_FORMAT(p.sale_time,'%Y-%m-%d') &lt;= #{recovery.endTime}
+        </if>
+        GROUP BY p.process_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
@@ -81,14 +108,29 @@
             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}
+            AND DATE_FORMAT(sr.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}
+            and DATE_FORMAT(sr.time,'%Y-%m-%d') &lt;= #{recovery.endTime}
         </if>
         GROUP BY sr.strain_id
+
+        UNION
+
+        SELECT p.process_id,SUM(p.process_num),inv.fps_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_process_inv inv ON inv.product_id = p.process_id
+        WHERE 1=1 AND p.is_deleted = 0
+        <if test="recovery.deptId !=null and recovery.deptId !=''">
+            AND inv.fps_id = #{recovery.deptId}
+        </if>
+        <if test="recovery.startTime != null and recovery.startTime !=''">
+            AND DATE_FORMAT(p.sale_time,'%Y-%m-%d') &gt;= #{recovery.startTime}
+        </if>
+        <if test="recovery.endTime != null and recovery.endTime !=''">
+            and DATE_FORMAT(p.sale_time,'%Y-%m-%d') &lt;= #{recovery.endTime}
+        </if>
+        GROUP BY p.process_id
     </select>
 </mapper>

--
Gitblit v1.9.3