From ddd92af97b92698c12ded6c536198f6028f76802 Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Fri, 7 Jul 2023 16:09:36 +0900
Subject: [PATCH] =?UTF-8?q?=EB=8B=A8=EC=86=8D=EC=82=AC=EC=A7=84=EB=B9=84?=
 =?UTF-8?q?=EA=B5=90=20=EA=B2=80=EC=82=AC=20=EC=A1=B0=ED=9A=8C=EC=8B=9C=20?=
 =?UTF-8?q?=EC=A0=84=EC=B2=B4=EB=AA=A9=EB=A1=9D=20=EC=A1=B0=ED=9A=8C?=
 =?UTF-8?q?=EB=90=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sql/mapper/fims/crdn/crdn06-mapper.xml    |  2 --
 .../WEB-INF/jsp/fims/crdn/crdn01010-main.jsp  |  8 ++---
 .../WEB-INF/jsp/fims/crdn/crdn01030-main.jsp  | 12 +++----
 .../WEB-INF/jsp/fims/crdn/crdn05010-main.jsp  |  8 ++---
 .../WEB-INF/jsp/fims/crdn/crdn05030-info.jsp  |  2 +-
 .../WEB-INF/jsp/fims/crdn/crdn06010-main.jsp  | 10 +++---
 .../WEB-INF/jsp/fims/crdn/crdn06020-main.jsp  | 36 ++++++++++++-------
 .../WEB-INF/jsp/fims/crdn/crdn06030-main.jsp  |  6 ++--
 .../WEB-INF/jsp/fims/crdn/crdn06040-main.jsp  |  4 +--
 9 files changed, 48 insertions(+), 40 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 229db7e3..17bf6b3c 100644
