From 1e159ffbf027d1c8a2de5a92ff257d3b02411415 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Sat, 06 Aug 2022 16:50:11 +0800
Subject: [PATCH] 修复使用农资后，已出库待使用农资数据不变。修复使用农资后还能删除出库数据
---
src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml | 47 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 47 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml b/src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml
index 0b75f30..d01dcf1 100644
--- a/src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml
+++ b/src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml
@@ -43,6 +43,53 @@
<if test="farmingRecord.farmId!=null and farmingRecord.farmId!=''">
and sl.farm_id = #{farmingRecord.farmId}
</if>
+ ORDER BY sfr.create_time DESC
+ </select>
+
+ <!--自定义查询农事记录分页数据-->
+ <select id="selectFarmingRecordPageByNz" resultType="org.springblade.modules.farm.vo.FarmingRecordVO">
+ SELECT
+ sfr.*,
+ sl.land_name landName,
+ user.real_name,
+ strain.strain_name,
+ sf.factory_name
+ FROM
+ sys_farming_record sfr
+ LEFT JOIN sys_land sl ON sl.id = sfr.land_id
+ LEFT JOIN blade_user user on sfr.operator = user.id
+ LEFT JOIN sys_strain strain on sfr.strain_id = strain.id
+ LEFT JOIN sys_stockfactory sf on sf.id = sfr.stock_id
+ WHERE
+ 1 =1 AND sfr.stock_id IS NOT NULL
+ <if test="farmingRecord.landId!=null and farmingRecord.landId!=''">
+ and sfr.land_id = #{farmingRecord.landId}
+ </if>
+ <if test="farmingRecord.type!=null and farmingRecord.type!=''">
+ and sfr.type = #{farmingRecord.type}
+ </if>
+ <if test="farmingRecord.stockId!=null and farmingRecord.stockId!=''">
+ and sfr.stock_id = #{farmingRecord.stockId}
+ </if>
+ <if test="farmingRecord.jobWay!=null and farmingRecord.jobWay!=''">
+ and sfr.job_way = #{farmingRecord.jobWay}
+ </if>
+ <if test="farmingRecord.operator!=null and farmingRecord.operator!=''">
+ and sfr.operator = #{farmingRecord.operator}
+ </if>
+ <if test="farmingRecord.deptId!=null and farmingRecord.deptId!=''">
+ and sfr.dept_id = #{farmingRecord.deptId}
+ </if>
+ <if test="farmingRecord.tenantId!=null and farmingRecord.tenantId!=''">
+ and sfr.tenant_id = #{farmingRecord.tenantId}
+ </if>
+ <if test="farmingRecord.strainId!=null and farmingRecord.strainId!=''">
+ and sfr.strain_id = #{farmingRecord.strainId}
+ </if>
+ <if test="farmingRecord.farmId!=null and farmingRecord.farmId!=''">
+ and sl.farm_id = #{farmingRecord.farmId}
+ </if>
+ ORDER BY sfr.create_time DESC
</select>
<select id="selectFarmingRecordPages" resultType="org.springblade.modules.farm.vo.FarmingRecordVO">
--
Gitblit v1.9.3