From 72b971c98c46531064d74b68fc8fe8864ed0b544 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 08 Nov 2022 09:04:56 +0800
Subject: [PATCH] 大屏溯源统计次数sql修改

---
 src/main/java/org/springblade/modules/stockrecord/mapper/StockrecordMapper.xml |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/stockrecord/mapper/StockrecordMapper.xml b/src/main/java/org/springblade/modules/stockrecord/mapper/StockrecordMapper.xml
index a113764..804d6a3 100644
--- a/src/main/java/org/springblade/modules/stockrecord/mapper/StockrecordMapper.xml
+++ b/src/main/java/org/springblade/modules/stockrecord/mapper/StockrecordMapper.xml
@@ -60,7 +60,7 @@
         stf.factory_name AS factoryName,
         d.dict_value AS dic1,
         c.dict_value AS dic2,
-        a.name as czr,
+        a.real_name as czr,
         f.agricultural_name as agrname
         FROM `sys_stockrecord` st
         LEFT JOIN sys_stockfactory stf
@@ -77,15 +77,27 @@
         AND is_deleted = 0 <if test="stockrecord.codes!=null and stockrecord.codes != ''">
         AND blade_dict_biz.tenant_id = #{stockrecord.codes}
     </if>) c ON c.dict_key = st.specs_val2
-        LEFT JOIN (SELECT name, id FROM blade_user WHERE is_deleted = 0) a ON a.id = st.create_user
+        LEFT JOIN (SELECT real_name, id FROM blade_user WHERE is_deleted = 0) a ON a.id = st.create_user
         LEFT JOIN ( SELECT agricultural_name,id FROM sys_stockfactory WHERE is_deleted = 0 ) f ON f.id = st.stock_id1
         WHERE st.is_deleted = 0
+        <if test="stockrecord.agrname!=null and stockrecord.agrname != ''">
+            and f.agricultural_name like concat ('%',#{stockrecord.agrname},'%')
+        </if>
         <if test="stockrecord.stype!=null and stockrecord.stype != ''">
             and stf.type = #{stockrecord.stype}
         </if>
         <if test="stockrecord.sid!=null and stockrecord.sid != ''">
             and st.sid = #{stockrecord.sid}
         </if>
+        <if test="stockrecord.deptId != null and stockrecord.deptId !=''">
+            and st.dept_id = #{stockrecord.deptId}
+        </if>
+        <if test="stockrecord.startTime!=null and stockrecord.startTime!=''">
+            AND DATE_FORMAT(st.create_time,'%Y-%m-%d') &gt;= #{stockrecord.startTime}
+        </if>
+        <if test="stockrecord.endTime!=null and stockrecord.endTime!=''">
+            AND DATE_FORMAT(st.create_time,'%Y-%m-%d') &lt;= #{stockrecord.endTime}
+        </if>
         ORDER BY st.create_time desc
     </select>
 

--
Gitblit v1.9.3