From 258c781597200e0d82fda71fd53a9f8254b9ad91 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 14 Jun 2022 11:57:46 +0800
Subject: [PATCH] 农场，农产品，种类，种植，农事，采收，农产品库存新增租户农场id 字段，接口修改

---
 src/main/java/org/springblade/modules/stock/mapper/StockMapper.xml |   34 +++++++++++++++++++++-------------
 1 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/main/java/org/springblade/modules/stock/mapper/StockMapper.xml b/src/main/java/org/springblade/modules/stock/mapper/StockMapper.xml
index 933d5ff..a6da746 100644
--- a/src/main/java/org/springblade/modules/stock/mapper/StockMapper.xml
+++ b/src/main/java/org/springblade/modules/stock/mapper/StockMapper.xml
@@ -42,11 +42,19 @@
         LEFT JOIN sys_stockfactory stf ON stf.id = st.stock_id
         LEFT JOIN (SELECT dict_key, dict_value
         FROM blade_dict_biz
-        WHERE CODE = 'stockSpecs1' AND is_deleted = 0) d ON d.dict_key = st.specs_value1
+        WHERE CODE = 'stockSpecs1' AND is_deleted = 0
+        <if test="stock.codes!=null and stock.codes != ''">
+            AND blade_dict_biz.tenant_id = #{stock.codes}
+        </if>) d ON d.dict_key = st.specs_value1
         LEFT JOIN (SELECT dict_key, dict_value
         FROM blade_dict_biz
-        WHERE CODE = 'stockSpecs2' AND is_deleted = 0) c ON c.dict_key = st.specs_value2
-        LEFT JOIN ( SELECT dict_key, dict_value FROM blade_dict_biz WHERE CODE = 'stockType' AND is_deleted = 0 ) a ON
+        WHERE CODE = 'stockSpecs2' AND is_deleted = 0  <if test="stock.codes!=null and stock.codes != ''">
+        AND blade_dict_biz.tenant_id = #{stock.codes}
+    </if>) c ON c.dict_key = st.specs_value2
+        LEFT JOIN ( SELECT dict_key, dict_value FROM blade_dict_biz WHERE CODE = 'stockType' AND is_deleted = 0
+        <if test="stock.codes!=null and stock.codes != ''">
+            AND blade_dict_biz.tenant_id = #{stock.codes}
+        </if>) a ON
         a.dict_key = stf.type
         WHERE st.is_deleted = 0 and state=0
         <if test="stock.stype!=null and stock.stype != ''">
@@ -196,10 +204,10 @@
         WHERE stock_type1 = 1
         AND type1 = 0
         <if test="startTime!=null and startTime!=''">
-            and time1 &gt;= #{stock.startTime}
+            and time1 &gt;= #{startTime}
         </if>
         <if test="endTime!=null and endTime!=''">
-            and time1 &lt;= #{stock.endTime}
+            and time1 &lt;= #{endTime}
         </if>
         GROUP BY stock_id1) cg ON cg.stock_id1 = a.id
         LEFT JOIN (SELECT stock_id1, SUM(census) AS dbrknum
@@ -207,10 +215,10 @@
         WHERE stock_type1 = 1
         AND type1 = 1
         <if test="startTime!=null and startTime!=''">
-            and time1 &gt;= #{stock.startTime}
+            and time1 &gt;= #{startTime}
         </if>
         <if test="endTime!=null and endTime!=''">
-            and time1 &lt;= #{stock.endTime}
+            and time1 &lt;= #{endTime}
         </if>
         GROUP BY stock_id1) dbr ON dbr.stock_id1 = a.id
         LEFT JOIN (SELECT stock_id1, SUM(census) AS lycknum
@@ -218,10 +226,10 @@
         WHERE stock_type1 = 0
         AND type1 = 0
         <if test="startTime!=null and startTime!=''">
-            and time1 &gt;= #{stock.startTime}
+            and time1 &gt;= #{startTime}
         </if>
         <if test="endTime!=null and endTime!=''">
-            and time1 &lt;= #{stock.endTime}
+            and time1 &lt;= #{endTime}
         </if>
         GROUP BY stock_id1) lyc ON lyc.stock_id1 = a.id
         LEFT JOIN (SELECT stock_id1, SUM(census) AS dbcknum
@@ -229,10 +237,10 @@
         WHERE stock_type1 = 0
         AND type1 = 1
         <if test="startTime!=null and startTime!=''">
-            and time1 &gt;= #{stock.startTime}
+            and time1 &gt;= #{startTime}
         </if>
         <if test="endTime!=null and endTime!=''">
-            and time1 &lt;= #{stock.endTime}
+            and time1 &lt;= #{endTime}
         </if>
         GROUP BY stock_id1) dbc ON dbc.stock_id1 = a.id
         LEFT JOIN (SELECT stock_id1, SUM(census) AS bfcknum
@@ -240,10 +248,10 @@
         WHERE stock_type1 = 0
         AND type1 = 2
         <if test="startTime!=null and startTime!=''">
-            and time1 &gt;= #{stock.startTime}
+            and time1 &gt;= #{startTime}
         </if>
         <if test="endTime!=null and endTime!=''">
-            and time1 &lt;= #{stock.endTime}
+            and time1 &lt;= #{endTime}
         </if>
         GROUP BY stock_id1) bfc ON bfc.stock_id1 = a.id
     </select>

--
Gitblit v1.9.3