From 67273fc4b73a4abf62c4c01269d358cf933ca52e Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 19 May 2022 08:47:23 +0800
Subject: [PATCH] 农资管理
---
src/main/java/org/springblade/modules/stockrecord/mapper/StockrecordMapper.xml | 38 ++++++++++++++++++++++----------------
1 files changed, 22 insertions(+), 16 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 65f2569..b8ca1c9 100644
--- a/src/main/java/org/springblade/modules/stockrecord/mapper/StockrecordMapper.xml
+++ b/src/main/java/org/springblade/modules/stockrecord/mapper/StockrecordMapper.xml
@@ -56,23 +56,29 @@
<!--农资记录查询-->
<select id="seletStockRecordList" resultType="org.springblade.modules.stockrecord.vo.StockrecordVO">
SELECT st.*,
- stf.type AS stype,
- stf.factory_name AS factoryName,
- d.dict_value AS dic1,
- c.dict_value AS dic2,
- a.name as czr
+ stf.type AS stype,
+ stf.factory_name AS factoryName,
+ d.dict_value AS dic1,
+ c.dict_value AS dic2,
+ a.name as czr
FROM `sys_stockrecord` st
- LEFT JOIN sys_stockfactory stf
- ON st.stock_id1 = stf.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_val1
- 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_val2
- LEFT JOIN (SELECT name, id FROM blade_user WHERE is_deleted = 0) a ON a.id = st.create_user
+ LEFT JOIN sys_stockfactory stf
+ ON st.stock_id1 = stf.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_val1
+ 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_val2
+ LEFT JOIN (SELECT name, id FROM blade_user WHERE is_deleted = 0) a ON a.id = st.create_user
WHERE st.is_deleted = 0
+ <if test="stockrecord.stype!=null and stockrecord.stype != ''">
+ and stf.type = #{stockrecord.stype}
+ </if>
+ <if test="stockrecord.stockId1!=null and stockrecord.stockId1 != ''">
+ and st.stock_id1 = #{stockrecord.stockId1}
+ </if>
</select>
</mapper>
--
Gitblit v1.9.3