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/traceability/mapper/TraceabilityMapper.xml | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 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 cb95225..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,7 +18,38 @@
</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>
+
+ <!--获取溯源简介信息-->
+ <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 blade_dept bd on bd.id = st.dept_id
+ 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.dept_id = bd.id
+ where st.code = #{traceability.code}
+ </select>
</mapper>
--
Gitblit v1.9.3