From 77c071f8185f363897af7fc5325a1e7dfad96f11 Mon Sep 17 00:00:00 2001
From: leebj <leebj91@xit.co.kr>
Date: Wed, 24 Sep 2025 13:05:39 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9E=84=EB=8C=80=EC=B0=A8=EA=B3=84=EC=95=BD?=
 =?UTF-8?q?=20=EC=8A=B9=EC=9D=B8=20=ED=85=8C=EC=9D=B4=EB=B8=94=20insert=20?=
 =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/sql/mapper/fims/numbering.xml   | 56 ++++++++++++-------
 .../sql/mapper/fims/rent/lsctAprv-mapper.xml  |  2 +-
 2 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/src/main/resources/sql/mapper/fims/numbering.xml b/src/main/resources/sql/mapper/fims/numbering.xml
index ee494cd1..091a5d86 100644
--- a/src/main/resources/sql/mapper/fims/numbering.xml
+++ b/src/main/resources/sql/mapper/fims/numbering.xml
@@ -4,11 +4,11 @@
 
 <sql id="key">
 SELECT LPAD(CAST(
-     CASE 
-     WHEN (SELECT MAX(${TABLE_KEY}) + 1 FROM ${TABLE_NAME}) IS NULL OR 
-          (SELECT MAX(${TABLE_KEY}) + 1 FROM ${TABLE_NAME}) = '' 
-     THEN 1 
-     ELSE (SELECT MAX(${TABLE_KEY}) + 1 FROM ${TABLE_NAME}) 
+     CASE
+     WHEN (SELECT MAX(${TABLE_KEY}) + 1 FROM ${TABLE_NAME}) IS NULL OR
+          (SELECT MAX(${TABLE_KEY}) + 1 FROM ${TABLE_NAME}) = ''
+     THEN 1
+     ELSE (SELECT MAX(${TABLE_KEY}) + 1 FROM ${TABLE_NAME})
      END
      AS INT), ${pad}, '0')
 AS NEW_ID
@@ -17,14 +17,28 @@ FROM DUAL
 
 <sql id="keyByYear">
 SELECT CONCAT(<include refid="utility.currentYear" />, LPAD(CAST(
-     CASE 
-     WHEN (SELECT MAX(SUBSTRING(${TABLE_KEY}, 4+1)) + 1 FROM ${TABLE_NAME} 
-            WHERE ${TABLE_KEY} LIKE CONCAT(<include refid="utility.currentYear" />, '%')) IS NULL OR 
-          (SELECT MAX(SUBSTRING(${TABLE_KEY}, 4+1)) + 1 FROM ${TABLE_NAME} 
-            WHERE ${TABLE_KEY} LIKE CONCAT(<include refid="utility.currentYear" />, '%')) = '' 
-     THEN 1 
-     ELSE (SELECT MAX(SUBSTRING(${TABLE_KEY}, 4+1)) + 1 FROM ${TABLE_NAME} 
-            WHERE ${TABLE_KEY} LIKE CONCAT(<include refid="utility.currentYear" />, '%')) 
+     CASE
+     WHEN (SELECT MAX(SUBSTRING(${TABLE_KEY}, 4+1)) + 1 FROM ${TABLE_NAME}
+            WHERE ${TABLE_KEY} LIKE CONCAT(<include refid="utility.currentYear" />, '%')) IS NULL OR
+          (SELECT MAX(SUBSTRING(${TABLE_KEY}, 4+1)) + 1 FROM ${TABLE_NAME}
+            WHERE ${TABLE_KEY} LIKE CONCAT(<include refid="utility.currentYear" />, '%')) = ''
+     THEN 1
+     ELSE (SELECT MAX(SUBSTRING(${TABLE_KEY}, 4+1)) + 1 FROM ${TABLE_NAME}
+            WHERE ${TABLE_KEY} LIKE CONCAT(<include refid="utility.currentYear" />, '%'))
+     END
+     AS INT), ${pad}-4, '0'))
+AS NEW_ID
+FROM DUAL
+</sql>
+
+<sql id="keyByYearCollateUtf8mb4">
+SELECT CONCAT(<include refid="utility.currentYear" />, LPAD(CAST(
+     CASE
+     WHEN (SELECT MAX(SUBSTRING(${TABLE_KEY}, 4+1)) + 1 FROM ${TABLE_NAME}
+            WHERE ${TABLE_KEY} LIKE CONCAT(<include refid="utility.currentYear" />, '%') COLLATE utf8mb4_general_ci) IS NULL
+     THEN 1
+     ELSE (SELECT MAX(SUBSTRING(${TABLE_KEY}, 4+1)) + 1 FROM ${TABLE_NAME}
+            WHERE ${TABLE_KEY} LIKE CONCAT(<include refid="utility.currentYear" />, '%') COLLATE utf8mb4_general_ci)
      END
      AS INT), ${pad}-4, '0'))
 AS NEW_ID
