From 34e9421ba2626631bb5c44d219416789607dd26d Mon Sep 17 00:00:00 2001
From: thkim <thkim@dbnt.co.kr>
Date: Mon, 20 Oct 2025 17:51:24 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=EC=97=91=EC=85=80=EC=97=85=EB=A1=9C?=
 =?UTF-8?q?=EB=93=9C=20=EC=8B=9C=20=EC=8B=9C=EC=B6=94=EA=B3=B5=20=EA=B0=9C?=
 =?UTF-8?q?=EC=9A=94=EC=97=90=EC=84=9C=20=EC=BD=94=EC=96=B4=20=EC=82=AC?=
 =?UTF-8?q?=EC=A7=84=20=EC=84=A4=EB=AA=85=EC=9D=B4=20=EC=97=86=EB=8A=94=20?=
 =?UTF-8?q?=EA=B2=BD=EC=9A=B0=20=EC=BD=94=EC=96=B4=20=EC=82=AC=EC=A7=84=20?=
 =?UTF-8?q?=EC=84=A4=EB=AA=85=EC=9D=84=20=EC=9E=85=EB=A0=A5=ED=95=98?=
 =?UTF-8?q?=EB=9D=BC=EB=8A=94=20=EB=A9=94=EC=8B=9C=EC=A7=80=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

---
 .../service/impl/CompleteServiceImpl.java     |  14 ++
 .../ManageExcelUploadProc03Controller.java    |  12 +-
 .../sqlmap/mapper/regi/complete_SQL.xml       | 172 +++++++++---------
 .../WEB-INF/views/web/manage/complete.jsp     |  59 +++---
 4 files changed, 144 insertions(+), 113 deletions(-)

