From 5133584f4cb97222057ae595c4d873bcd7f794fb Mon Sep 17 00:00:00 2001
From: urp <urp@urp-02.mshome.net>
Date: Tue, 2 Dec 2025 09:45:49 +0900
Subject: [PATCH] =?UTF-8?q?=EC=84=9C=EB=B9=84=EC=8A=A4=20=ED=95=AD?=
 =?UTF-8?q?=EB=AA=A9=20=EC=A0=95=EB=A0=AC=EA=B8=B0=EB=8A=A5=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/primarydb/sqlmap/itms/srm/ReportCheckMapper.xml     | 3 ++-
 .../mapper/primarydb/sqlmap/itms/srm/ReportErrorMapper.xml     | 3 ++-
 .../mapper/primarydb/sqlmap/itms/srm/ReportIssueMapper.xml     | 3 ++-
 .../mapper/primarydb/sqlmap/itms/srm/ReportOtherMapper.xml     | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/primarydb/sqlmap/itms/srm/ReportCheckMapper.xml b/src/main/resources/mapper/primarydb/sqlmap/itms/srm/ReportCheckMapper.xml
index 18298f39..bd51c9ce 100644
--- a/src/main/resources/mapper/primarydb/sqlmap/itms/srm/ReportCheckMapper.xml
+++ b/src/main/resources/mapper/primarydb/sqlmap/itms/srm/ReportCheckMapper.xml
@@ -273,6 +273,7 @@
 		 ORDER BY IN_SORT_SN, VC_FORM_NAME 
 	</select>
 	
+	<!-- 2025.11.24 나혁제 정렬순서 추가  -->
 	<select id="getServiceCombo" parameterType="int" resultMap="selectVo">
 		/* ReportCheckDao.getServiceCombo */
 		SELECT A.IN_SERVICE_CODE AS VALUE
@@ -287,7 +288,7 @@
 		</if> 		
 		FROM CM_SERVICE A
 		   , (SELECT @I:=0) AS DM
-		ORDER BY A.IN_SERVICE_CODE
+		ORDER BY IFNULL(IN_SORT_SN, 9999), A.IN_SERVICE_CODE
 	</select>
 	
 	<!-- 2025.02.17 나혁제 value 변수명은 수정해야 한다. -->
diff --git a/src/main/resources/mapper/primarydb/sqlmap/itms/srm/ReportErrorMapper.xml b/src/main/resources/mapper/primarydb/sqlmap/itms/srm/ReportErrorMapper.xml
index 392e4de9..c461ab38 100644
--- a/src/main/resources/mapper/primarydb/sqlmap/itms/srm/ReportErrorMapper.xml
+++ b/src/main/resources/mapper/primarydb/sqlmap/itms/srm/ReportErrorMapper.xml
@@ -245,6 +245,7 @@
 		 ORDER BY IN_SORT_SN, VC_FORM_NAME
 	</select>
 	
+	<!-- 2025.11.24 나혁제 정렬순서 추가  -->
 	<select id="getServiceCombo" parameterType="int" resultMap="selectVo">
 		/* ReportErrorDao.getServiceCombo */
 		SELECT A.IN_SERVICE_CODE AS VALUE
@@ -259,7 +260,7 @@
 		</if> 		
 		FROM CM_SERVICE A
 		   , (SELECT @I:=0) AS DM
-		ORDER BY A.IN_SERVICE_CODE
+		ORDER BY IFNULL(IN_SORT_SN, 9999), A.IN_SERVICE_CODE
 	</select>
 	
 	<!-- 2025.02.17 나혁제 value 변수명은 수정해야 한다. -->
diff --git a/src/main/resources/mapper/primarydb/sqlmap/itms/srm/ReportIssueMapper.xml b/src/main/resources/mapper/primarydb/sqlmap/itms/srm/ReportIssueMapper.xml
index 9963844f..f14e55e8 100644
--- a/src/main/resources/mapper/primarydb/sqlmap/itms/srm/ReportIssueMapper.xml
+++ b/src/main/resources/mapper/primarydb/sqlmap/itms/srm/ReportIssueMapper.xml
@@ -245,6 +245,7 @@
 		 ORDER BY IN_SORT_SN, VC_FORM_NAME
 	</select>
 	
+	<!-- 2025.11.24 나혁제 정렬순서 추가  -->
 	<select id="getServiceCombo" parameterType="int" resultMap="selectVo">
 		/* ReportIssueDao.getServiceCombo */
 		SELECT A.IN_SERVICE_CODE AS VALUE
@@ -259,7 +260,7 @@
 		</if> 		
 		FROM CM_SERVICE A
 		   , (SELECT @I:=0) AS DM
-		ORDER BY A.IN_SERVICE_CODE
+		ORDER BY IFNULL(IN_SORT_SN, 9999), A.IN_SERVICE_CODE
 	</select>
 	
 	<!-- 2025.02.17 나혁제 value 변수명은 수정해야 한다. -->
diff --git a/src/main/resources/mapper/primarydb/sqlmap/itms/srm/ReportOtherMapper.xml b/src/main/resources/mapper/primarydb/sqlmap/itms/srm/ReportOtherMapper.xml
index 605cc31c..e50b26ce 100644
--- a/src/main/resources/mapper/primarydb/sqlmap/itms/srm/ReportOtherMapper.xml
+++ b/src/main/resources/mapper/primarydb/sqlmap/itms/srm/ReportOtherMapper.xml
@@ -234,6 +234,7 @@
 		 ORDER BY IN_SORT_SN, VC_FORM_NAME
 	</select>
 	
+	<!-- 2025.11.24 나혁제 정렬순서 추가  -->
 	<select id="getServiceCombo" parameterType="int" resultMap="selectVo">
 		/* ReportOtherDao.getServiceCombo */
 		SELECT A.IN_SERVICE_CODE AS VALUE
@@ -248,7 +249,7 @@
 		</if> 		
 		FROM CM_SERVICE A
 		   , (SELECT @I:=0) AS DM
-		ORDER BY A.IN_SERVICE_CODE
+		ORDER BY IFNULL(IN_SORT_SN, 9999), A.IN_SERVICE_CODE
 	</select>
 	
 	<!-- 2025.02.17 나혁제 value 변수명은 수정해야 한다. -->