@@ -33,14 +47,14 @@ FROM DUAL
 
 <sql id="keyBySggAndYear">
 SELECT CONCAT(${sggCd}, <include refid="utility.currentYear" />, LPAD(CAST(
-     CASE 
-     WHEN (SELECT MAX(SUBSTRING(${TABLE_KEY}, 9+1)) + 1 FROM ${TABLE_NAME} 
-            WHERE ${TABLE_KEY} LIKE CONCAT(${sggCd}, <include refid="utility.currentYear" />, '%')) IS NULL OR 
-          (SELECT MAX(SUBSTRING(${TABLE_KEY}, 9+1)) + 1 FROM ${TABLE_NAME} 
-            WHERE ${TABLE_KEY} LIKE CONCAT(${sggCd}, <include refid="utility.currentYear" />, '%')) = '' 
-     THEN 1 
-     ELSE (SELECT MAX(SUBSTRING(${TABLE_KEY}, 9+1)) + 1 FROM ${TABLE_NAME} 
-            WHERE ${TABLE_KEY} LIKE CONCAT(${sggCd}, <include refid="utility.currentYear" />, '%')) 
+     CASE
+     WHEN (SELECT MAX(SUBSTRING(${TABLE_KEY}, 9+1)) + 1 FROM ${TABLE_NAME}
+            WHERE ${TABLE_KEY} LIKE CONCAT(${sggCd}, <include refid="utility.currentYear" />, '%')) IS NULL OR
+          (SELECT MAX(SUBSTRING(${TABLE_KEY}, 9+1)) + 1 FROM ${TABLE_NAME}
+            WHERE ${TABLE_KEY} LIKE CONCAT(${sggCd}, <include refid="utility.currentYear" />, '%')) = ''
+     THEN 1
+     ELSE (SELECT MAX(SUBSTRING(${TABLE_KEY}, 9+1)) + 1 FROM ${TABLE_NAME}
+            WHERE ${TABLE_KEY} LIKE CONCAT(${sggCd}, <include refid="utility.currentYear" />, '%'))
      END
      AS INT), ${pad}-9, '0'))
 AS NEW_ID
diff --git a/src/main/resources/sql/mapper/fims/rent/lsctAprv-mapper.xml b/src/main/resources/sql/mapper/fims/rent/lsctAprv-mapper.xml
index fcc343d4..5a963001 100644
--- a/src/main/resources/sql/mapper/fims/rent/lsctAprv-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/rent/lsctAprv-mapper.xml
@@ -202,7 +202,7 @@
 
     <insert id="insertLsctAprv" parameterType="cokr.xit.fims.rent.LsctAprv">/* 임대차계약 승인 대장 등록(lsctAprvMapper.insertLsctAprv) */
         <selectKey resultType="string" keyProperty="aprvId" keyColumn="NEW_ID" order="BEFORE">
-            <include refid="numbering.keyByYear">
+            <include refid="numbering.keyByYearCollateUtf8mb4">
                 <property name="TABLE_NAME" value="${lsctLinkTblNm}" />
                 <property name="TABLE_KEY" value="APRV_ID" />
                 <property name="pad" value="10" />