diff --git a/src/main/java/geoinfo/regi/complete/service/impl/CompleteServiceImpl.java b/src/main/java/geoinfo/regi/complete/service/impl/CompleteServiceImpl.java
index 3fb37183..7b070d2b 100644
--- a/src/main/java/geoinfo/regi/complete/service/impl/CompleteServiceImpl.java
+++ b/src/main/java/geoinfo/regi/complete/service/impl/CompleteServiceImpl.java
@@ -106,6 +106,20 @@ public class CompleteServiceImpl implements CompleteService {
 		params.put("searchCreateName", searchCreateName);
 		/*params.put("LoginUserId", LoginUserId);*/
 		params.put("cls", nCls);
+		
+		// 정렬 파라미터 가공 
+		if (params.get("sort[0][field]") != null) {
+	        String sortField = (String) params.get("sort[0][field]");
+	        String sortDir = (String) params.get("sort[0][dir]");
+
+		    // SQL Injection 방지를 위해 허용된 컬럼명인지 확인하는 로직 추가 필요
+		    // 예: if ("projectName".equals(sortField) || "userName".equals(sortField) ...)
+
+	        // MyBatis에서 사용할 단순한 이름으로 파라미터를 추가합니다.
+	        params.put("sortField", sortField);
+	        params.put("sortDir", sortDir);
+	    }
+
 
 		Long pageSize = MyUtil.getLongFromObject( params.get("pageSize") );
 		if( pageSize == null ) {
diff --git a/src/main/java/geoinfo/regi/manageList/ManageExcelUploadProc03Controller.java b/src/main/java/geoinfo/regi/manageList/ManageExcelUploadProc03Controller.java
index 01723fb8..81bb46a5 100644
--- a/src/main/java/geoinfo/regi/manageList/ManageExcelUploadProc03Controller.java
+++ b/src/main/java/geoinfo/regi/manageList/ManageExcelUploadProc03Controller.java
@@ -7128,7 +7128,17 @@ public class ManageExcelUploadProc03Controller {
 						map.put("CORE_NUM",j+1 );
 						map.put("CORE_LOCAL",extracted[j].getName() );
 						map.put("CORE_PIC", saveName );
-						map.put("CORE_DESC",excel3Wp.get("col1",j+1).trim() );
+						String CoreDesc = null;
+						if( 1 < excel3Wp.getLength() ) {
+							CoreDesc = excel3Wp.get("col1",j+1);
+							CoreDesc = CoreDesc.trim();
+						} else {
+							CoreDesc = "-";
+							params.put("resultMsg", "코어 사진 설명을 입력하세요. 없는 경우 '- 를 입력하세요.");
+							return params;
+						}
+				
+						map.put("CORE_DESC", CoreDesc );
 						map.put("USERID",request.getSession().getAttribute("USERID"));
 						coreList.add(map);
 						//headerService.insertTempHeaderCore(params);
diff --git a/src/main/resources/egovframework/sqlmap/mapper/regi/complete_SQL.xml b/src/main/resources/egovframework/sqlmap/mapper/regi/complete_SQL.xml
index bda07e26..734a97dc 100644
--- a/src/main/resources/egovframework/sqlmap/mapper/regi/complete_SQL.xml
+++ b/src/main/resources/egovframework/sqlmap/mapper/regi/complete_SQL.xml
@@ -14,97 +14,87 @@
 	</select>
 
 	<select id="selectCompleteItems" parameterType="map" resultType="egovMap">
-		SELECT
-			*
-		FROM
-			(
-				SELECT
-					T.CLASS_CODE
-					, T.PROJECT_CODE
-					, T.REPORT_TYPE
-					, T.REPORT_TYPE_NAME
-					, REPLACE(T.PROJECT_NAME,'"','''') AS PROJECT_NAME
-					, T.USERID
-					, T.USER_NAME
-					, T.STATE
-					, T.STATE_NAME
-					, T.CREATE_NAME
-					, T.CREATE_USERID
-					, T.DATETIME
-					, T.MAP
-					, T.INS
-					, T.MODIFYCALL
-					, OB.HIST_SEQ
-		            , TO_CHAR(OB.CREATEDATE,'YYYY-MM-DD HH24:MI:SS') AS CREATEDATE
-		            , TO_CHAR(OB.MODIFY_CALL_DATE,'YYYY-MM-DD HH24:MI:SS') AS MODIFYCALLDATE
-			        , NVL((SELECT DISTINCT(REPORT_FILE) FROM TEMP_EXPERT_OPINION WHERE PROJECT_CODE = T.PROJECT_CODE),'NO') AS EXPERT_FILE
-			        , ROW_NUMBER() OVER(ORDER BY T.DATETIME DESC) AS RNK
-			        
-				FROM
-					(
-						SELECT
-							CLASS_CODE
-							, PROJECT_CODE
-							, REPORT_TYPE
-							, FUNC_COMM_NAME('CM016',REPORT_TYPE ) REPORT_TYPE_NAME
-							, PROJECT_NAME
-							, USERID
-							, (SELECT USER_NAME FROM WEB_MEMBER_IN WHERE USERID = INFO.USERID) AS USER_NAME
-							, STATE
-							, FUNC_COMM_NAME('CM001',STATE ) STATE_NAME
-							, (
-								SELECT
-									(SELECT USER_NAME FROM WEB_MEMBER_IN WHERE USERID = M.USERID)
-								FROM
-									TEMP_MANAGE_STATE M
-								WHERE
-									M.PROJECT_CODE = INFO.PROJECT_CODE
-							) AS CREATE_NAME
-							, (SELECT M.USERID FROM TEMP_MANAGE_STATE M WHERE M.PROJECT_CODE = INFO.PROJECT_CODE) AS CREATE_USERID
-							, TO_CHAR(DATETIME,'YYYY-MM-DD HH24:MI:SS') AS DATETIME
-							, DECODE(REPORT_TYPE,'CH','map','') AS MAP
-							, PROJECT_MASTER_COMPANY_O_CODE
-							, DECODE(STATE,'6','insert') AS INS
-							, DECODE(STATE,'6','modifycall') AS MODIFYCALL
-						FROM
-							TEMP_PROJECT_INFO INFO
-						<![CDATA[
-						WHERE NVL(USE_YN,' ') <> 'N' AND STATE = '6'
-						]]>
-					) T
-					, TEMP_MANAGE_STATE OB
-				WHERE
-					T.PROJECT_CODE = OB.PROJECT_CODE(+)
-		
-				<if test="srchReportType != null and srchReportType != '' and srchReportType != 'null'">
-					AND T.REPORT_TYPE = #{srchReportType}
-				</if>
-				<if test="searchProjectName != null and searchProjectName != '' and searchProjectName != 'null'">
-					AND T.PROJECT_NAME LIKE '%${searchProjectName}%'
-				</if>
-				<if test="searchProjectCode != null and searchProjectCode != '' and searchProjectCode != 'null'">
-					AND T.PROJECT_CODE LIKE '%${searchProjectCode}%'
-				</if>
-				<if test="searchUserName != null and searchUserName != '' and searchUserName != 'null'">
-					AND T.USER_NAME   = #{searchUserName}
-				</if>
-				<if test="searchCreateName != null and searchCreateName != '' and searchCreateName != 'null'">
-					AND T.CREATE_NAME = #{searchCreateName}
-				</if>
-				<if test="searchHistSeq != null and searchHistSeq != '' and searchHistSeq != 'null'">
-					AND OB.HIST_SEQ = #{searchHistSeq}
-				</if>
-				<if test="LoginUserId != 'admin_user' and LoginUserId != null and LoginUserId != '' and cls != 65535 ">
-					AND T.PROJECT_MASTER_COMPANY_O_CODE = (SELECT MASTER_COMPANY_CODE FROM WEB_MEMBER_IN WHERE USERID = #{LoginUserId})
-				</if>
-				ORDER BY
-					T.DATETIME DESC
-			) A
-  		WHERE
-		<![CDATA[
-			A.RNK BETWEEN #{firstIndex} + 1
-			AND #{firstIndex} + #{recordCountPerPage} 
-        ]]>
+	    SELECT
+	        *
+	    FROM
+	        (
+	            SELECT
+	                T.CLASS_CODE,
+	                T.PROJECT_CODE,
+	                T.REPORT_TYPE,
+	                T.REPORT_TYPE_NAME,
+	                REPLACE(T.PROJECT_NAME, '"', '''') AS "projectName",
+	                T.USERID,
+	                T.USER_NAME AS "userName",
+	                T.STATE,
+	                T.STATE_NAME AS "stateName",
+	                T.CREATE_NAME AS "createName",
+	                T.CREATE_USERID AS "createUserid",
+	                T.DATETIME AS "datetime",
+	                T.MAP AS "map",
+	                T.INS AS "ins",
+	                T.MODIFYCALL AS "modifycall",
+	                OB.HIST_SEQ AS "histSeq",
+	                TO_CHAR(OB.CREATEDATE, 'YYYY-MM-DD HH24:MI:SS') AS "createdate",
+	                TO_CHAR(OB.MODIFY_CALL_DATE, 'YYYY-MM-DD HH24:MI:SS') AS "modifycalldate",
+	                NVL((SELECT DISTINCT (REPORT_FILE) FROM TEMP_EXPERT_OPINION WHERE PROJECT_CODE = T.PROJECT_CODE), 'NO') AS "expertFile",
+	                ROW_NUMBER() OVER(
+	                    ORDER BY
+	                    <choose>
+	                        <when test="sortField == 'projectName'"> T.PROJECT_NAME ${sortDir} </when>
+	                        <when test="sortField == 'userName'"> T.USER_NAME ${sortDir} </when>
+	
+	                        <when test="sortField == 'datetime'">
+	                            T.DATETIME ${sortDir} <if test='sortDir == "desc"'> NULLS LAST </if>
+	                        </when>
+	                        <when test="sortField == 'createdate'">
+	                            OB.CREATEDATE ${sortDir} <if test='sortDir == "desc"'> NULLS LAST </if>
+	                        </when>
+	                        <when test="sortField == 'modifycalldate'">
+	                            OB.MODIFY_CALL_DATE ${sortDir} <if test='sortDir == "desc"'> NULLS LAST </if>
+	                        </when>
+	                        <when test="sortField == 'stateName'"> T.STATE_NAME ${sortDir} </when>
+	                        <when test="sortField == 'createName'"> T.CREATE_NAME ${sortDir} </when>
+	                        <when test="sortField == 'histSeq'">
+	                            OB.HIST_SEQ ${sortDir} <if test='sortDir == "desc"'> NULLS LAST </if>
+	                        </when>
+	
+	                        <otherwise> T.DATETIME DESC NULLS LAST </otherwise>
+	                        </choose>
+	                ) AS RNK
+	            FROM
+	            (
+	                SELECT
+	                    CLASS_CODE,
+	                    PROJECT_CODE,
+	                    REPORT_TYPE,
+	                    FUNC_COMM_NAME('CM016', REPORT_TYPE) REPORT_TYPE_NAME,
+	                    PROJECT_NAME,
+	                    USERID,
+	                    (SELECT USER_NAME FROM WEB_MEMBER_IN WHERE USERID = INFO.USERID) AS USER_NAME,
+	                    STATE,
+	                    FUNC_COMM_NAME('CM001', STATE) STATE_NAME,
+	                    (SELECT (SELECT USER_NAME FROM WEB_MEMBER_IN WHERE USERID = M.USERID)
+	                     FROM TEMP_MANAGE_STATE M
+	                     WHERE M.PROJECT_CODE = INFO.PROJECT_CODE) AS CREATE_NAME,
+	                    (SELECT M.USERID FROM TEMP_MANAGE_STATE M WHERE M.PROJECT_CODE = INFO.PROJECT_CODE) AS CREATE_USERID,
+	                    TO_CHAR(DATETIME, 'YYYY-MM-DD HH24:MI:SS') AS DATETIME,
+	                    DECODE(REPORT_TYPE, 'CH', 'map', '') AS MAP,
+	                    PROJECT_MASTER_COMPANY_O_CODE,
+	                    DECODE(STATE, '6', 'insert') AS INS,
+	                    DECODE(STATE, '6', 'modifycall') AS MODIFYCALL
+	                FROM TEMP_PROJECT_INFO INFO
+	                WHERE NVL(USE_YN, ' ') != 'N' AND STATE = '6'
+	            ) T,
+	                 TEMP_MANAGE_STATE OB
+	            WHERE T.PROJECT_CODE = OB.PROJECT_CODE(+)
+	
+	            <if test="searchProjectName != null and searchProjectName != '' and searchProjectName != 'null'">
+	                AND T.PROJECT_NAME LIKE '%${searchProjectName}%'
+	            </if>
+	            ) A
+	    WHERE
+	        A.RNK BETWEEN #{firstIndex} + 1 AND #{firstIndex} + #{recordCountPerPage}
 	</select>
 	
 	<select id="selectCompleteItemsCnt" parameterType="hashmap" resultType="long">
diff --git a/src/main/webapp/WEB-INF/views/web/manage/complete.jsp b/src/main/webapp/WEB-INF/views/web/manage/complete.jsp
index e9528934..e1d854cf 100644
--- a/src/main/webapp/WEB-INF/views/web/manage/complete.jsp
+++ b/src/main/webapp/WEB-INF/views/web/manage/complete.jsp
@@ -18,7 +18,11 @@ function fn_Search() {
 	if (!fn_fromToCheckAlert($("#startDate").val(), $("#endDate").val(), "기간시작일", "기간종료일", "startDate"))
 		return false;
 
-	document.frmSearch.submit();
+    var grid = kendoJQuery("#grid_type_1").data("kendoGrid");
+    if (grid) {
+        // 검색 시 항상 첫 페이지로 이동
+        grid.dataSource.page(1); 
+    }
 }
 
 //load
@@ -224,25 +228,37 @@ function kendoGrid() {
 	    		if( searchCreateNameEle ) {
 	    		    searchCreateName = searchCreateNameEle.value;
 	    		}
-	    		
-	            $.ajax({
-	              url: "/manage/complete/list.do?pageIndex=" + currentPage
-	            		  + "&" + "searchProjectName=" + searchProjectName
-	            		  + "&" + "searchProjectCode=" + searchProjectCode
-	            		  + "&" + "searchHistSeq=" + searchHistSeq
-	            		  + "&" + "searchUserName=" + searchUserName
-	            		  + "&" + "searchCreateName=" + searchCreateName
-	            		  ,
-	              contentType: 'application/json',
-	              dataType: "json",
-	              type: 'GET',
-	              success: function(result) {
-	                  options.success(result);
-	              },
-	              error: function(result) {
-	                options.error(result);
-	              }
-	            });
+	    		// 정렬 파라미터를 담을 변수 추가
+                var sortParams = "";
+                if (options.data.sort && options.data.sort.length > 0) {
+                    for (var i = 0; i < options.data.sort.length; i++) {
+                        sortParams += "&sort[" + i + "][field]=" + options.data.sort[i].field;
+                        sortParams += "&sort[" + i + "][dir]=" + options.data.sort[i].dir;
+                    }
+                }
+                
+                $.ajax({
+   	              url: "/manage/complete/list.do", // URL은 순수 경로만 지정
+                     data: { // 파라미터는 data 객체로 전달
+                           pageIndex: currentPage,
+                           searchProjectName: searchProjectName,
+                           searchProjectCode: searchProjectCode,
+                           searchHistSeq: searchHistSeq,
+                           searchUserName: searchUserName,
+                           searchCreateName: searchCreateName,
+                           // Kendo UI가 전달하는 정렬, 페이징 정보 등을 options.data에서 가져와 추가
+                           sort: options.data.sort 
+                     },
+   	              contentType: 'application/json',
+   	              dataType: "json",
+   	              type: 'GET',
+   	              success: function(result) {
+   	                  options.success(result);
+   	              },
+   	              error: function(result) {
+   	                options.error(result);
+   	              }
+   	            });
 	        },
 	    },
 	    schema: {
@@ -254,7 +270,8 @@ function kendoGrid() {
    	        }
    	    },
 	    pageSize: 10,
-	    serverPaging: true
+	    serverPaging: true,
+        serverSorting: true
 	});
 	
 	kendoJQuery("#grid_type_1").kendoGrid({