From 0325ad91aa202cce0c57e25c42c2187f44c98c70 Mon Sep 17 00:00:00 2001
From: leebj <leebj91@xit.co.kr>
Date: Tue, 9 Jul 2024 17:16:45 +0900
Subject: [PATCH] =?UTF-8?q?=EB=8B=A8=EC=86=8D=EC=9E=90=EB=A3=8C=20?=
 =?UTF-8?q?=EC=84=B8=EC=99=B8=EC=88=98=EC=9E=85=20=EC=A0=84=EC=86=A1=20?=
 =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cokr/xit/fims/nxrp/NisIndivQuery.java     |  3 +--
 .../WEB-INF/jsp/fims/crdn/crdn05010-main.jsp  | 22 ++++++++-----------
 .../WEB-INF/jsp/fims/crdn/crdn06010-main.jsp  | 22 ++++++++-----------
 3 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/src/main/java/cokr/xit/fims/nxrp/NisIndivQuery.java b/src/main/java/cokr/xit/fims/nxrp/NisIndivQuery.java
index b8eb2f21..fd629f0b 100644
--- a/src/main/java/cokr/xit/fims/nxrp/NisIndivQuery.java
+++ b/src/main/java/cokr/xit/fims/nxrp/NisIndivQuery.java
@@ -1,6 +1,5 @@
 package cokr.xit.fims.nxrp;
 
-import cokr.xit.fims.levy.LevyQuery;
 import cokr.xit.foundation.component.QueryRequest;
 
 /**과태료 대장 단속 정보 등록 정보 조회 요청
@@ -31,7 +30,7 @@ public class NisIndivQuery extends QueryRequest {
 		return ifEmpty(crdnIds, () -> null);
 	}
 
-	public <T extends LevyQuery> T setCrdnIds(String... crdnIds) {
+	public <T extends NisIndivQuery> T setCrdnIds(String... crdnIds) {
 		this.crdnIds = crdnIds;
 		return self();
 	}
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05010-main.jsp
index 42ff5620..79462558 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05010-main.jsp
@@ -135,7 +135,7 @@ $(document).ready(function(){
 		}
 	});
 	$P.crdnControl.defaultFetchSize = FETCH_XS;
-	$P.crdnControl.untilPageNum = 0;
+
 	$P.crdnControl.beforeCurrent = null;
 
 	$P.crdnControl.urls.newInfoByFile = "";
@@ -147,7 +147,7 @@ $(document).ready(function(){
 	$P.crdnControl.dataset.onDatasetChange = (obj, option) => {
 		var t = $P.getGridTemplate();
 		var trs = Apply.fromDataset.getTbody($P.crdnControl.dataset, t.found, t.notFound, t.replacer);
-		$P.renderCrdnList(obj["Total"], $P.crdnControl.dataset.length, trs);
+		$P.renderCrdnList(obj["Total"], $P.crdnControl.dataset.length, trs, option);
 
 		Apply.fromDataset.paging($P.crdnControl.dataset, obj, "crdnPaging--${pageName}");
 
@@ -203,9 +203,7 @@ $(document).ready(function(){
 	}
 
 	$P.refreshCrdnList = () => {
-        $P.crdnControl.untilPageNum = $P.crdnControl.query.pageNum;
-        $P.crdnControl.query.fetchSize = $P.crdnControl.defaultFetchSize * $P.crdnControl.query.pageNum;
-        $P.crdnControl.load(1);
+        $P.crdnControl.reload({all : true});
     }
 
 
@@ -223,21 +221,19 @@ $(document).ready(function(){
 		};
 	}
 
-	$P.renderCrdnList = (total, listLength, trs) => {
+	$P.renderCrdnList = (total, listLength, trs, option) => {
 
 		let noMore = (listLength >= total);
-		var initScroll = ($P.crdnControl.query.pageNum < 2) && ($P.crdnControl.untilPageNum == 0);
-
+		var initScroll = ($P.crdnControl.query.pageNum < 2);
+		if(option != null && option.reloaded){
+			initScroll = false;
+		}
+		
 		$("#table-responsive--${pageName}")[0].changeContent(trs, initScroll, noMore);
 
 		//보안모드
 	    fn_securityModeToggle($("#securityMode--top").is(":checked"));
 
-	    if($P.crdnControl.untilPageNum != 0){
-			$P.crdnControl.query.fetchSize = $P.crdnControl.defaultFetchSize;
-			$P.crdnControl.query.pageNum = $P.crdnControl.untilPageNum;
-			$P.crdnControl.untilPageNum = 0;
-		}
 	}
 
 	$P.clickCrdnList = (dataKey) => {
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp
index 766c8aa1..5eb883e6 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp
@@ -315,7 +315,7 @@ $(document).ready(function(){
 		}
 	});
 	$P.crdnControl.defaultFetchSize = FETCH_XS;
-	$P.crdnControl.untilPageNum = 0;
+
 	$P.crdnControl.beforeCurrent = null;
 
 	/**************************************************************************
@@ -324,7 +324,7 @@ $(document).ready(function(){
 	$P.crdnControl.dataset.onDatasetChange = (obj, option) => {
 		var t = $P.getGridTemplate();
 		var trs = Apply.fromDataset.getTbody($P.crdnControl.dataset, t.found, t.notFound, t.replacer);
-		$P.renderCrdnList(obj["Total"], $P.crdnControl.dataset.length, trs);
+		$P.renderCrdnList(obj["Total"], $P.crdnControl.dataset.length, trs, option);
 
 		Apply.fromDataset.paging($P.crdnControl.dataset, obj, "crdnPaging--${pageName}");
 	};
@@ -405,9 +405,7 @@ $(document).ready(function(){
 	}
 
 	$P.refreshCrdnList = () => {
-        $P.crdnControl.untilPageNum = $P.crdnControl.query.pageNum;
-        $P.crdnControl.query.fetchSize = $P.crdnControl.defaultFetchSize * $P.crdnControl.query.pageNum;
-        $P.crdnControl.load(1);
+        $P.crdnControl.reload({all : true});
     }
 
 	$P.fnExcelDown = (forApproval) => {
@@ -462,20 +460,18 @@ $(document).ready(function(){
 		};
 	}
 
-	$P.renderCrdnList = (total, listLength, trs) => {
+	$P.renderCrdnList = (total, listLength, trs, option) => {
 
 		let noMore = (listLength >= total);
-		var initScroll = ($P.crdnControl.query.pageNum < 2) && ($P.crdnControl.untilPageNum == 0);
-
+		var initScroll = ($P.crdnControl.query.pageNum < 2);
+		if(option != null && option.reloaded){
+			initScroll = false;
+		}
+		
 		$("#table-responsive--${pageName}")[0].changeContent(trs, initScroll, noMore);
 
 	    fn_securityModeToggle($("#securityMode--top").is(":checked")); //보안모드
 
-	    if($P.crdnControl.untilPageNum != 0){
-			$P.crdnControl.query.fetchSize = $P.crdnControl.defaultFetchSize;
-			$P.crdnControl.query.pageNum = $P.crdnControl.untilPageNum;
-			$P.crdnControl.untilPageNum = 0;
-		}
 	}
 
 	$P.clickCrdnList = (dataKey) => {