From 90c02e0ad08c054e1f44476a3e9e16b947c1fd8c Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 14 七月 2025 11:49:14 +0800
Subject: [PATCH] 修改用水户年用水量统计查询中的bug
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmWeatherLastMapper.xml | 76 ++++++++++++++++++++++++++++++++++++++
1 files changed, 76 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmWeatherLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmWeatherLastMapper.xml
index 4014fc3..157e5a8 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmWeatherLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmWeatherLastMapper.xml
@@ -21,6 +21,13 @@
id, last_history_id, weather_id, dt, air_temperature, air_humidity, ultraviolet,
light_intensity, rainfall, wind_speed, wind_direction
</sql>
+ <sql id="Base_Column_List_with_alias">
+ <!--@mbg.generated-->
+ ${alias}.id, ${alias}.last_history_id, ${alias}.weather_id, ${alias}.dt, ${alias}.air_temperature,
+ ${alias}.air_humidity, ${alias}.ultraviolet, ${alias}.light_intensity,
+ ${alias}.rainfall, ${alias}.wind_speed, ${alias}.wind_direction
+ </sql>
+
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
select
@@ -41,6 +48,75 @@
</where>
limit 0,1
</select>
+
+
+
+ <!--鏍规嵁鎸囧畾鏉′欢鏌ヨ璁板綍鏁伴噺-->
+ <select id="selectCount" resultType="java.lang.Long">
+ SELECT
+ COUNT(*) AS recordCount
+ FROM rm_weather_last ltb
+ INNER JOIN pr_st_weather mtb ON mtb.id = ltb.weather_id
+ <where>
+ <if test="weatherId != null">
+ AND ltb.weather_id = #{weatherId}
+ </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 ltb.dt BETWEEN #{timeStart} AND #{timeStop}
+ </if>
+ </where>
+ </select>
+
+ <!--鏍规嵁鎸囧畾鏉′欢鏌ヨ璁板綍-->
+ <select id="selectSome" resultType="com.dy.pipIrrGlobal.voRm.VoWeather">
+ SELECT
+ <include refid="Base_Column_List_with_alias" >
+ <property name="alias" value="ltb"/>
+ </include>,
+ mtb.`name` AS weatherName
+ FROM rm_weather_last ltb
+ INNER JOIN pr_st_weather mtb ON mtb.id = ltb.weather_id
+ <where>
+ <if test="weatherId != null">
+ AND ltb.weather_id = #{weatherId}
+ </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 ltb.dt BETWEEN #{timeStart} AND #{timeStop}
+ </if>
+ </where>
+ ORDER BY ltb.weather_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>
+
+ <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇璁板綍-->
+ <select id="selectSomeByWeatherId" resultType="com.dy.pipIrrGlobal.voRm.VoWeather">
+ select
+ <include refid="Base_Column_List" />
+ from rm_weather_last
+ <where>
+ <if test="weatherId != null">
+ and weather_id = #{weatherId}
+ </if>
+ </where>
+ limit 0,1
+ </select>
+
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
<!--@mbg.generated-->
delete from rm_weather_last
--
Gitblit v1.8.0