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/soldr/mapper/SoldrMapper.xml | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 54 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/soldr/mapper/SoldrMapper.xml b/src/main/java/org/springblade/modules/soldr/mapper/SoldrMapper.xml
index fe8eca5..23166d9 100644
--- a/src/main/java/org/springblade/modules/soldr/mapper/SoldrMapper.xml
+++ b/src/main/java/org/springblade/modules/soldr/mapper/SoldrMapper.xml
@@ -29,7 +29,7 @@
</select>
<select id="selectLists" resultType="org.springblade.modules.soldr.vo.SoldrVO">
- SELECT st.stock_id1,
+ SELECT st.id,st.stock_id1,
st.specs1,
st.sid,
st.amount1 AS amount1,
@@ -42,11 +42,18 @@
LEFT JOIN sys_stockfactory stf ON stf.id = st.stock_id1
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
+ WHERE CODE = 'stockSpecs1' AND is_deleted = 0 <if test="soldr.codes!=null and soldr.codes != ''">
+ AND blade_dict_biz.tenant_id = #{soldr.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) c ON c.dict_key = st.specs_val2
- 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="soldr.codes!=null and soldr.codes != ''">
+ AND blade_dict_biz.tenant_id = #{soldr.codes}
+ </if>) c ON c.dict_key = st.specs_val2
+ LEFT JOIN ( SELECT dict_key, dict_value FROM blade_dict_biz WHERE CODE = 'stockType' AND is_deleted = 0 <if
+ test="soldr.codes!=null and soldr.codes != ''">
+ AND blade_dict_biz.tenant_id = #{soldr.codes}
+ </if>) a ON
a.dict_key = stf.type
WHERE st.is_deleted = 0
<if test="soldr.stype!=null and soldr.stype != ''">
@@ -62,4 +69,47 @@
from sys_soldr
where sid = #{id}
</delete>
+
+ <delete id="dels">
+ delete
+ from sys_soldr
+ where id = #{id}
+ </delete>
+
+ <!--已出农资列表-->
+ <select id="selectSol" resultType="org.springblade.modules.soldr.vo.SoldrVO">
+ SELECT st.id,
+ st.stock_id1,
+ st.specs1,
+ st.sid,
+ st.amount1 AS amount1,
+ stf.factory_name AS factoryName,
+ a.dict_value AS stype,
+ d.dict_value AS dic1,
+ c.dict_value AS dic2,
+ stf.agricultural_name as agrname
+ FROM sys_soldr st
+ LEFT JOIN sys_stockfactory stf ON stf.id = st.stock_id1
+ 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 dict_key, dict_value
+ FROM blade_dict_biz
+ WHERE CODE = 'stockType' AND is_deleted = 0) a ON
+ a.dict_key = stf.type
+ WHERE st.is_deleted = 0
+ </select>
+
+ <!--查询是否存在已出库农资-->
+ <select id="selectCz" resultType="java.util.Map">
+ SELECT census, sid, amount1
+ FROM `sys_soldr`
+ WHERE sid = #{sid}
+ </select>
+
</mapper>
--
Gitblit v1.9.3