src/main/java/geoinfo/regi/complete/service/impl/CompleteServiceImpl.java

@@ -120,16 +120,15 @@ public class CompleteServiceImpl implements CompleteService {
 	        params.put("sortDir", sortDir);
 	    }
 
-		int total = MyUtil.getIntegerFromObject(selectCompleteItemsCnt(params)).intValue();
+
 		Long pageSize = MyUtil.getLongFromObject( params.get("pageSize") );
 		if( pageSize == null ) {
-//			pageSize = 10l;
+			pageSize = 10l;
-			pageSize = (long) total;	// 25.11.05(YJI) Kendo grid pager 'All' 처리
 		}
 		
 		PaginationInfo paginationInfo = new PaginationInfo();
 		
-		paginationInfo.setRecordCountPerPage(pageSize.intValue());
+		paginationInfo.setRecordCountPerPage(10);
 		paginationInfo.setPageSize(pageSize.intValue());
 		paginationInfo.setTotalRecordCount( MyUtil.getIntegerFromObject(selectCompleteItemsCnt(params)).intValue() );
 

src/main/java/geoinfo/regi/holeCoordinate/HoleCoordinateController.java

@@ -101,15 +101,13 @@ public class HoleCoordinateController {
 	@RequestMapping("/getHoleCoordList.do")
 	@ResponseBody
 	public Map<String, Object> getHoleCoordList(HttpServletRequest request, HttpServletResponse response, @RequestParam HashMap<String, Object> params) throws Exception {
-		int nCls = MyUtil.getIntegerFromObject(request.getSession().getAttribute("CLS"));
+
-		strUtil sUtil = new strUtil();
+		int page = params.get("page").toString() != null ? Integer.parseInt(params.get("page").toString()) : 1;
-		WebUtil wUtil = new WebUtil();
+		int pageSize = params.get("pageSize") != null ? Integer.parseInt((String)params.get("pageSize")) : 10; // 기본값 10
-		wUtil.topTabId = "manageCoordinate"; // 검수일때 tab 활성화 시켜주기 위해
-		String loginUserId = String.valueOf(request.getSession().getAttribute("USERID"));
 
 	    // 정렬 필드/방향 처리
-	    String sortField = sUtil.checkNull(parseData.parseData((String)params.get("sortField")));
+	    String sortField = (String) params.get("sort[0][field]");
-	    String sortDir = sUtil.checkNull(parseData.parseData((String)params.get("sortDir")));
+	    String sortDir = (String) params.get("sort[0][dir]");
 
 	    // 기본 정렬 지정 (없을 경우)
 	    if (sortField == null || sortField.isEmpty()) sortField = "datetime";
@@ -119,6 +117,11 @@ public class HoleCoordinateController {
 	    params.put("sortField", sortField);
 	    params.put("sortDir", sortDir);
 		
+		int nCls = MyUtil.getIntegerFromObject(request.getSession().getAttribute("CLS"));
+		strUtil sUtil = new strUtil();
+		WebUtil wUtil = new WebUtil();
+		wUtil.topTabId = "manageCoordinate"; // 검수일때 tab 활성화 시켜주기 위해
+		String loginUserId = String.valueOf(request.getSession().getAttribute("USERID"));
 		// request
 		String srchStartDate = sUtil.checkNull(parseData.parseData((String)params.get("startDate")));
 		String srchEndDate = sUtil.checkNull(parseData.parseData((String)params.get("endDate")));
@@ -127,14 +130,15 @@ public class HoleCoordinateController {
 		String searchCreateName = sUtil.checkNull(parseData.parseData((String)params.get("searchCreateName")));
 		params.put("loginUserId", loginUserId);
 		params.put("cls", nCls);
-		
-	    int total = masterService.getDataListCount(params);
-		int page = params.get("page").toString() != null ? Integer.parseInt(params.get("page").toString()) : 1;
-		int pageSize = params.get("pageSize") != null ? Integer.parseInt((String)params.get("pageSize")) : total; // 기본값 10
 		params.put("startRow", ((page - 1) * pageSize) + 1);
-		params.put("endRow", (((page - 1) * pageSize) + 1) + pageSize - 1);	// startRow + pageSize - 1
+		if (page > 1) {
+			params.put("endRow", (((page - 1) * pageSize) + 1) + pageSize - 1);	// startRow + pageSize - 1
+		} else {
+			params.put("endRow", 10);
+		}
 
 	    List<?> items = masterService.getDataListPaging(params);
+	    int total = masterService.getDataListCount(params);
 
 	    Map<String, Object> result = new HashMap<>();
 	    result.put("items", items);

src/main/java/geoinfo/regi/listReg/ListRegController.java

@@ -71,9 +71,12 @@ public class ListRegController {
 		//request
 		System.out.println("searchProjectName:"+request.getParameter("searchProjectName")); 
 
+		int page = params.get("page").toString() != null ? Integer.parseInt(params.get("page").toString()) : 1;
+		int pageSize = params.get("pageSize") != null ? Integer.parseInt((String)params.get("pageSize")) : 10; // 기본값 10
+
 	    // 정렬 필드/방향 처리
-	    String sortField = sUtil.checkNull(parseData.parseData((String)params.get("sortField")));
+	    String sortField = (String) params.get("sort[0][field]");
-	    String sortDir = sUtil.checkNull(parseData.parseData((String)params.get("sortDir")));
+	    String sortDir = (String) params.get("sort[0][dir]");
 
 	    // 기본 정렬 지정 (없을 경우)
 	    if (sortField == null || sortField.isEmpty()) sortField = "datetime";
@@ -82,15 +85,16 @@ public class ListRegController {
 	    // MyBatis에 넣을 때는 깔끔하게 키 이름 정리
 	    params.put("sortField", sortField);
 	    params.put("sortDir", sortDir);
-	    
-	    int total = masterService.getRegListCount(params);
-		int page = params.get("page").toString() != null ? Integer.parseInt(params.get("page").toString()) : 1;
-		int pageSize = params.get("pageSize") != null ? Integer.parseInt((String)params.get("pageSize")) : total; // 기본값 10
 		params.put("startRow", ((page - 1) * pageSize) + 1);
-		params.put("endRow", (((page - 1) * pageSize) + 1) + pageSize - 1);	// startRow + pageSize - 1
+		if (page > 1) {
+			params.put("endRow", (((page - 1) * pageSize) + 1) + pageSize - 1);	// startRow + pageSize - 1
+		} else {
+			params.put("endRow", 10);
+		}
 		
 		//data정보
 		ArrayList result = masterService.getRegList(params);
+	    int total = masterService.getRegListCount(params);
 
 		HashMap resultMap = new HashMap();
 		resultMap.put("dataList1", result);

src/main/java/geoinfo/regi/manageList/ManageListController.java

@@ -113,12 +113,12 @@ public class ManageListController {
 	@ResponseBody
 	public Map<String, Object> getManageList(HttpServletRequest request, HttpServletResponse response, @RequestParam HashMap<String, Object> params) throws Exception {
 
-		int nCls = MyUtil.getIntegerFromObject(request.getSession().getAttribute("CLS"));
+		int page = params.get("page").toString() != null ? Integer.parseInt(params.get("page").toString()) : 1;
-		strUtil sUtil = new strUtil();
+		int pageSize = params.get("pageSize") != null ? Integer.parseInt((String)params.get("pageSize")) : 10; // 기본값 10
-		WebUtil wUtil = new WebUtil();
+
 	    // 정렬 필드/방향 처리
-	    String sortField = sUtil.checkNull(parseData.parseData((String)params.get("sortField")));
+	    String sortField = (String) params.get("sort[0][field]");
-	    String sortDir = sUtil.checkNull(parseData.parseData((String)params.get("sortDir")));
+	    String sortDir = (String) params.get("sort[0][dir]");
 
 	    // 기본 정렬 지정 (없을 경우)
 	    if (sortField == null || sortField.isEmpty()) sortField = "datetime";
@@ -128,6 +128,9 @@ public class ManageListController {
 	    params.put("sortField", sortField);
 	    params.put("sortDir", sortDir);
 		
+		int nCls = MyUtil.getIntegerFromObject(request.getSession().getAttribute("CLS"));
+		strUtil sUtil = new strUtil();
+		WebUtil wUtil = new WebUtil();
 		wUtil.topTabId = "manageCoordinate"; // 검수일때 tab 활성화 시켜주기 위해
 		String loginUserId = String.valueOf(request.getSession().getAttribute("USERID"));
 		// requestString srchReportType = sUtil.checkNull(parseData.parseData((String)params.get("searchReportType")));
@@ -139,14 +142,15 @@ public class ManageListController {
 
 		params.put("loginUserId", loginUserId);
 		params.put("cls", nCls);
-		
-	    int total = masterService.getDataListCount(params);
-		int page = params.get("page").toString() != null ? Integer.parseInt(params.get("page").toString()) : 1;
-		int pageSize = params.get("pageSize") != null ? Integer.parseInt((String)params.get("pageSize")) : total; // 기본값 10
 		params.put("startRow", ((page - 1) * pageSize) + 1);
-		params.put("endRow", (((page - 1) * pageSize) + 1) + pageSize - 1);	// startRow + pageSize - 1
+		if (page > 1) {
+			params.put("endRow", (((page - 1) * pageSize) + 1) + pageSize - 1);	// startRow + pageSize - 1
+		} else {
+			params.put("endRow", 10);
+		}
 
 	    List<?> items = masterService.getDataListPaging(params);
+	    int total = masterService.getDataListCount(params);
 
 	    Map<String, Object> result = new HashMap<>();
 	    result.put("items", items);

src/main/resources/egovframework/sqlmap/mapper/regi/manageList.xml

@@ -190,11 +190,11 @@
 			<choose>
 				<!-- 프로젝트명 정렬 -->
 				<when test="sortField == 'projectName' and sortDir == 'asc'">
-				T.PROJECT_NAME ASC, DATETIME ASC, OB.MODIFY_CALL_DATE ASC
+				T.PROJECT_NAME ASC
 				</when>
 				<!-- 프로젝트명 역순 정렬 -->
 				<when test="sortField == 'projectName' and sortDir == 'desc'">
-				T.PROJECT_NAME DESC, DATETIME ASC, OB.MODIFY_CALL_DATE ASC
+				T.PROJECT_NAME DESC
 				</when>
 				
 				<!-- 공급자 정렬 -->
@@ -208,11 +208,11 @@
 				
 				<!-- 입력일시 정렬 -->
 				<when test="sortField == 'datetime' and sortDir == 'asc'">
-				T.DATETIME ASC, OB.MODIFY_CALL_DATE ASC 
+				T.DATETIME ASC
 				</when>
 				<!-- 입력일시 역순 정렬 -->
 				<when test="sortField == 'datetime' and sortDir == 'desc'">
-				T.DATETIME DESC, OB.MODIFY_CALL_DATE ASC
+				T.DATETIME DESC
 				</when>
 				
 				<!-- 공급일시 정렬 -->

src/main/webapp/WEB-INF/views/web/manage/complete.jsp

@@ -247,9 +247,7 @@ function kendoGrid() {
                            searchUserName: searchUserName,
                            searchCreateName: searchCreateName,
                            // Kendo UI가 전달하는 정렬, 페이징 정보 등을 options.data에서 가져와 추가
-                           sort: options.data.sort ,
+                           sort: options.data.sort 
-		                   page: options.data.page,          // ✅ Kendo가 현재 페이지 전달
-		                   pageSize: options.data.pageSize,   // ✅ Kendo가 현재 페이지 크기 전달
                      },
    	              contentType: 'application/json',
    	              dataType: "json",
@@ -279,15 +277,7 @@ function kendoGrid() {
 	kendoJQuery("#grid_type_1").kendoGrid({
 		dataSource: dataSource,
 		columns: [
-//			{ field: "rowNumber", width: 50, title: "순번", template: "<span class='row-number'></span>" },
+			{ field: "rowNumber", width: 50, title: "순번", template: "<span class='row-number'></span>" },
-			{ 
-				field: "rnk", 
-				width: 50, 
-				title: "순번",
-				template: function(data) {
-					return data.rnk ? parseInt(data.rnk) : "";
-				}
-			},
 			{
 				field: "projectName",
 				width: "auto",

src/main/webapp/WEB-INF/views/web/manage/hole_coord.jsp

@@ -161,34 +161,15 @@ function reloadGrid() {
 	            url: "/getHoleCoordList.do",
 	            dataType: "json",
 	            type: "POST",
-// 	            data: function() {
+	            data: function() {
-//                     var ds = this; // DataSource
-//                     return {
-//                         startDate: $("#startDate").val(),
-//                         endDate: $("#endDate").val(),
-//                         searchProjectName: $("#searchProjectName").val(),
-//                         searchUserName: $("#searchUserName").val(),
-//                         searchCreateName: $("#searchCreateName").val(),
-//                     };
-// 	            }
-	        },
-	        parameterMap: function(options, operation) {
-	            if (operation === "read") {
-                    // 정렬 정보 처리 추가
-                    var sortField = options.sort && options.sort[0] ? options.sort[0].field : null;
-                    var sortDir = options.sort && options.sort[0] ? options.sort[0].dir : null;
-
 	                return {
+	                    startDate: $("#startDate").val(),
+	                    endDate: $("#endDate").val(),
 	                    searchProjectName: $("#searchProjectName").val(),
-	                    searchProjectCode: $("#searchProjectCode").val(),
 	                    searchUserName: $("#searchUserName").val(),
-	                    searchHistSeq: $("#searchHistSeq").val(),
 	                    searchCreateName: $("#searchCreateName").val(),
-	                    searchState: $("#searchState").val(),
+	                    page: 1,
-	                    page: options.page,          // ✅ Kendo가 현재 페이지 전달
+	                    pageSize: 10
-	                    pageSize: options.pageSize,   // ✅ Kendo가 현재 페이지 크기 전달
-                        sortField: sortField,        // 정렬 필드
-                        sortDir: sortDir             // 정렬 방향	                    
 	                };
 	            }
 	        }
@@ -212,15 +193,8 @@ function reloadGrid() {
 	        pageSize: 10
 	    },
 	    columns: [
-// 			{ field: "rowNumber", width: 50, title: "순번", template: "<span class='row-number'></span>", sortable: false },
+	
-			{ 
+			{ field: "rowNumber", width: 50, title: "순번", template: "<span class='row-number'></span>", sortable: false },
-				field: "rn", 
-				width: 50, 
-				title: "순번",
-				template: function(data) {
-					return data.rn ? parseInt(data.rn) : "0";
-				}
-			},
 			{
 				field: "projectName",
 				width: 262,

src/main/webapp/WEB-INF/views/web/manage/list.jsp

@@ -363,25 +363,7 @@ function reloadGrid() {
 	            url: "/getManageList.do",
 	            dataType: "json",
 	            type: "POST",
-// 	            data: function() {
+	            data: function() {
-//                     var ds = this; // DataSource
-//                     return {
-// 	                    searchProjectName: $("#searchProjectName").val(),
-// 	                    searchProjectCode: $("#searchProjectCode").val(),
-// 	                    searchUserName: $("#searchUserName").val(),
-// 	                    searchHistSeq: $("#searchHistSeq").val(),
-// 	                    searchCreateName: $("#searchCreateName").val(),
-// 	                    searchState: $("#searchState").val(),
-//                         page: ds.page(),              // ✅ 현재 페이지
-//                         pageSize: ds.pageSize()       // ✅ 현재 페이지당 개수
-//                     };
-// 	            }
-	        },
-	        parameterMap: function(options, operation) {
-                var sortField = options.sort && options.sort[0] ? options.sort[0].field : null;
-                var sortDir = options.sort && options.sort[0] ? options.sort[0].dir : null;
-
-	            if (operation === "read") {
 	                return {
 	                    searchProjectName: $("#searchProjectName").val(),
 	                    searchProjectCode: $("#searchProjectCode").val(),
@@ -389,45 +371,15 @@ function reloadGrid() {
 	                    searchHistSeq: $("#searchHistSeq").val(),
 	                    searchCreateName: $("#searchCreateName").val(),
 	                    searchState: $("#searchState").val(),
-	                    page: options.page,          // ✅ Kendo가 현재 페이지 전달
+	                    page: 1,
-	                    pageSize: options.pageSize,   // ✅ Kendo가 현재 페이지 크기 전달
+	                    pageSize: 10
-                        sortField: sortField,        // 정렬 필드
-                        sortDir: sortDir             // 정렬 방향	                    
 	                };
 	            }
 	        }
 	    },
 	    schema: {
 	        data: "items",   // 서버에서 실제 데이터 Array key
-	        total: "total",   // 서버에서 전체 개수 key,
+	        total: "total"   // 서버에서 전체 개수 key
-            model: {
-                fields: {
-                    rn:             { type: "number" },  // 순번
-                    classCode:      { type: "string" },
-                    projectCode:    { type: "string" },
-                    reportType:     { type: "string" },
-                    reportTypeName: { type: "string" },
-                    projectName:    { type: "string" },
-                    userid:         { type: "string" },
-                    userName:       { type: "string" },
-                    state:          { type: "string" },
-                    stateName:      { type: "string" },
-                    checkuserid:    { type: "string" },
-                    datetime:       { type: "string" },   // "YYYY-MM-DD HH:mm:ss" 형식
-                    regFinDate:     { type: "string" },
-                    modifyCallDate: { type: "string" },
-                    modifyFinDate:  { type: "string" },
-                    checkstart:     { type: "string" },
-                    checkok:        { type: "string" },
-                    ins:            { type: "string" },
-                    authins:        { type: "string" },
-                    map:            { type: "string" },
-                    modifycall:     { type: "string" },
-                    cursor:         { type: "string" },
-                    histSeq:        { type: "number" },
-                    expertFile:     { type: "string" }
-                }
-            }
 	    },
 	    serverPaging: true,
 	    serverSorting: true,
@@ -444,15 +396,7 @@ function reloadGrid() {
 	        pageSize: 10
 	    },
 	    columns: [
-// 			{ field: "rowNumber", width: 50, title: "순번", sortable: false, template: "<span class='row-number'></span>" },
+			{ field: "rowNumber", width: 50, title: "순번", sortable: false, template: "<span class='row-number'></span>" },
-			{ 
-				field: "rn", 
-				width: 50, 
-				title: "순번",
-				template: function(data) {
-					return data.rn ? parseInt(data.rn) : "0";
-				}
-			},
 			{
 				field: "projectName",
 				width: "auto",
@@ -561,7 +505,7 @@ function reloadGrid() {
 			refresh: false,
 			pageSizes: true,
 			pageSize: 10,
-			buttonCount: 10,
+			//buttonCount: 10,
 			input: true,
 			numeric: false,
 		},

src/main/webapp/WEB-INF/views/web/manage/list_reg.jsp

@@ -231,29 +231,12 @@ function reloadGrid() {
 	            url: "/list_reg_jsondata.do",
 	            dataType: "json",
 	            type: "POST",
-// 	            data: function() {
+	            data: function() {
-//                     var ds = this; // DataSource
-//                     return {
-// 	                    searchProjectName: $("#searchProjectName").val(),
-// 	                    searchUserName: $("#searchUserName").val(),
-//                         page: ds.page(),              // ✅ 현재 페이지
-//                         pageSize: ds.pageSize()       // ✅ 현재 페이지당 개수
-//                     };
-// 	            }
-	        },
-	        parameterMap: function(options, operation) {
-	            if (operation === "read") {
-                    // 정렬 정보 처리 추가
-                    var sortField = options.sort && options.sort[0] ? options.sort[0].field : null;
-                    var sortDir = options.sort && options.sort[0] ? options.sort[0].dir : null;
-
 	                return {
 	                    searchProjectName: $("#searchProjectName").val(),
 	                    searchUserName: $("#searchUserName").val(),
-	                    page: options.page,          // ✅ Kendo가 현재 페이지 전달
+	                    page: 1,
-	                    pageSize: options.pageSize,   // ✅ Kendo가 현재 페이지 크기 전달
+	                    pageSize: 10
-                        sortField: sortField,        // 정렬 필드
-                        sortDir: sortDir             // 정렬 방향	                    
 	                };
 	            }
 	        }
@@ -277,15 +260,7 @@ function reloadGrid() {
 	        pageSize: 10
 	    },
 	    columns: [
-// 			{ field: "rowNumber", width: 50, title: "순번", template: "<span class='row-number'></span>" },
+			{ field: "rowNumber", width: 50, title: "순번", template: "<span class='row-number'></span>" },
-			{ 
-				field: "rn", 
-				width: 50, 
-				title: "순번",
-				template: function(data) {
-					return data.rn ? parseInt(data.rn) : "0";
-				}
-			},
 			{
 				field: "projectName",
 				title: "프로젝트명",

src/main/webapp/WEB-INF/views/web/manage/re_name.jsp

@@ -191,35 +191,15 @@ function reloadGrid() {
 	            url: "/getHoleCoordList.do",
 	            dataType: "json",
 	            type: "POST",
-// 	            data: function() {
+	            data: function() {
-//                     var ds = this; // DataSource
-//                     return {
-// 	                    startDate: $("#startDate").val(),
-// 	                    endDate: $("#endDate").val(),
-// 	                    searchProjectName: $("#searchProjectName").val(),
-// 	                    searchUserName: $("#searchUserName").val(),
-// 	                    searchCreateName: $("#searchCreateName").val(),
-//                         page: ds.page(),              // ✅ 현재 페이지
-//                         pageSize: ds.pageSize()       // ✅ 현재 페이지당 개수
-//                     };
-// 	            }
-	        },
-	        parameterMap: function(options, operation) {
-	            if (operation === "read") {
-                    // 정렬 정보 처리 추가
-                    var sortField = options.sort && options.sort[0] ? options.sort[0].field : null;
-                    var sortDir = options.sort && options.sort[0] ? options.sort[0].dir : null;
-
 	                return {
 	                    startDate: $("#startDate").val(),
 	                    endDate: $("#endDate").val(),
 	                    searchProjectName: $("#searchProjectName").val(),
 	                    searchUserName: $("#searchUserName").val(),
 	                    searchCreateName: $("#searchCreateName").val(),
-	                    page: options.page,          // ✅ Kendo가 현재 페이지 전달
+	                    page: 1,
-	                    pageSize: options.pageSize,   // ✅ Kendo가 현재 페이지 크기 전달
+	                    pageSize: 10
-                        sortField: sortField,        // 정렬 필드
-                        sortDir: sortDir             // 정렬 방향	                    
 	                };
 	            }
 	        }
@@ -243,15 +223,8 @@ function reloadGrid() {
 	        pageSize: 10
 	    },
 	    columns: [
-// 			{ field: "rowNumber", width: 50, title: "순번", template: "<span class='row-number'></span>", sortable: false },
+	
-			{ 
+			{ field: "rowNumber", width: 50, title: "순번", template: "<span class='row-number'></span>", sortable: false },
-				field: "rn", 
-				width: 50, 
-				title: "순번",
-				template: function(data) {
-					return data.rn ? parseInt(data.rn) : "0";
-				}
-			},
 			{
 				field: "projectName",
 				width: 262,

src/main/webapp/com/css/common.v2.0.css

@@ -7395,6 +7395,10 @@ ul.faq-q > li textarea {
 /* ====================================== */
 /* ====================================== */
 /* ====================================== */
+.k-pager-wrap .k-pager-sizes.k-label {
+  display: none;
+}
+
 /* ====================================== */
 /* ====================================== */
 

src/main/webapp/com/css/sass/common.v2.0.scss

@@ -5777,7 +5777,7 @@ ul.faq-q > li textarea {
 //     (25.10.22 YJI) kendo-grid pager 숨김 시작
 /* ====================================== */
 .k-pager-wrap .k-pager-sizes.k-label {
-    // display: none;
+    display: none;
 }
 /* ====================================== */
 //     (25.10.22 YJI) kendo-grid pager 숨김 끝