From 59d86d28c4677d9dd72fba3bb193c431ffd86df4 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 18 七月 2025 16:27:34 +0800
Subject: [PATCH] 增加一个文档《FlexManager典型配置》

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmSoilHistoryMapper.xml |   60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 60 insertions(+), 0 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmSoilHistoryMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmSoilHistoryMapper.xml
index 4a66ef7..3e9eec7 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmSoilHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmSoilHistoryMapper.xml
@@ -24,6 +24,13 @@
     soil_humidity5, soil_temperature1, soil_temperature2, soil_temperature3, soil_temperature4, 
     soil_temperature5
   </sql>
+  <sql id="Base_Column_List_with_alias">
+    <!--@mbg.generated-->
+    ${alias}.id, ${alias}.soil_id, ${alias}.dt, ${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
+  </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     <!--@mbg.generated-->
     select 
@@ -31,6 +38,59 @@
     from rm_soil_history
     where id = #{id,jdbcType=BIGINT}
   </select>
+  <!--鏍规嵁鎸囧畾鏉′欢鏌ヨ鍘嗗彶璁板綍鏁伴噺-->
+  <select id="selectCount" resultType="java.lang.Long">
+    SELECT
+    COUNT(*) AS recordCount
+    FROM rm_soil_history htb
+    INNER JOIN pr_st_soil mtb ON mtb.id = htb.soil_id
+    <where>
+      <if test="soilId != null">
+        AND htb.soil_id = #{soilId}
+      </if>
+      <if test = "no != null">
+        AND mtb.no = #{no}
+      </if>
+      <if test = "name != null and name !=''">
+        AND mtb.name LIKE CONCAT('%',#{name},'%')
+      </if>
+      <if test = "timeStart != null and timeStart !='' and timeStop != null and timeStop != ''">
+        AND htb.dt BETWEEN #{timeStart} AND #{timeStop}
+      </if>
+    </where>
+  </select>
+
+  <!--鏍规嵁鎸囧畾鏉′欢鏌ヨ鍘嗗彶璁板綍-->
+  <select id="selectSome" resultType="com.dy.pipIrrGlobal.voRm.VoSoil">
+    SELECT
+    <include refid="Base_Column_List_with_alias" >
+      <property name="alias" value="htb"/>
+    </include>,
+    mtb.`name` AS soilName
+    FROM rm_soil_history htb
+    INNER JOIN pr_st_soil mtb ON mtb.id = htb.soil_id
+    <where>
+      <if test="soilId != null">
+        AND htb.soil_id = #{soilId}
+      </if>
+      <if test = "no != null">
+        AND mtb.no = #{no}
+      </if>
+      <if test = "name != null and name !=''">
+        AND mtb.name LIKE CONCAT('%',#{name},'%')
+      </if>
+      <if test = "timeStart != null and timeStart !='' and timeStop != null and timeStop != ''">
+        AND htb.dt BETWEEN #{timeStart} AND #{timeStop}
+      </if>
+    </where>
+    ORDER BY htb.id DESC
+    <trim prefix="limit " >
+      <if test="start != null and count != null">
+        #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
+      </if>
+    </trim>
+  </select>
+
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
     <!--@mbg.generated-->
     delete from rm_soil_history

--
Gitblit v1.8.0