From 4f97850c9cc2098f460124a66266bdf6157319dd Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 26 六月 2025 15:46:29 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmManureLastMapper.xml | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmManureLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmManureLastMapper.xml
index c1bbf6f..a620094 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmManureLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmManureLastMapper.xml
@@ -49,7 +49,7 @@
</select>
- <!--鏍规嵁鎸囧畾鏉′欢鏌ヨ鍘嗗彶璁板綍鏁伴噺-->
+ <!--鏍规嵁鎸囧畾鏉′欢鏌ヨ璁板綍鏁伴噺-->
<select id="selectCount" resultType="java.lang.Long">
SELECT
COUNT(*) AS recordCount
@@ -63,7 +63,7 @@
AND mtb.no = #{no}
</if>
<if test = "name != null and name !=''">
- AND mtb.name LIKE CONCAT('%',#{intakeNum},'%')
+ AND mtb.name LIKE CONCAT('%',#{name},'%')
</if>
<if test = "timeStart != null and timeStop != null">
AND ltb.dt BETWEEN #{timeStart} AND #{timeStop}
@@ -71,7 +71,7 @@
</where>
</select>
- <!--鏍规嵁鎸囧畾鏉′欢鏌ヨ鍘嗗彶璁板綍-->
+ <!--鏍规嵁鎸囧畾鏉′欢鏌ヨ璁板綍-->
<select id="selectSome" resultType="com.dy.pipIrrGlobal.voRm.VoManure">
SELECT
<include refid="Base_Column_List" />,
@@ -86,7 +86,7 @@
AND mtb.no = #{no}
</if>
<if test = "name != null and name !=''">
- AND mtb.name LIKE CONCAT('%',#{intakeNum},'%')
+ AND mtb.name LIKE CONCAT('%',#{name},'%')
</if>
<if test = "timeStart != null and timeStop != null">
AND ltb.dt BETWEEN #{timeStart} AND #{timeStop}
@@ -100,6 +100,19 @@
</trim>
</select>
+ <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇璁板綍-->
+ <select id="selectSomeByManureId" resultType="com.dy.pipIrrGlobal.voRm.VoManure">
+ select
+ <include refid="Base_Column_List" />
+ from rm_manure_last
+ <where>
+ <if test="manureId != null">
+ and manure_id = #{manureId}
+ </if>
+ </where>
+ limit 0,1
+ </select>
+
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
<!--@mbg.generated-->
--
Gitblit v1.8.0