From 4abaa8e81c6ddeaeff2d7f0a37d5d0cb567129de Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 29 十月 2024 21:12:33 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDistrictMapper.xml        |   16 ++++++++--------
 pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml                    |    6 +++---
 pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/resources/application.yml |    2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml b/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml
index ad70c53..ad90287 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml
@@ -52,9 +52,9 @@
         </org1>
         <org2 tag="sp" name="娌欑洏" enable="true">
             <districts>
-                <province name="鐢樿們鐪�" num="53" level="0">
-                    <city name="閰掓硥甯�" num="23" level="1">
-                        <country name="澶х闆嗗洟" num="28" level="2" />
+                <province name="鐢樿們鐪�" num="62" level="0">
+                    <city name="閰掓硥甯�" num="09" level="1">
+                        <country name="鑲冨窞鍖�" num="02" level="2" />
                     </city>
                 </province>
             </districts>
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDistrictMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDistrictMapper.xml
index c011351..abf4bc4 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDistrictMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDistrictMapper.xml
@@ -7,7 +7,7 @@
     <id column="id" jdbcType="BIGINT" property="id" />
     <id column="supperId" jdbcType="BIGINT" property="supperId" />
     <result column="name" jdbcType="VARCHAR" property="name" />
-    <result column="num" jdbcType="TINYINT" property="num" />
+    <result column="num" jdbcType="VARCHAR" property="num" />
     <result property="level" column="level" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler" javaType="com.dy.pipIrrGlobal.util.DistrictLevel"/>
     <result property="deleted" column="deleted" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler" javaType="com.dy.common.mybatis.envm.Deleted"/>
   </resultMap>
@@ -47,7 +47,7 @@
     values (#{id,jdbcType=BIGINT},
             #{supperId,jdbcType=BIGINT},
             #{name,jdbcType=VARCHAR},
-            #{num,jdbcType=TINYINT},
+            #{num,jdbcType=VARCHAR},
             #{level,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
             #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT}
     )
@@ -87,7 +87,7 @@
         #{name,jdbcType=VARCHAR},
       </if>
       <if test="num != null">
-        #{num,jdbcType=TINYINT},
+        #{num,jdbcType=VARCHAR},
       </if>
       <if test="level != null">
         #{level,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
@@ -105,7 +105,7 @@
         `name` = #{name,jdbcType=VARCHAR},
       </if>
       <if test="num != null">
-        num = #{num,jdbcType=TINYINT},
+        num = #{num,jdbcType=VARCHAR},
       </if>
       <if test="supperId != null">
         supperId = #{supperId,jdbcType=BIGINT},
@@ -124,7 +124,7 @@
     update ba_district
     set supperId = #{supperId,jdbcType=BIGINT},
         `name` = #{name,jdbcType=VARCHAR},
-        num = #{num,jdbcType=TINYINT},
+        num = #{num,jdbcType=VARCHAR},
         `level` = #{level,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
         deleted = #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT}
     where id = #{id,jdbcType=BIGINT}
@@ -163,7 +163,7 @@
         INNER JOIN ba_district con ON tow.supperId = con.id
         INNER JOIN ba_district cit ON con.supperId = cit.id
         INNER JOIN ba_district pro ON cit.supperId = pro.id
-    WHERE vil.id = ${villageId}
+    WHERE vil.id = #{villageId}
   </select>
 
     <!--鏍规嵁绾у埆鑾峰彇琛屾斂鍖哄垝鍒楄〃-->
@@ -171,7 +171,7 @@
         SELECT
             CAST(id AS char) AS id,
             name
-        FROM ba_district WHERE `level` = ${level}
+        FROM ba_district WHERE `level` = #{level}
     </select>
 
     <!--鏍规嵁鐖禝D鑾峰彇琛屾斂鍖哄垝鍒楄〃-->
@@ -179,6 +179,6 @@
         SELECT
             CAST(id AS char) AS id,
             name
-        FROM ba_district WHERE supperId = ${supperId}
+        FROM ba_district WHERE supperId = #{supperId}
     </select>
 </mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/resources/application.yml
index 11d75a7..93fe48e 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/resources/application.yml
@@ -13,4 +13,4 @@
         context-path: /statistics #web璁块棶涓婁笅鏂囪矾寰�
         context-parameters:
             #GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99
-            IdSuffix: ${pipIrr.statistics.idSuffix}
+            idSuffix: ${pipIrr.statistics.idSuffix}

--
Gitblit v1.8.0