From b3138924736b928ff8f5abc4c8c8490b75b03672 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期五, 28 六月 2024 11:14:34 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml
index 7adaf21..8236c83 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml
@@ -286,7 +286,7 @@
address = #{address,jdbcType=VARCHAR},
remarks = #{remarks,jdbcType=VARCHAR},
`operator` = #{operator,jdbcType=BIGINT},
- operateDt = #{operatedt,jdbcType=TIMESTAMP},
+ operateDt = #{operatedt,jdbcType=TIMESTAMP}
<!-- disabled = #{disabled,jdbcType=TINYINT},-->
<!-- deleted = #{deleted,jdbcType=TINYINT}-->
where id = #{id,jdbcType=BIGINT}
@@ -341,7 +341,7 @@
CAST(cli.villageId AS char) AS villageId,
dis_village.name AS villageName,
CAST(cli.blockId AS char) AS blockId,
- blo.name AS bolckName,
+ blo.name AS blockName,
CAST(cli.divideId AS char) AS divideId,
divi.name AS divideName,
CAST(cli.typeId AS char) AS waterTypeId,
@@ -393,7 +393,7 @@
<!--鏍规嵁鍐滄埛缂栧彿鑾峰彇5绾ц鏀垮尯鍒掍唬鐮�-->
<select id="getAreaCodeByNum" resultType="java.lang.Long">
- SELECT districtNum FROM se_client WHERE clientNum = ${clientNum}
+ SELECT districtNum FROM se_client WHERE clientNum = ${clientNum} LIMIT 0,1
</select>
<!--鏍规嵁鍐滄埛缂栧彿鑾峰彇5绾ц鏀垮尯鍒掍覆areaCode锛岃ˉ鍗¤繃绋嬩腑寮�鏂板崱浣跨敤-->
@@ -403,7 +403,7 @@
<!--鏍规嵁鍐滄埛缂栧彿鑾峰彇鍐滄埛ID-->
<select id="getClientIdByNum" resultType="java.lang.Long">
- SELECT id FROM se_client WHERE clientNum = ${clientNum}
+ SELECT id FROM se_client WHERE clientNum = ${clientNum} LIMIT 0,1
</select>
<!--鏍规嵁鐢佃瘽鍙风爜鑾峰彇鍐滄埛ID-->
@@ -436,4 +436,26 @@
SELECT id, typeName from se_water_type
</select>
+ <!--鑾峰彇鍐滄埛鍩烘湰淇℃伅锛屽皬绋嬪簭棣栭〉浣跨敤-->
+ <select id="getSimpleClientInfo" resultType="com.dy.pipIrrGlobal.voSe.VoClientWechat">
+ SELECT
+ CAST(ope.id AS char) AS sessionId,
+ CAST(cli.id AS char) AS clientId,
+ cli.name AS clientName,
+ cli.phone,
+ CAST(cli.blockId AS char) AS blockId
+ FROM se_open_id ope
+ INNER JOIN se_client cli ON ope.client_id = cli.id
+ <where>
+ <if test = "sessionId != null">
+ AND ope.id = #{sessionId}
+ </if>
+
+ <if test = "openId != null">
+ AND ope.open_id = #{openId}
+ </if>
+ </where>
+ LIMIT 0,1
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0