From 8dcdba2f833fa7dd79169a068ce8b45d380d58a0 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 14 七月 2025 13:43:51 +0800
Subject: [PATCH] 修改用水户年用水量统计查询中的bug
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmManureHistoryMapper.xml | 65 ++++++++++++++++++++++++++++++++
1 files changed, 65 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmManureHistoryMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmManureHistoryMapper.xml
index b1028ec..c65c2ea 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmManureHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmManureHistoryMapper.xml
@@ -25,6 +25,17 @@
id, manure_id, dt, stir_running1, stir_running2, stir_running3, stir_running4, inject_running,
irr_running, alarm, manure_flow, manure_time, stir_time, stir_duration, inject_duration
</sql>
+ <sql id="Base_Column_List_with_alias">
+ <!--@mbg.generated-->
+ ${alias}.id, ${alias}.manure_id, ${alias}.dt,
+ ${alias}.stir_running1, ${alias}.stir_running2,
+ ${alias}.stir_running3, ${alias}.stir_running4,
+ ${alias}.inject_running, ${alias}.irr_running,
+ ${alias}.alarm, ${alias}.manure_flow,
+ ${alias}.manure_time, ${alias}.stir_time,
+ ${alias}.stir_duration, ${alias}.inject_duration
+ </sql>
+
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
select
@@ -32,6 +43,60 @@
from rm_manure_history
where id = #{id,jdbcType=BIGINT}
</select>
+ <!--鏍规嵁鎸囧畾鏉′欢鏌ヨ鍘嗗彶璁板綍鏁伴噺-->
+ <select id="selectCount" resultType="java.lang.Long">
+ SELECT
+ COUNT(*) AS recordCount
+ FROM rm_manure_history htb
+ INNER JOIN pr_st_manure mtb ON mtb.id = htb.manure_id
+ <where>
+ <if test="manureId != null">
+ AND htb.manure_id = #{manureId}
+ </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.VoManure">
+ SELECT
+ <include refid="Base_Column_List_with_alias" >
+ <property name="alias" value="htb"/>
+ </include>,
+ mtb.`name` AS manureName
+ FROM rm_manure_history htb
+ INNER JOIN pr_st_manure mtb ON mtb.id = htb.manure_id
+ <where>
+ <if test="manureId != null">
+ AND htb.manure_id = #{manureId}
+ </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_manure_history
--
Gitblit v1.8.0