From b15920d5a66d379c9fd9cb15fcc48f0f078e7c77 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 28 十月 2024 14:52:53 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeControllerMapper.xml | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeControllerMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeControllerMapper.xml
index df62638..96d940c 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeControllerMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeControllerMapper.xml
@@ -150,7 +150,8 @@
<select id="getBindsByIntakeId" resultType="java.util.Map">
SELECT
user.name AS userName,
- con.code AS controllerCode,
+ <!--con.code AS controllerCode,-->
+ con.rtuAddr,
(CASE
WHEN ic.operateType = 1 THEN "缁戝畾"
WHEN ic.operateType = 2 THEN "瑙ｇ粦"
@@ -185,4 +186,26 @@
</if>
ORDER BY ic.operateDt DESC
</select>
+ <!--鏍规嵁鍙栨按鍙ｇ紪鍙蜂慨鏀圭粦瀹氳褰曞垪琛�-->
+ <update id="updateByIntakeSelective">
+ update pr_intake_controller
+ <set>
+ <if test="controllerid != null">
+ controllerId = #{controllerid,jdbcType=BIGINT},
+ </if>
+ <if test="operatetype != null">
+ operateType = #{operatetype,jdbcType=TINYINT},
+ </if>
+ <if test="remarks != null">
+ remarks = #{remarks,jdbcType=VARCHAR},
+ </if>
+ <if test="operator != null">
+ `operator` = #{operator,jdbcType=BIGINT},
+ </if>
+ <if test="operatedt != null">
+ operateDt = #{operatedt,jdbcType=TIMESTAMP},
+ </if>
+ </set>
+ where intakeId = #{intakeid,jdbcType=BIGINT}
+ </update>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0