From 63a3920ea3d17f8a677d4edc9ffaab279367cb70 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 27 六月 2025 09:16:27 +0800
Subject: [PATCH] 水肥、气象、墒情最新、历史数据查询测试并修改bug
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmSoilDayMapper.xml | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmSoilDayMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmSoilDayMapper.xml
index a63c315..15338e4 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmSoilDayMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmSoilDayMapper.xml
@@ -38,6 +38,15 @@
soil_sum_humidity4, soil_sum_humidity5, soil_sum_temperature1, soil_sum_temperature2,
soil_sum_temperature3, soil_sum_temperature4, soil_sum_temperature5
</sql>
+ <sql id="Base_Column_List_with_alias">
+ <!--@mbg.generated-->
+ ${alias}.id, ${alias}.soil_id, ${alias}.dt, ${alias}.ymd,
+ ${alias}.soil_humidity1, ${alias}.soil_humidity2, ${alias}.soil_humidity3, ${alias}.soil_humidity4, ${alias}.soil_humidity5,
+ ${alias}.soil_temperature1, ${alias}.soil_temperature2, ${alias}.soil_temperature3, ${alias}.soil_temperature4, ${alias}.soil_temperature5,
+ ${alias}.times,
+ ${alias}.soil_sum_humidity1, ${alias}.soil_sum_humidity2, ${alias}.soil_sum_humidity3, ${alias}.soil_sum_humidity4, ${alias}.soil_sum_humidity5,
+ ${alias}.soil_sum_temperature1, ${alias}.soil_sum_temperature2, ${alias}.soil_sum_temperature3, ${alias}.soil_sum_temperature4, ${alias}.soil_sum_temperature5
+ </sql>
<sql id="Part_Column_List">
<!--@mbg.generated-->
id, soil_id, dt, ymd, soil_humidity1, soil_humidity2, soil_humidity3, soil_humidity4,
@@ -103,7 +112,7 @@
<if test = "name != null and name !=''">
AND mtb.name LIKE CONCAT('%',#{name},'%')
</if>
- <if test = "timeStart != null and timeStop != null">
+ <if test = "timeStart != null and timeStart !='' and timeStop != null and timeStop != ''">
AND ltb.dt BETWEEN #{timeStart} AND #{timeStop}
</if>
</where>
@@ -112,7 +121,9 @@
<!--鏍规嵁鎸囧畾鏉′欢鏌ヨ璁板綍-->
<select id="selectSome" resultType="com.dy.pipIrrGlobal.voRm.VoSoilDay">
SELECT
- <include refid="Base_Column_List" />,
+ <include refid="Base_Column_List_with_alias" >
+ <property name="alias" value="ltb"/>
+ </include>,
mtb.`name` AS soilName
FROM rm_soil_day ltb
INNER JOIN pr_st_soil mtb ON mtb.id = ltb.soil_id
@@ -126,7 +137,7 @@
<if test = "name != null and name !=''">
AND mtb.name LIKE CONCAT('%',#{name},'%')
</if>
- <if test = "timeStart != null and timeStop != null">
+ <if test = "timeStart != null and timeStart !='' and timeStop != null and timeStop != ''">
AND ltb.dt BETWEEN #{timeStart} AND #{timeStop}
</if>
</where>
--
Gitblit v1.8.0