From c587f8f148d3504361cf7a61d0cecb4dd64f4d30 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 09 Jul 2022 09:55:34 +0800
Subject: [PATCH] 新增溯源码查询,不分页

---
 src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml |   20 ++++++++++++++++++--
 1 files changed, 18 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..2fbeef9 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,29 @@
 <!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}
+        </if>
+        <if test="traceability.tenantId!=null and traceability.tenantId!=''">
+            and st.tenant_id = #{traceability.tenantId}
+        </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
+        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}

--
Gitblit v1.9.3