--- a/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml
@@ -245,7 +245,6 @@ AND C.${by} LIKE CONCAT('%', #{term}, '%')
 
 <select id="selectPhotoInspectionDataList" parameterType="map" resultType="dataobject">
 /* 단속사진 검사 자료 목록 조회(crdn06Mapper.selectPhotoInspectionDataList) */
-<include refid="utility.paging-prefix"/>
 SELECT C.CRDN_ID                                      <!-- 단속 ID -->
      , CONCAT(C.CRDN_YMD,'',C.CRDN_TM) AS CRDN_YMD_TM <!-- 단속 일시 -->
      , C.VHRNO                                        <!-- 차량번호 -->
@@ -281,7 +280,6 @@ SELECT C.CRDN_ID                                      <!-- 단속 ID -->
 
 </if>
 <include refid="utility.orderBy" />
-<include refid="utility.paging-suffix"/>
 </select>
 
 <select id="selectSameVehicleMainList" parameterType="map" resultType="dataobject">
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp
index 2ea7f314..8b504e03 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp
@@ -8,9 +8,9 @@
 			<div class="wrapper-list">
 				<div>
 				    <div class="container-page-btn">
-				        <button type="button" class="btn btn-outline-dark" id="btnReset--${pageName}" title="초기화">초기화</button>
+				        <button type="button" id="btnReset--${pageName}" class="btn btn-outline-dark" title="초기화">초기화</button>
 				        <span class="container-window-btn-right">
-				            <button type="button" class="btn btn-search" id="btnSearch--${pageName}" title="검색">검색</button>
+				            <button type="button" id="btnSearch--${pageName}" class="btn btn-search" title="검색">검색</button>
 				        </span>
 				    </div>
 
@@ -60,8 +60,8 @@
 				                 </ul>
 							</div>
 				            <span class="container-window-btn-right">
-				            	<a href="#" class="btn btn-blue" id="" title="민원원본보기">민원원본보기</a>
-				            	<a href="#" class="btn btn-blue" id="" title="처리 잠시 보류">처리 잠시 보류</a>
+				            	<a href="#" id="" class="btn btn-blue" title="민원원본보기">민원원본보기</a>
+				            	<a href="#" id="" class="btn btn-blue" title="처리 잠시 보류">처리 잠시 보류</a>
 				            </span>
 				        </span>
 				    </div>
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01030-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01030-main.jsp
index 267e089d..3951a672 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01030-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01030-main.jsp
@@ -8,9 +8,9 @@
 			<div class="wrapper-list">
 				<div>
 				    <div class="container-page-btn">
-				        <button type="button" class="btn btn-outline-dark" id="btnReset--${pageName}" title="초기화">초기화</button>
+				        <button type="button" id="btnReset--${pageName}" class="btn btn-outline-dark" title="초기화">초기화</button>
 				        <span class="container-window-btn-right">
-				            <button type="button" class="btn btn-search" id="btnSearch--${pageName}" title="검색">검색</button>
+				            <button type="button" id="btnSearch--${pageName}" class="btn btn-search" title="검색">검색</button>
 				        </span>
 				    </div>
 
@@ -60,10 +60,10 @@
 				                 </ul>
 							</div>
 				            <span class="container-window-btn-right">
-				            	<a href="#" class="btn btn-blue" id="" title="민원원본보기">민원원본보기</a>
-				            	<a href="#" class="btn btn-blue" id="" title="답변미리보기">답변미리보기</a>
-				            	<a href="#" class="btn btn-blue" id="" title="선택자료답변등록실행">선택자료답변등록실행</a>
-				            	<a href="#" class="btn btn-blue" id="" title="답변완료로 수정">답변완료로 수정</a>
+				            	<a href="#" id="" class="btn btn-blue" title="민원원본보기">민원원본보기</a>
+				            	<a href="#" id="" class="btn btn-blue" title="답변미리보기">답변미리보기</a>
+				            	<a href="#" id="" class="btn btn-blue" title="선택자료답변등록실행">선택자료답변등록실행</a>
+				            	<a href="#" id="" class="btn btn-blue" title="답변완료로 수정">답변완료로 수정</a>
 				            </span>
 				        </span>
 				    </div>
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 df711eb3..14977d77 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
@@ -7,9 +7,9 @@
 			<div class="wrapper-list">
 				<div>
 				    <div class="container-page-btn">
-				        <button type="button" class="btn btn-outline-dark" id="btnReset--${pageName}" title="초기화">초기화</button>
+				        <button type="button" id="btnReset--${pageName}" class="btn btn-outline-dark" title="초기화">초기화</button>
 				        <span class="container-window-btn-right">
-							<button type="button" class="btn btn-search" id="btnSearch--${pageName}" title="검색">검색</button>
+							<button type="button" id="btnSearch--${pageName}" class="btn btn-search" title="검색">검색</button>
 				        </span>
 				    </div>
 
@@ -45,8 +45,8 @@
 				                 </ul>
 							</div>
 							<span class="container-window-btn-right">
-								<a href="#" class="btn btn-blue" id="btnInsertByFile--${pageName}" title="단속 파일 등록">단속 파일 등록</a>
-					         	<a href="#" class="btn btn-blue" id="btnInsertByHand--${pageName}" title="단속 수기 등록">단속 수기 등록</a>
+								<a href="#" id="btnInsertByFile--${pageName}" class="btn btn-blue" title="단속 파일 등록">단속 파일 등록</a>
+					         	<a href="#" id="btnInsertByHand--${pageName}" class="btn btn-blue" title="단속 수기 등록">단속 수기 등록</a>
 							</span>
 					     </span>
 					</div>
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp
index d47a7431..2e0d4c7d 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp
@@ -142,7 +142,7 @@
 				<div class="col-md-6">
 					<div class="row justify-content-end">
 						<div class="col-sm-3">
-							<button type="button" class="btn btn-primary" id="btnInst--${pageName}">등록</button>
+							<button type="button" id="btnInst--${pageName}" class="btn btn-primary">등록</button>
 						</div>
 					</div>
 				</div>
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 527a6598..0bcbdb8d 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
@@ -9,9 +9,9 @@
 			<div class="wrapper-list">
 				<div>
 				    <div class="container-page-btn">
-				        <button type="button" class="btn btn-outline-dark" id="btnReset--${pageName}" title="초기화">초기화</button>
+				        <button type="button" id="btnReset--${pageName}" class="btn btn-outline-dark" title="초기화">초기화</button>
 				        <span class="container-window-btn-right">
-				            <button type="button" class="btn btn-search" id="btnSearch--${pageName}" title="검색">검색</button>
+				            <button type="button" id="btnSearch--${pageName}" class="btn btn-search" title="검색">검색</button>
 				        </span>
 				    </div>
 
@@ -100,7 +100,7 @@
 
 		                        </div>
 					        </div>
-					        <div class="row" id="searchByTaskArea--${pageName}">
+					        <div id="searchByTaskArea--${pageName}" class="row" >
 					        </div>
 				        </div>
 				    </form>
@@ -130,8 +130,8 @@
 				                 </ul>
 							</div>
 				            <span class="container-window-btn-right">
-				            	<a href="#" class="btn btn-blue" id="" title="업무처리1">업무 처리1</a>
-				            	<a href="#" class="btn btn-blue" id="" title="업무처리2">업무 처리2</a>
+				            	<a href="#" id="" class="btn btn-blue" title="업무처리1">업무 처리1</a>
+				            	<a href="#" id="" class="btn btn-blue" title="업무처리2">업무 처리2</a>
 				            </span>
 				        </span>
 				    </div>
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 6137482f..912d59dd 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
@@ -9,11 +9,11 @@
 			<div class="wrapper-list">
 				<div>
 				    <div class="container-page-btn">
-				        <button type="button" class="btn btn-outline-dark" id="btnReset--${pageName}" title="초기화">초기화</button>
-				        <a href="#" class="btn btn-blue" id="btnPhotoInspection--${pageName}" title="단속사진 비교">단속사진 비교</a>
-				        <a href="#" class="btn btn-blue" id="btnSameVehicleInspection--${pageName}" title="동일단속차량 검사">동일단속차량 검사</a>
+				        <button type="button" id="btnReset--${pageName}" class="btn btn-outline-dark" title="초기화">초기화</button>
+				        <a href="#" id="btnPhotoInspection--${pageName}" class="btn btn-blue" title="단속사진 비교">단속사진 비교</a>
+				        <a href="#" id="btnSameVehicleInspection--${pageName}" class="btn btn-blue" title="동일단속차량 검사">동일단속차량 검사</a>
 				        <span class="container-window-btn-right">
-				            <button type="button" class="btn btn-search" id="btnSearch--${pageName}" title="검색">검색</button>
+				            <button type="button" id="btnSearch--${pageName}" class="btn btn-search" title="검색">검색</button>
 				        </span>
 				    </div>
 
@@ -143,6 +143,7 @@
 				                 </ul>
 							</div>
 				            <span class="container-window-btn-right">
+								<a href="#" id="btnInstLevyExcl--${pageName}" class="btn btn-blue" title="비부과 등록">비부과 등록</a>
 
 				            </span>
 				        </span>
@@ -360,7 +361,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:true,
+	    keymapper:info => info ? info.CRDN_ID : "", dataGetter:obj => obj.crdnList, appendData:false,
 	    formats: {
 	    	CRDN_YMD_TM 	: datetimeFormat,
 	    	CRDN_INPT_SE_CD : FIM003,
@@ -391,7 +392,7 @@ $(document).ready(function(){
 	/**************************************************************************
 	 * DatasetControl.on
 	 **************************************************************************/
-	$P.photoInspectionControl.onDatasetChange = obj => {
+	$P.photoInspectionControl.onDatasetChange = (obj) => {
 	    $P.renderInspectionDataList("photoInspection");
 
 	    var prefix = obj.infoPrefix;
@@ -404,7 +405,7 @@ $(document).ready(function(){
 
 	};
 
-	$P.sameVehicleControl.main.onDatasetChange = obj => {
+	$P.sameVehicleControl.main.onDatasetChange = (obj) => {
 		$P.renderInspectionDataList("sameVehicleInspectionMain");
 
 	    var prefix = obj.infoPrefix;
@@ -418,7 +419,7 @@ $(document).ready(function(){
 	};
 
 
-	$P.sameVehicleControl.sub.onDatasetChange = obj => {
+	$P.sameVehicleControl.sub.onDatasetChange = (obj) => {
 		$P.renderInspectionDataList("sameVehicleInspectionSub");
 	};
 
@@ -426,7 +427,7 @@ $(document).ready(function(){
 	 * pageObject.function
 	 **************************************************************************/
 	$P.fnReset = () => {
-		$('#schCrdnYmdFrom--${pageName}').datepicker('setDate', DateUtil.getDateDay(-5475).date);
+		$('#schCrdnYmdFrom--${pageName}').datepicker('setDate', DateUtil.getDateDay(-7).date);
     	$('#schCrdnYmdTo--${pageName}').datepicker('setDate', new Date());
 		$P.photoInspectionControl.setData([]);
 		$P.sameVehicleControl.main.setData([]);
@@ -455,7 +456,7 @@ $(document).ready(function(){
 		switch ($P.currentDisplay) {
 			case "photoInspection":
 				$P.photoInspectionControl.query = $P.getParams();
-			    $P.photoInspectionControl.load(1);
+			    $P.photoInspectionControl.load(0);
 				break;
 			case "sameVehicleInspection":
 				$P.sameVehicleControl.main.query = $P.getParams();
@@ -520,6 +521,10 @@ $(document).ready(function(){
 		}
 	}
 
+	$P.openLevyExclPop = () => {
+
+	};
+
 	$P.renderInspectionDataList = (renderDataType) => {
 
 	    switch (renderDataType) {
@@ -566,7 +571,13 @@ $(document).ready(function(){
 	$P.getParams = () => {
 		var formFields = new FimsFormFields("#frmSearch--${pageName}");
 		var data = formFields.get();
-		data.fetchSize = 30;
+
+		if($P.currentDisplay == "sameVehicleInspection"){
+			data.fetchSize = 30;
+		} else {
+			data.fetchSize = 0;
+		}
+
 		return data;
 	}
 
@@ -594,9 +605,8 @@ $(document).ready(function(){
     });
     $('#btnSearch--${pageName}').on('click', () => $P.searchInspectionList()); //검색버튼
 
+	$("#btnInstLevyExcl--${pageName}").on("click", () => $P.openLevyExclPop());
 
-	//스크롤 이벤트 추가(사진검사)
-	$("#photoInspection-responsive--${pageName}").scroll(function(){ $P.scrollEnd(this); });
 	//스크롤 이벤트 추가(동일차량검사)
 	$("#sameVehicleInspectionMain-responsive--${pageName}").scroll(function(){ $P.scrollEnd(this); });
 
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp
index 868af3c3..fda9b82f 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp
@@ -9,9 +9,9 @@
 			<div class="wrapper-list">
 				<div>
 				    <div class="container-page-btn">
-				        <button type="button" class="btn btn-outline-dark" id="btnReset--${pageName}" title="초기화">초기화</button>
+				        <button type="button" id="btnReset--${pageName}" class="btn btn-outline-dark" title="초기화">초기화</button>
 				        <span class="container-window-btn-right">
- 							<button type="button" class="btn btn-search" id="btnSearch--${pageName}" title="검색">검색</button>
+ 							<button type="button" id="btnSearch--${pageName}" class="btn btn-search" title="검색">검색</button>
 				        </span>
 				    </div>
 				    <form id="frmSearch--${pageName}" name="frmSearch">
@@ -45,7 +45,7 @@
 				                 </ul>
 							</div>
 				            <span class="container-window-btn-right">
-				                <a href="#" class="btn btn-blue" id="btnUpdateToConfirmData--${pageName}" title="개별 확인 자료로 수정">개별 확인 자료로 수정</a>
+				                <a href="#" id="btnUpdateToConfirmData--${pageName}" class="btn btn-blue" title="개별 확인 자료로 수정">개별 확인 자료로 수정</a>
 				            </span>
 				        </span>
 				    </div>
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06040-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06040-main.jsp
index 7bac519e..f73b467d 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06040-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06040-main.jsp
@@ -9,9 +9,9 @@
 			<div class="wrapper-list">
 				<div>
 				    <div class="container-page-btn">
-				        <button type="button" class="btn btn-outline-dark" id="btnReset--${pageName}" title="초기화">초기화</button>
+				        <button type="button" id="btnReset--${pageName}" class="btn btn-outline-dark" title="초기화">초기화</button>
 				        <span class="container-window-btn-right">
-				            <button type="button" class="btn btn-search" id="btnSearch--${pageName}" title="검색">검색</button>
+				            <button type="button" id="btnSearch--${pageName}" class="btn btn-search" title="검색">검색</button>
 				        </span>
 				    </div>