From d1e1caa4a066aa69acee64fda9296c46cff4d496 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 19 Aug 2022 15:58:25 +0800
Subject: [PATCH] 小程序记录农资退回
---
src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml | 17 +++++++++++++++++
1 files changed, 17 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..27f5de7 100644
--- a/src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml
+++ b/src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml
@@ -33,6 +33,7 @@
<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 +56,20 @@
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') >= #{recovery.startTime}
+ </if>
+ <if test="recovery.endTime != null and recovery.endTime !=''">
+ and DATE_FORMAT(sr.create_time,'%Y-%m-%d') <= #{recovery.endTime}
+ </if>
+ GROUP BY strain_id
+ </select>
</mapper>
--
Gitblit v1.9.3