From be11a2d2c601ccc5d3de34f12f6b7dc1fe01b06e Mon Sep 17 00:00:00 2001
From: mjkhan21 <mjkhan21@xit.co.kr>
Date: Wed, 28 May 2025 18:19:06 +0900
Subject: [PATCH] =?UTF-8?q?=EC=82=AC=EC=A0=84=EA=B0=90=EA=B2=BD=EA=B8=88?=
 =?UTF-8?q?=EC=95=A1=20=EC=84=A4=EC=A0=95=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cokr/xit/fims/chongno/ChongnoTaskProcessor.java    | 4 +++-
 src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp    | 5 +++--
 src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08010-main.jsp    | 6 +++---
 src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08030-info.jsp    | 4 ++--
 src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02020-info.jsp    | 2 +-
 src/main/webapp/WEB-INF/jsp/index.jsp                       | 2 +-
 6 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/main/java/cokr/xit/fims/chongno/ChongnoTaskProcessor.java b/src/main/java/cokr/xit/fims/chongno/ChongnoTaskProcessor.java
index b3307c7..33c8406 100644
--- a/src/main/java/cokr/xit/fims/chongno/ChongnoTaskProcessor.java
+++ b/src/main/java/cokr/xit/fims/chongno/ChongnoTaskProcessor.java
@@ -60,7 +60,9 @@ public class ChongnoTaskProcessor extends TaskProcessor {
 				.setTaskSeCd(taskSeCd)
 				.setSggCd(sggCd);
 			int amt = toInt(crdnStngMapper.selectBasicAmt(query));
-			return new int[] {amt, amt};
+
+			DataObject taskInfo = getTaskInfo(sggCd, taskSeCd);
+			return new int[] {amt, amt * (100 - toInt(taskInfo.get("ADVNTCE_RDCRT"))) / 100};
 		}
 		return super.getBasicAmt(crdn);
 	}
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 5d454bd..2a6ddc9 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
@@ -188,7 +188,7 @@
 					<input type="text" is="id-input" name="vhclNm" data-map="VHCL_NM" class="form-control" readonly placeholder="명칭" />
 					<input type="text" is="id-input" name="vhclColr" data-map="VHCL_COLR" class="form-control" readonly placeholder="색상" />
 					<input type="text" is="id-input" name="vhclCpct" data-map="VHCL_CPCT" class="form-control text-end" readonly placeholder="정원" />
-					<input type="text" is="id-input" name="vin" data-map="VIN" class="form-control" readonly placeholder="차대번호" />
+					<input type="text" is="id-input" name="vin" data-map="VIN" class="form-control" readonly placeholder="차대번호" title="차대번호" />
 				</div>
 <%--
 				<div class="col-md-4">
@@ -602,7 +602,7 @@ $(document).ready(function(){
 				}
 			});
 			
-			["rtpyrId", "addrSn", "rtpyrNm", "rtpyrSeCd", "rtpyrNo", "vin", "vhclNm", "vhclColr", "useFuelCd", "ffnlgCarmdlCd", "zip", "addr", "dtlAddr"]
+			["rtpyrId", "addrSn", "rtpyrNm", "rtpyrSeCd", "rtpyrNo", "vin", "vhclNm", "vhclColr", "vhclCpct", "useFuelCd", "ffnlgCarmdlCd", "zip", "addr", "dtlAddr"]
 				.forEach(name => $P.$findn(name).val(""))
 			return;
 		}
@@ -629,6 +629,7 @@ $(document).ready(function(){
 		$P.$findn("vin").val(vehicle.vin);
 		$P.$findn("vhclNm").val(vehicle.cnm);
 		$P.$findn("vhclColr").val(vehicle.color_nm);
+		$P.$findn("vhclCpct").val(vehicle.tkcar_pscap_co);
 		$P.$findn("useFuelCd").val(vehicle.use_fuel_code);
 
 		if (vehicle.vhcty_asort_code == "1"){ //승용
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08010-main.jsp
index 10b3be6..5996d5a 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08010-main.jsp
@@ -56,8 +56,8 @@
 									<th style="width: 200px;">소유주명</th>
 									<th style="width: 200px;">면제시작일</th>
 									<th style="width: 200px;">면제종료일</th>
-									<th style="width: 200px;">입력자</th>
-									<th style="width: 200px;">입력일시</th>
+									<th style="width: 200px;">등록자</th>
+									<th style="width: 200px;">등록일시</th>
 									<th style="width: 200px;">수정자</th>
 									<th style="width: 200px;">수정일시</th>
 									<th style="width: 200px;">삭제자</th>
@@ -365,7 +365,7 @@ $(document).ready(function(){
 		var dataKey = ctrl.dataset.getCurrent()["EXMPTN_VHCL_ID"];
 
 		ajax.get({
-			url : wctx.url("/BPV/crdn/crdn08/030/list.do"),
+			url : wctx.url("/crdn/crdn08/030/list.do"),
 			data: { "exmptnVhclId" : dataKey },
 			success:(resp) => {
 				let dialogName = "exmptnvhclHistoryDialog";
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08030-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08030-info.jsp
index b906b20..afe4d1a 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08030-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08030-info.jsp
@@ -19,8 +19,8 @@
 							<th style="width: 160px;">면제종료일</th>
 							<th style="width: 100px;">삭제 여부</th>
 							<th style="width: 200px;">삭제사유</th>
-							<th style="width: 160px;">입력자</th>
-							<th style="width: 200px;">입력일시</th>
+							<th style="width: 160px;">등록자</th>
+							<th style="width: 200px;">등록일시</th>
 							<th style="width: 160px;">수정자</th>
 							<th style="width: 200px;">수정일시</th>
 							<th style="width: 160px;">삭제자</th>
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02020-info.jsp
index bdd94c8..2c72d78 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02020-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02020-info.jsp
@@ -495,7 +495,7 @@
                             $("#" + dialogId).attr("name", dialogName);
                             $("#" + dialogId).attr("data-ref-doctx", "${pageName}");
 
-                            AppSupport.setDialogZindex();
+//                            AppSupport.setDialogZindex();
                         }
                         , onClose: () => { $P.fnRefresh(); }                    // 정보 새로고침
                     });
diff --git a/src/main/webapp/WEB-INF/jsp/index.jsp b/src/main/webapp/WEB-INF/jsp/index.jsp
index 0fab1a7..1bb681e 100644
--- a/src/main/webapp/WEB-INF/jsp/index.jsp
+++ b/src/main/webapp/WEB-INF/jsp/index.jsp
@@ -350,7 +350,7 @@
 	  						$("#" + dialogId).attr("name", dialogName);
 	  						$("#" + dialogId).attr("data-ref-doctx", "${pageName}");
 	
-	  						AppSupport.setDialogZindex();
+//	  						AppSupport.setDialogZindex();
 	  					}
 	  					, onClose: onClose
 	  				});