numbering 수정

src/main/resources/sql/mapper/fims/numbering.xml

@@ -31,6 +31,23 @@ AS NEW_ID
 FROM DUAL
 </sql>
 
+<sql id="keyByYearConvert">
+SELECT CONCAT(<include refid="utility.currentYear" />, LPAD(CAST(
+     CASE
+     WHEN (SELECT MAX(SUBSTRING(${TABLE_KEY}, 4+1)) + 1 FROM ${TABLE_NAME}
+            WHERE CONVERT(${TABLE_KEY} USING utf8) LIKE CONCAT(<include refid="utility.currentYear" />, '%')) IS NULL OR
+          (SELECT MAX(SUBSTRING(${TABLE_KEY}, 4+1)) + 1 FROM ${TABLE_NAME}
+            WHERE CONVERT(${TABLE_KEY} USING utf8) LIKE CONCAT(<include refid="utility.currentYear" />, '%')) = ''
+     THEN 1
+     ELSE (SELECT MAX(SUBSTRING(${TABLE_KEY}, 4+1)) + 1 FROM ${TABLE_NAME}
+            WHERE CONVERT(${TABLE_KEY} USING utf8) 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
@@ -45,6 +62,34 @@ AS NEW_ID
 FROM DUAL
 </sql>
 
+<sql id="keyByYearCollateUtf8mb3">
+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 utf8mb3_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 utf8mb3_general_ci)
+     END
+     AS INT), ${pad}-4, '0'))
+AS NEW_ID
+FROM DUAL
+</sql>
+
+<sql id="keyByYearCollateEuckr">
+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 euckr_korean_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 euckr_korean_ci)
+     END
+     AS INT), ${pad}-4, '0'))
+AS NEW_ID
+FROM DUAL
+</sql>
+
 <sql id="keyBySggAndYear">
 SELECT CONCAT(${sggCd}, <include refid="utility.currentYear" />, LPAD(CAST(
      CASE

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.keyByYearCollateUtf8mb4">
+            <include refid="numbering.keyByYearConvert">
                 <property name="TABLE_NAME" value="${lsctLinkTblNm}" />
                 <property name="TABLE_KEY" value="APRV_ID" />
                 <property name="pad" value="10" />