From 3df8757ade3bdef3b5a142c846680102589260bc Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 13 Jul 2022 10:36:37 +0800
Subject: [PATCH] 农事操作，种植记录查询新增，地块，溯源码查询修改
---
src/main/java/org/springblade/modules/stockrecord/mapper/StockrecordMapper.xml | 45 +++++++++++++++++++++++++++++----------------
1 files changed, 29 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..40a4184 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,36 @@
<!--农资记录查询-->
<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,
+ f.agricultural_name as agrname
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 <if test="stockrecord.codes!=null and stockrecord.codes != ''">
+ AND blade_dict_biz.tenant_id = #{stockrecord.codes}
+ </if>) 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 <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 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.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>
</select>
+
</mapper>
--
Gitblit v1.9.3