From 001f24d4efd7b818bc2224b976c82faf4f9e564c Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 01 十一月 2024 11:25:00 +0800
Subject: [PATCH] 1、通信协议要增加版本号（目的为远程升级准备），原来没有版本号的协议默认为版本号为1，所以调整了程序命名； 2、流浪控制器与控制器数据库表都增加了协议版本号字段； 3、VO中Double和Float类型的属性增加注解@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml
index 458b6e1..9d205f6 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml
@@ -66,13 +66,13 @@
<if test="blockId != null">
bc.blockId = #{blockId,jdbcType=BIGINT} and
</if>
- <if test="name != null">
+ <if test="name != null and name != ''">
bc.`name` like concat('%', #{name}, '%') and
</if>
- <if test="num != null">
+ <if test="num != null and num != ''">
bc.num = #{num,jdbcType=VARCHAR} and
</if>
- <if test="phone != null">
+ <if test="phone != null and phone != ''">
bc.phone = #{phone,jdbcType=VARCHAR} and
</if>
</trim>
@@ -119,7 +119,7 @@
</if>
</trim>
</select>
- <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoBa.BaClient">
+ <insert id="putin" parameterType="com.dy.pipIrrGlobal.pojoBa.BaClient">
<!--@mbg.generated-->
insert into ba_client (id, countyId, townId, villageId, blockId, divideId,
typeId, `name`, num, phone,
@@ -336,4 +336,20 @@
where id = #{id,jdbcType=BIGINT}
</delete>
+ <!--鏍规嵁鍐滄埛缂栧彿鑾峰彇5绾ц鏀垮尯鍒掍唬鐮�-->
+ <select id="getAreaCodeByNum" resultType="com.dy.pipIrrGlobal.voBa.VoAreaCode">
+ SELECT
+ pro.num AS provinceId,
+ cit.num AS cityId,
+ con.num AS countryId,
+ tow.num AS townId,
+ vil.num AS villageId
+ FROM ba_client cli
+ INNER JOIN ba_district con ON cli.countyId = con.id
+ INNER JOIN ba_district tow ON cli.townId = tow.id
+ INNER JOIN ba_district vil ON cli.villageId = vil.id
+ INNER JOIN ba_district cit ON cit.id = con.supperId
+ INNER JOIN ba_district pro ON pro.id = cit.supperId
+ WHERE cli.num = #{clientNum}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0