From d730e2a289b38356e28a04b35a0cb2e7b4c6c282 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 03 七月 2025 10:27:56 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmSoilDayMapper.xml |   36 +++++++++++++++++++++++++++++++-----
 1 files changed, 31 insertions(+), 5 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..f454600 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,
@@ -68,7 +77,6 @@
     limit 0,1
   </select>
 
-
   <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇璁板綍-->
   <select id="selectOneBySoilId" resultType="com.dy.pipIrrGlobal.voRm.VoSoilDay">
     select
@@ -85,7 +93,23 @@
     limit 0,1
   </select>
 
-
+  <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇璁板綍-->
+  <select id="selectOneMonthBySoilId" resultType="com.dy.pipIrrGlobal.voRm.VoSoilDay">
+    select
+    <include refid="Part_Column_List" />
+    from rm_soil_day
+    <where>
+      <if test="soilId != null">
+        and soil_id = #{soilId}
+      </if>
+      <if test="ymdStart != null">
+        and ymd &gt;= #{ymdStart}
+      </if>
+      <if test="ymdEnd != null">
+        and ymd &lt;= #{ymdEnd}
+      </if>
+    </where>
+  </select>
 
   <!--鏍规嵁鎸囧畾鏉′欢鏌ヨ璁板綍鏁伴噺-->
   <select id="selectCount" resultType="java.lang.Long">
@@ -103,7 +127,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 +136,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 +152,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