From 3d9bb31413086c845e9680baafad698b89835b70 Mon Sep 17 00:00:00 2001
From: nhj <nhj@DESKTOP-NN0D3BJ.mshome.net>
Date: Thu, 25 Sep 2025 11:37:11 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B3=B4=EA=B3=A0=EC=84=9C=20=EC=96=91?=
 =?UTF-8?q?=EC=8B=9D=20=EC=A0=95=EB=A0=AC=EC=B2=98=EB=A6=AC=20=EB=B3=B4?=
 =?UTF-8?q?=EA=B0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sqlmap/itms/rem/ReportMapper.xml          | 22 +++++++++++++++++--
 .../sqlmap/itms/srm/ReportCheckMapper.xml     |  5 +++++
 .../sqlmap/itms/srm/ReportErrorMapper.xml     |  5 +++++
 .../sqlmap/itms/srm/ReportIssueMapper.xml     |  5 +++++
 4 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/primarydb/sqlmap/itms/rem/ReportMapper.xml b/src/main/resources/mapper/primarydb/sqlmap/itms/rem/ReportMapper.xml
index 83140987..75c5218e 100644
--- a/src/main/resources/mapper/primarydb/sqlmap/itms/rem/ReportMapper.xml
+++ b/src/main/resources/mapper/primarydb/sqlmap/itms/rem/ReportMapper.xml
@@ -10,6 +10,7 @@
 		</if>
 	</sql>
 	
+	<!-- 2025.09.22 나혁제 IN_SORT_SN 정렬순서추가 -->
 	<resultMap type="java.util.LinkedHashMap" id="formVo">
 		<result column="IN_REPORT_FORM" property="inReportForm"/>
 		<result column="VC_FORM_NAME"   property="vcFormName"/>
@@ -19,9 +20,12 @@
 		<result column="TX_REPORT_FORM" property="txReportForm"/>
 		<result column="IN_TASK_USER"   property="inTaskUser"/>
 		<result column="VC_TASK_USER"   property="vcTaskUser"/>
+		<result column="IN_SORT_SN"     property="inSortSn"/>
 	</resultMap>
 	
+	<!-- 2025.09.22 나혁제 IN_SORT_SN 정렬순서추가 -->
 	<select id="getReportForms" parameterType="java.util.LinkedHashMap" resultMap="formVo">
+		/* ReportDao.getReportForms */
 		SELECT A.IN_REPORT_FORM
 		     , A.VC_FORM_DESC
 		     , A.VC_FORM_NAME
@@ -29,6 +33,7 @@
 		     , B.CD_NM AS IN_TASK_NM 
 		     , A.IN_TASK_USER
 		     , A.VC_TASK_USER
+		     , IFNULL(A.IN_SORT_SN, 9999) AS IN_SORT_SN
 		 FROM CM_REPORT_FORM A
 		    , TB_CMM_DTL_CD_INFO B
 		WHERE 1=1 
