From ecef3df4890be54c1da2a8a4fc1c8c1f50f1c263 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 07 四月 2025 15:41:47 +0800
Subject: [PATCH] 式样代码管理

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml |   47 +++++++++++++++++++++++++++++++----------------
 1 files changed, 31 insertions(+), 16 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 569942f..9d205f6 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml
@@ -12,7 +12,7 @@
     <result column="divideId" jdbcType="BIGINT" property="divideId" />
     <result column="typeId" jdbcType="BIGINT" property="typeId" />
     <result column="name" jdbcType="VARCHAR" property="name" />
-    <result column="num" jdbcType="VARCHAR" property="num" />
+    <result column="num" jdbcType="INTEGER" property="num" />
     <result column="phone" jdbcType="VARCHAR" property="phone" />
     <result column="idCard" jdbcType="VARCHAR" property="idcard" />
     <result column="area" jdbcType="FLOAT" property="area" />
@@ -29,9 +29,8 @@
   </sql>
   <sql id="part_Column_List">
     <!--@mbg.generated-->
-      ${alias}.id, ${alias}.countyId, ${alias}.townId, ${alias}.villageId, ${alias}.blockId, ${alias}.divideId, ${alias}.typeId,
-      ${alias}.`name`, ${alias}.num, ${alias}.phone, ${alias}.idCard, ${alias}.area, ${alias}.district,${alias}.address,
-      ${alias}.remark, ${alias}.disabled
+      ${alias}.id, ${alias}.countyId, ${alias}.townId, ${alias}.villageId, ${alias}.blockId, ${alias}.divideId, ${alias}.typeId, ${alias}.name, ${alias}.num, ${alias}.phone, ${alias}.idCard, ${alias}.area, ${alias}.district,${alias}.address, ${alias}.remark,
+      ${alias}.disabled
   </sql>
 
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
@@ -67,13 +66,13 @@
             <if test="blockId != null">
                 bc.blockId = #{blockId,jdbcType=BIGINT} and
             </if>
-            <if test="name != null">
-                bc.name like concat('%', #{name}, '%') and
+            <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>
@@ -84,8 +83,8 @@
         <include refid="part_Column_List" >
             <property name="alias" value="bc"/>
         </include>,
-        bbk.name blockName,
-        bct.name typeName
+        bbk.`name` blockName,
+        bct.`name` typeName
         from ba_client bc
         left join ba_block bbk on bc.blockId = bbk.id
         left join ba_client_type bct on bc.typeId = bct.id
@@ -104,7 +103,7 @@
                 blockId = #{blockId,jdbcType=BIGINT} and
             </if>
             <if test="name != null">
-                bc.name like concat('%', #{name}, '%') and
+                bc.`name` like concat('%', #{name}, '%') and
             </if>
             <if test="num != null">
                 bc.num = #{num,jdbcType=VARCHAR} and
@@ -120,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,
@@ -130,7 +129,7 @@
         values (#{id,jdbcType=BIGINT}, #{countyId,jdbcType=BIGINT},
           #{townId,jdbcType=BIGINT}, #{villageId,jdbcType=BIGINT},
           #{blockId,jdbcType=BIGINT}, #{divideId,jdbcType=BIGINT}, #{typeId,jdbcType=BIGINT},
-          #{name,jdbcType=VARCHAR}, #{num,jdbcType=VARCHAR},
+          #{name,jdbcType=VARCHAR}, #{num,jdbcType=INTEGER},
           #{phone,jdbcType=VARCHAR}, #{idcard,jdbcType=VARCHAR},
           #{area,jdbcType=FLOAT}, #{district,jdbcType=VARCHAR},
           #{address,jdbcType=VARCHAR},#{remark,jdbcType=VARCHAR},
@@ -220,7 +219,7 @@
             #{name,jdbcType=VARCHAR},
           </if>
           <if test="num != null">
-            #{num,jdbcType=VARCHAR},
+            #{num,jdbcType=INTEGER},
           </if>
           <if test="phone != null">
             #{phone,jdbcType=VARCHAR},
@@ -273,7 +272,7 @@
                 'name' = #{name,jdbcType=VARCHAR},
             </if>
             <if test="num != null">
-                num = #{num,jdbcType=VARCHAR},
+                num = #{num,jdbcType=INTEGER},
             </if>
             <if test="phone != null">
                 phone = #{phone,jdbcType=VARCHAR},
@@ -313,7 +312,7 @@
             blockId = #{blockId,jdbcType=BIGINT},
             typeId = #{typeId,jdbcType=BIGINT},
             `name` = #{name,jdbcType=VARCHAR},
-            num = #{num,jdbcType=VARCHAR},
+            num = #{num,jdbcType=INTEGER},
             phone = #{phone,jdbcType=VARCHAR},
             idcard = #{idcard,jdbcType=VARCHAR},
             area = #{area,jdbcType=FLOAT},
@@ -337,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