From d59c670ec90f2e8f218ae5d5a8f3974f29442843 Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Mon, 10 Jul 2023 17:28:15 +0900
Subject: [PATCH] =?UTF-8?q?=EB=8B=A8=EC=86=8D=EC=9E=90=EB=A3=8C=20?=
 =?UTF-8?q?=EA=B2=80=EC=82=AC=20=ED=8E=98=EC=9D=B4=EC=A7=95=EC=B2=98?=
 =?UTF-8?q?=EB=A6=AC=20=EB=B3=B5=EC=9B=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sql/mapper/fims/crdn/crdn06-mapper.xml       |  7 ++-----
 .../WEB-INF/jsp/fims/crdn/crdn06020-main.jsp     | 16 ++++++----------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml
index a3b49a63..5cc3107b 100644
--- a/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml
@@ -245,10 +245,7 @@ AND C.${by} LIKE CONCAT('%', #{term}, '%')
 
 <select id="selectPhotoInspectionDataList" parameterType="map" resultType="dataobject">
 /* 단속사진 검사 자료 목록 조회(crdn06Mapper.selectPhotoInspectionDataList) */
-SELECT ROW_NUMBER() OVER(<include refid="utility.sortBy" />) ROW_NUM, COUNT(*) OVER() TOT_CNT
-     , QBODY.*
-FROM (
-
+<include refid="utility.paging-prefix"/>
 SELECT C.CRDN_ID                                      <!-- 단속 ID -->
      , CONCAT(C.CRDN_YMD,'',C.CRDN_TM) AS CRDN_YMD_TM <!-- 단속 일시 -->
      , C.VHRNO                                        <!-- 차량번호 -->
@@ -285,7 +282,7 @@ SELECT C.CRDN_ID                                      <!-- 단속 ID -->
 </if>
 
 <include refid="utility.orderBy" />
-) QBODY
+<include refid="utility.paging-suffix"/>
 </select>
 
 <select id="selectSameVehicleMainList" parameterType="map" resultType="dataobject">
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp
index 91e7a931..c03eea25 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp
@@ -374,7 +374,7 @@ $(document).ready(function(){
 	//단속사진검사 datasetControl 인스턴스
 	$P.photoInspectionControl = new DatasetControl({
 	    prefix:"photoInspection", prefixName:"종합", infoSize:"xl", urls : { load : "", getInfo : "" },
-	    keymapper:info => info ? info.CRDN_ID : "", dataGetter:obj => obj.crdnList, appendData:false,
+	    keymapper:info => info ? info.CRDN_ID : "", dataGetter:obj => obj.crdnList, appendData:true,
 	    formats: {
 	    	CRDN_YMD_TM 	: datetimeFormat,
 	    	CRDN_INPT_SE_CD : FIM003,
@@ -387,7 +387,7 @@ $(document).ready(function(){
 	//동일차량검사 datasetControl 인스턴스
 	$P.sameVehicleControl = new InspectionControl({
 	    prefix:"sameVehicleInspectionMain", prefixName:"종합", infoSize:"xl", urls : { load : "", getInfo : "" },
-	    keymapper:info => info ? info.CRDN_ID_LIST : "", dataGetter:obj => obj.crdnList,
+	    keymapper:info => info ? info.CRDN_ID_LIST : "", dataGetter:obj => obj.crdnList, appendData:true,
 	    formats: { CRDN_CNT : numberFormat, FFNLG_AMT : numberFormat }
 	},
 	{
@@ -404,7 +404,7 @@ $(document).ready(function(){
 	/**************************************************************************
 	 * DatasetControl.on
 	 **************************************************************************/
-	$P.photoInspectionControl.onDatasetChange = (obj) => {
+	 $P.photoInspectionControl.onDatasetChange = (obj) => {
 	    $P.renderInspectionDataList("photoInspection");
 
 	    var prefix = obj.infoPrefix;
@@ -587,12 +587,7 @@ $(document).ready(function(){
 	$P.getParams = () => {
 		var formFields = new FimsFormFields("#frmSearch--${pageName}");
 		var data = formFields.get();
-
-		if($P.currentDisplay == "sameVehicleInspection"){
-			data.fetchSize = 30;
-		} else {
-			data.fetchSize = 0;
-		}
+		data.fetchSize = 30;
 
 		return data;
 	}
@@ -624,8 +619,9 @@ $(document).ready(function(){
 	$("#btnInstLevyExcl--${pageName}").on("click", () => $P.openLevyExclPop());
 
 	//스크롤 이벤트 추가(동일차량검사)
+	$("#photoInspection-responsive--${pageName}").scroll(function(){ $P.scrollEnd(this); });
 	$("#sameVehicleInspectionMain-responsive--${pageName}").scroll(function(){ $P.scrollEnd(this); });
-
+	
 	/**************************************************************************
 	 * 초기화
 	 **************************************************************************/