@@ -36,10 +41,13 @@
 		  AND A.VC_FORM_NAME LIKE CONCAT('%' , #{searchKeyword}, '%')
 		  AND B.CD_ID ='SM_002'
           AND A.IN_TASK = B.CD
-		<include refid="paging"/>
+          ORDER BY IN_SORT_SN, VC_FORM_NAME
+		<include refid="paging"/>          
+          
 	</select>
 	
 	<select id="getReportFormsCnt" parameterType="java.util.LinkedHashMap" resultType="int">
+		/* ReportDao.getReportFormsCnt */
 		SELECT COUNT(1) AS CNT 
 		 FROM CM_REPORT_FORM A
 		    , TB_CMM_DTL_CD_INFO B
@@ -51,7 +59,9 @@
 		
 	</select>
 	
+	<!-- 2025.09.22 나혁제 IN_SORT_SN 정렬순서추가 -->
 	<select id="getReportFormDetail" parameterType="int" resultMap="formVo">
+		/* ReportDao.getReportFormDetail */
 		SELECT IN_REPORT_FORM
 		      , VC_FORM_NAME
 		      , VC_FORM_DESC
@@ -60,6 +70,7 @@
 		      , A.IN_TASK_USER
 		      , A.VC_TASK_USER
 		      , A.TX_REPORT_FORM
+		      , A.IN_SORT_SN
 		  FROM CM_REPORT_FORM A
 		     , TB_CMM_DTL_CD_INFO B
 		 WHERE 1=1
@@ -68,8 +79,9 @@
            AND A.IN_TASK = B.CD
 	</select>
 	
-	
+	<!-- 2025.09.22 나혁제 IN_SORT_SN 정렬순서추가 -->
 	<insert id="addReportForm" parameterType="java.util.LinkedHashMap">
+		/* ReportDao.addReportForm */
 		INSERT INTO CM_REPORT_FORM
 		(
 			IN_TASK
@@ -78,6 +90,7 @@
 		  , TX_REPORT_FORM
 		  , IN_TASK_USER
 		  , VC_TASK_USER
+		  , IN_SORT_SN
 		) 
 		VALUES
 		(
@@ -87,20 +100,25 @@
 		  , "${txReportForm}"
 		  , #{inTaskUser}
 		  , #{vcTaskUser}
+		  , NULLIF(#{inSortSn}, '')
 		 )
 	</insert>
 	
 	<update id="updateReportForm" parameterType="java.util.LinkedHashMap">
+		/* ReportDao.updateReportForm */
 		UPDATE CM_REPORT_FORM 
 		   SET  VC_FORM_NAME   = "${vcFormName}"
 		      , VC_FORM_DESC   = "${vcFormDesc}"
 		      , TX_REPORT_FORM = "${txReportForm}"
 		      , IN_TASK_USER   = #{inTaskUser}
 		      , VC_TASK_USER   = #{vcTaskUser}
+		      , VC_TASK_USER   = #{vcTaskUser}
+		      , IN_SORT_SN     = NULLIF(#{inSortSn}, '')
 		 WHERE IN_REPORT_FORM = #{inReportForm}
 	</update>
 	
 	<delete id="deleteReportForm" parameterType="java.util.LinkedHashMap">
+		/* ReportDao.deleteReportForm */
 		DELETE FROM CM_REPORT_FORM 
 		 WHERE IN_REPORT_FORM=#{inReportForm}
 	</delete>
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 05649854..52e3d10c 100644
--- a/src/main/resources/mapper/primarydb/sqlmap/itms/srm/ReportCheckMapper.xml
+++ b/src/main/resources/mapper/primarydb/sqlmap/itms/srm/ReportCheckMapper.xml
@@ -37,10 +37,12 @@
 		<result property="atchFileId"            column="ATCH_FILE_ID"/>
 	</resultMap>
 	
+	<!-- 2025.09.22 나혁제 IN_SORT_SN 정렬순서추가 -->
 	<resultMap type="java.util.LinkedHashMap" id="formVo">
 		<result column="IN_REPORT_FORM" property="inReportForm"/>
 		<result column="VC_FORM_NAME"   property="vcFormName"/>
 		<result column="VC_FORM_DESC"   property="vcFormDesc"/>
+		<result column="IN_SORT_SN"     property="inSortSn"/>
 	</resultMap>
 	
 	<resultMap type="java.util.LinkedHashMap" id="selectVo">
@@ -256,14 +258,17 @@
 		<include refid="searchFilter"/>
 	</select>
 	
+	<!-- 2025.09.22 나혁제 IN_SORT_SN 정렬순서추가 -->
 	<select id="getReportForms" parameterType="java.util.HashMap" resultMap="formVo">
 		/* ReportCheckDao.getReportForms */
 		SELECT IN_REPORT_FORM
 		     , VC_FORM_DESC
 		     , VC_FORM_NAME
 		     , IN_TASK
+		     , IFNULL(IN_SORT_SN, 9999) AS IN_SORT_SN 
 		  FROM CM_REPORT_FORM
 		 WHERE IN_TASK=${value}
+		 ORDER BY IN_SORT_SN, VC_FORM_NAME 
 	</select>
 	
 	<select id="getServiceCombo" parameterType="int" resultMap="selectVo">
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 fc86c8b8..d1a30ced 100644
--- a/src/main/resources/mapper/primarydb/sqlmap/itms/srm/ReportErrorMapper.xml
+++ b/src/main/resources/mapper/primarydb/sqlmap/itms/srm/ReportErrorMapper.xml
@@ -37,10 +37,12 @@
 		<result property="atchFileId"            column="ATCH_FILE_ID"/>
 	</resultMap>
 	
+	<!-- 2025.09.22 나혁제 IN_SORT_SN 정렬순서추가 -->
 	<resultMap type="java.util.LinkedHashMap" id="formVo">
 		<result column="IN_REPORT_FORM" property="inReportForm"/>
 		<result column="VC_FORM_NAME"   property="vcFormName"/>
 		<result column="VC_FORM_DESC"   property="vcFormDesc"/>
+		<result column="IN_SORT_SN"     property="inSortSn"/>
 	</resultMap>
 	
 	<resultMap type="java.util.LinkedHashMap" id="selectVo">
@@ -228,14 +230,17 @@
 		<include refid="searchFilter"/>
 	</select>
 	
+	<!-- 2025.09.22 나혁제 IN_SORT_SN 정렬순서추가 -->
 	<select id="getReportForms" parameterType="java.util.HashMap" resultMap="formVo">
 		/* ReportErrorDao.getReportForms */
 		SELECT IN_REPORT_FORM
 		     , VC_FORM_DESC
 		     , VC_FORM_NAME
 		     , IN_TASK
+		     , IFNULL(IN_SORT_SN, 9999) AS IN_SORT_SN
 		  FROM CM_REPORT_FORM
 		 WHERE IN_TASK=${value}
+		 ORDER BY IN_SORT_SN, VC_FORM_NAME
 	</select>
 	
 	<select id="getServiceCombo" parameterType="int" resultMap="selectVo">
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 1dc3a3cd..2126d058 100644
--- a/src/main/resources/mapper/primarydb/sqlmap/itms/srm/ReportIssueMapper.xml
+++ b/src/main/resources/mapper/primarydb/sqlmap/itms/srm/ReportIssueMapper.xml
@@ -37,10 +37,12 @@
 		<result property="atchFileId"            column="ATCH_FILE_ID"/>
 	</resultMap>
 	
+	<!-- 2025.09.22 나혁제 IN_SORT_SN 정렬순서추가 -->
 	<resultMap type="java.util.LinkedHashMap" id="formVo">
 		<result column="IN_REPORT_FORM" property="inReportForm"/>
 		<result column="VC_FORM_NAME"   property="vcFormName"/>
 		<result column="VC_FORM_DESC"   property="vcFormDesc"/>
+		<result column="IN_SORT_SN"     property="inSortSn"/>
 	</resultMap>
 	
 	<resultMap type="java.util.LinkedHashMap" id="selectVo">
@@ -228,14 +230,17 @@
 		<include refid="searchFilter"/>
 	</select>
 	
+	<!-- 2025.09.22 나혁제 IN_SORT_SN 정렬순서추가 -->
 	<select id="getReportForms" parameterType="java.util.HashMap" resultMap="formVo">
 		/* ReportIssueDao.getReportForms */
 		SELECT IN_REPORT_FORM
 		     , VC_FORM_DESC
 		     , VC_FORM_NAME
 		     , IN_TASK
+		     , IFNULL(IN_SORT_SN, 9999) AS IN_SORT_SN
 		  FROM CM_REPORT_FORM
 		 WHERE IN_TASK=${value}
+		 ORDER BY IN_SORT_SN, VC_FORM_NAME
 	</select>
 	
 	<select id="getServiceCombo" parameterType="int" resultMap="selectVo">