From 77dd7d19bb13f19acd273ba92dfd2b866a229c5e Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sat, 16 Jul 2022 16:20:07 +0800
Subject: [PATCH] 库存

---
 src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml b/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml
index 25c25ed..37856e6 100644
--- a/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml
+++ b/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml
@@ -2,13 +2,13 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.springblade.modules.traceability.mapper.TraceabilityMapper">
 
-    <!--自定义查询农场养殖记录分页数据-->
+    <!--自定义查询溯源码分页数据-->
     <select id="selectTraceabilityPage" resultType="org.springblade.modules.traceability.vo.TraceabilityVO">
         select st.* from sys_traceability st
         left join sys_recovery sr on st.recovery_id = sr.id
         where 1=1
         <if test="traceability.code!=null and traceability.code!=''">
-            and st.code = #{traceability.code}
+            and st.code like concat('%',#{traceability.code},'%')
         </if>
         <if test="traceability.deptId!=null and traceability.deptId!=''">
             and st.dept_id = #{traceability.deptId}
@@ -18,6 +18,26 @@
         </if>
     </select>
 
+    <!--自定义查询溯源码数据,不分页-->
+    <select id="getTraceabilityList" resultType="org.springblade.modules.traceability.vo.TraceabilityVO">
+        select st.* from sys_traceability st
+        left join sys_recovery sr on st.recovery_id = sr.id
+        left join sys_land sl on sr.land_id = sl.id
+        where 1=1
+        <if test="traceability.code!=null and traceability.code!=''">
+            and st.code like concat('%',#{traceability.code},'%')
+        </if>
+        <if test="traceability.deptId!=null and traceability.deptId!=''">
+            and st.dept_id = #{traceability.deptId}
+        </if>
+        <if test="traceability.tenantId!=null and traceability.tenantId!=''">
+            and st.tenant_id = #{traceability.tenantId}
+        </if>
+        <if test="traceability.farmId!=null and traceability.farmId!=''">
+            and sl.farm_id = #{traceability.farmId}
+        </if>
+    </select>
+
     <select id="selectRevorid" resultType="java.lang.String">
         select recovery_id from sys_traceability where code=#{code}
     </select>

--
Gitblit v1.9.3