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/RmManureHistoryMapper.xml | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 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 c94dc1e..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
@@ -48,7 +59,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 htb.dt BETWEEN #{timeStart} AND #{timeStop}
</if>
</where>
@@ -57,7 +68,9 @@
<!--鏍规嵁鎸囧畾鏉′欢鏌ヨ鍘嗗彶璁板綍-->
<select id="selectSome" resultType="com.dy.pipIrrGlobal.voRm.VoManure">
SELECT
- <include refid="Base_Column_List" />,
+ <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
@@ -71,7 +84,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 htb.dt BETWEEN #{timeStart} AND #{timeStop}
</if>
</where>
--
Gitblit v1.8.0