From 72b971c98c46531064d74b68fc8fe8864ed0b544 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 08 Nov 2022 09:04:56 +0800
Subject: [PATCH] 大屏溯源统计次数sql修改

---
 src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml |   67 +++++++++++++++++++++++++++++++--
 1 files changed, 63 insertions(+), 4 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 cb95225..0ede23e 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,56 @@
 <!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
+        select st.*,sr.land_id landId from sys_traceability st
         left join sys_recovery sr on st.recovery_id = sr.id
+        LEFT JOIN sys_land sl ON sl.id = sr.land_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.farmId!=null and traceability.farmId!=''">
+            and sl.farm_id = #{traceability.farmId}
+        </if>
+        <if test="traceability.tenantId!=null and traceability.tenantId!=''">
+            and st.tenant_id = #{traceability.tenantId}
+        </if>
+        <if test="traceability.deptId != null and traceability.deptId != ''">
+            and st.dept_id = #{traceability.deptId}
+        </if>
+        <if test="traceability.bind !=null and traceability.bind !=''">
+            and st.bind = #{traceability.bind}
+        </if>
+    </select>
+
+    <!--自定义查询溯源码分页数据-->
+    <select id="selectTraceabilityXcxPage" resultType="org.springblade.modules.traceability.vo.TraceabilityVO">
+        select a.id,a.code,c.land_name as landName,c.id as landId,a.product_name productName,
+               a.create_time createTime,d.url,d.strain_name AS strainName,b.create_time AS recoveryTime from sys_traceability a
+        LEFT JOIN sys_recovery b ON a.recovery_id = b.id
+        LEFT JOIN sys_land c ON b.land_id = c.id
+        LEFT JOIN sys_strain d ON b.strain_id = d.id
+        where 1=1
+        <if test="traceability.code!=null and traceability.code!=''">
+            and a.code like concat('%',#{traceability.code},'%')
+        </if>
+        <if test="traceability.farmId!=null and traceability.farmId!=''">
+            and c.farm_id = #{traceability.farmId}
+        </if>
+        <if test="traceability.tenantId!=null and traceability.tenantId!=''">
+            and a.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
+        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}
@@ -16,9 +59,25 @@
         <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 recovery_id
+        from sys_traceability
+        where code = #{code}
+    </select>
+
+    <!--获取溯源简介信息-->
+    <select id="getSimpleInfo" resultType="org.springblade.modules.traceability.dto.TraceabilityDTO">
+        SELECT concat(sf.farm_name, '-', ifnull(sl.land_name, '-'), '-', ss.strain_name, '-', sr.time, ' 采收') remark
+        FROM `sys_traceability` st
+                 left join sys_recovery sr on sr.id = st.recovery_id
+                 left join sys_land sl on sl.id = sr.land_id
+                 left join sys_strain ss on ss.id = sr.strain_id
+                 left join sys_farm sf on sf.id = sl.farm_id
+        where st.code = #{traceability.code}
     </select>
 </mapper>

--
Gitblit v1.9.3