From 8db526f8551f4c43be99f56fa2bdaa531cf3e613 Mon Sep 17 00:00:00 2001
From: jjh <jaehyun81@xit.co.kr>
Date: Tue, 16 Jul 2024 09:32:31 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B0=9C=EB=B3=84=EC=B4=9D=EC=A0=95=EB=B3=B4?=
 =?UTF-8?q?=20=ED=99=94=EB=A9=B4=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/excl/opnnSbmsn-mapper.xml |  2 ++
 .../WEB-INF/jsp/fims/sprt/sprt02020-info.jsp  | 10 +++---
 .../WEB-INF/jsp/fims/sprt/sprt02030-info.jsp  | 23 ++++++------
 .../WEB-INF/jsp/fims/sprt/sprt02050-info.jsp  | 36 ++++++++++---------
 4 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/src/main/resources/sql/mapper/fims/excl/opnnSbmsn-mapper.xml b/src/main/resources/sql/mapper/fims/excl/opnnSbmsn-mapper.xml
index d8a39fd7..2f6abce8 100644
--- a/src/main/resources/sql/mapper/fims/excl/opnnSbmsn-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/excl/opnnSbmsn-mapper.xml
@@ -289,8 +289,10 @@
              , OS.ANS_CN            <!-- 답변 내용 -->
              , OS.REG_DT            <!-- 등록 일시 -->
              , OS.RGTR              <!-- 등록자 -->
+             , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = OS.RGTR) AS RGTR_NM <!-- 등록자 명 -->
              , OS.MDFCN_DT          <!-- 수정 일시 -->
              , OS.MDFR              <!-- 수정자 -->
+             , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = OS.MDFR) AS MDFR_NM <!-- 수정자 명 -->
              , (SELECT C.FFNLG_CRDN_AMT*T.WKSN_RDCRT/100 FROM TB_TASK T
                  WHERE C.SGG_CD=T.SGG_CD AND C.TASK_SE_CD=T.TASK_SE_CD AND T.USE_YN='Y') AS RDCT_AMT   <!-- 감경 금액 -->
              , P.RTPYR_ID           <!-- 납부자 ID -->
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 01b52359..2fb3c59d 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
@@ -80,7 +80,7 @@
 						<!-- 위반 내용 -->
 						<div class="col-md-4">
 							<label for="vltnArtcl--${pageName}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end">위반내용</label>
-							<input type="text" class="form-control w-50" id="vltnArtcl--${pageName}" name="vltnArtcl" data-map="VLTN_ARTCL" readonly />
+							<input type="text" class="form-control w-45" id="vltnArtcl--${pageName}" name="vltnArtcl" data-map="VLTN_ARTCL" readonly />
 							<span slot="edit">
 								<template class="dpv"> <!-- 장애인 -->
 									<slot>
@@ -161,22 +161,22 @@
 						</div>
 						<!-- 과태료 단속원금 -->
 						<div class="col-md-3">
-							<label for="ffnlgCrdnAmt--${pageName}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end">과태료 단속원금</label>
+							<label for="ffnlgCrdnAmt--${pageName}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end">과태료단속원금</label>
 							<input type="text" class="form-control w-40 text-sm-end" id="ffnlgCrdnAmt--${pageName}" name="ffnlgCrdnAmt" data-map="FFNLG_CRDN_AMT" data-fmt-type="number" readonly />
 						</div>
 						<!-- 과태료 감경 율 -->
 						<div class="col-md-3">
-							<label for="ffnlgRdcrt--${pageName}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end">과태료 감경율</label>
+							<label for="ffnlgRdcrt--${pageName}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end">과태료감경율</label>
 							<input type="text" class="form-control w-20 text-sm-end" id="ffnlgRdcrt--${pageName}" name="ffnlgRdcrt" data-map="FFNLG_RDCRT" readonly /> %
 						</div>
 						<!-- 과태료 금액 -->
 						<div class="col-md-3">
-							<label for="ffnlgAmt--${pageName}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end">과태료 금액</label>
+							<label for="ffnlgAmt--${pageName}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end">과태료금액</label>
 							<input type="text" class="form-control w-40 text-sm-end" id="ffnlgAmt--${pageName}" name="ffnlgAmt" data-map="FFNLG_AMT" data-fmt-type="number" readonly />
 						</div>
 						<!-- 사전통지 금액 -->
 						<div class="col-md-3">
-							<label for="advntceAmt--${pageName}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end">사전 감경금액</label>
+							<label for="advntceAmt--${pageName}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end">사전감경금액</label>
 							<input type="text" class="form-control w-40 text-sm-end" id="advntceAmt--${pageName}" name="advntceAmt" data-map="ADVNTCE_AMT" data-fmt-type="number" readonly />
 						</div>
 						<!-- 부과 금액 -->
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02030-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02030-info.jsp
index 6df4873f..2baf2f3d 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02030-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02030-info.jsp
@@ -104,18 +104,17 @@
 							<textarea class="form-control w-87" id="picRvwOpnn--${pageName}" name="picRvwOpnn" data-map="PIC_RVW_OPNN" rows="3" data-maxlengthb="1000" readonly>
 							</textarea>
 						</div>
-                        <!-- 수정 일시 -->
-                        <div class="col-md-4">
-                            <label for="mdfcnDt--${pageName}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end">수정일시</label>
-                            <input type="text" class="form-control w-50" id="mdfcnDt--${pageName}" name="mdfcnDt" data-map="MDFCN_DT" readonly />
-                        </div>
-                        <!-- 수정자 -->
-                        <div class="col-md-4">
-                            <label for="mdfrNm--${pageName}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end">수정자</label>
-                            <input type="text" class="form-control w-40" id="mdfrNm--${pageName}" name="mdfrNm" data-map="MDFR_NM" readonly />
+                        <!-- 등록 일시 / 등록자 -->
+                        <div class="col-md-6">
+                            <label for="regDt--${pageName}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end">등록일시</label>
+                            <input type="text" class="form-control w-30" id="regDt--${pageName}" name="regDt" data-map="REG_DT" readonly />
+                            <input type="text" class="form-control w-25" id="rgtrNm--${pageName}" name="rgtrNm" data-map="RGTR_NM" readonly />
                         </div>
-                        <!--  -->
-                        <div class="col-md-4">
+                        <!-- 수정 일시 / 수정자 -->
+                        <div class="col-md-6">
+                            <label for="mdfcnDt--${pageName}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end">수정일시</label>
+                            <input type="text" class="form-control w-30" id="mdfcnDt--${pageName}" name="mdfcnDt" data-map="MDFCN_DT" readonly />
+                            <input type="text" class="form-control w-25" id="mdfrNm--${pageName}" name="mdfrNm" data-map="MDFR_NM" readonly />
                         </div>
 						<!-- 첨부 파일 테이블 -->
 						<div class="table-responsive">
@@ -218,6 +217,8 @@
 			, formats: {
 				  RCPT_YMD: dateFormat
 				, ANS_YMD_TM: datetimeFormat
+				, REG_DT: datetimeFormat
+				, MDFCN_DT: datetimeFormat
 			}
 		});
 
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02050-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02050-info.jsp
index 1c0529e3..80dd3370 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02050-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02050-info.jsp
@@ -54,15 +54,15 @@
 							<label for="etcCn--${pageName}${pageDataName1}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end">기타내용</label>
 							<textarea type="text" class="form-control w-80" id="etcCn--${pageName}${pageDataName1}" name="etcCn" data-map="ETC_CN" rows="3" data-maxlengthb="1000" readonly></textarea>
 						</div>
-						<!-- 등록 일시 -->
+						<!-- 수정 일시 -->
 						<div class="col-md-6">
-							<label for="regDt--${pageName}${pageDataName1}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end">등록일시</label>
-							<input type="text" class="form-control w-50" id="regDt--${pageName}${pageDataName1}" name="regDt" data-map="REG_DT" readonly />
+                            <label for="mdfcnDt--${pageName}${pageDataName1}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end">수정일시</label>
+                            <input type="text" class="form-control w-45" id="mdfcnDt--${pageName}${pageDataName1}" name="mdfcnDt" data-map="MDFCN_DT" readonly />
 						</div>
-						<!-- 등록자 -->
+						<!-- 수정자 -->
 						<div class="col-md-6">
-							<label for="rgtrNm--${pageName}${pageDataName1}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end">등록자</label>
-							<input type="text" class="form-control w-40" id="rgtrNm--${pageName}${pageDataName1}" name="rgtrNm" data-map="RGTR_NM" readonly />
+                            <label for="mdfrNm--${pageName}${pageDataName1}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end">수정자</label>
+                            <input type="text" class="form-control w-40" id="mdfrNm--${pageName}${pageDataName1}" name="mdfrNm" data-map="MDFR_NM" readonly />
 						</div>
 					</div> <!-- <div class="row g-1"> -->
 				</form>
@@ -110,28 +110,28 @@
 						</div>
 						<!-- 부과제외 구분 명 -->
 						<div class="col-md-6">
-							<label for="levyExclSeNm--${pageName}${pageDataName2}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end">부과제외 구분</label>
+							<label for="levyExclSeNm--${pageName}${pageDataName2}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end">부과제외구분</label>
 							<input type="text" class="form-control w-30" id="levyExclSeNm--${pageName}${pageDataName2}" name="levyExclSeNm" data-map="LEVY_EXCL_SE_NM" readonly />
 						</div>
 						<!-- 부과제외 사유 명 -->
 						<div class="col-md-6">
-							<label for="levyExclRsnNm--${pageName}${pageDataName2}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end">부과제외 사유</label>
+							<label for="levyExclRsnNm--${pageName}${pageDataName2}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end">부과제외사유</label>
 							<input type="text" class="form-control w-60" id="levyExclRsnNm--${pageName}${pageDataName2}" name="levyExclRsnNm" data-map="LEVY_EXCL_RSN_NM" readonly />
 						</div>
 						<!-- 기타 내용 -->
 						<div class="col-md-12">
-							<label for="etcCn--${pageName}${pageDataName2}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end">기타 내용</label>
+							<label for="etcCn--${pageName}${pageDataName2}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end">기타내용</label>
 							<textarea type="text" class="form-control w-80" id="etcCn--${pageName}${pageDataName2}" name="etcCn" data-map="ETC_CN" rows="3" data-maxlengthb="1000" readonly></textarea>
 						</div>
-						<!-- 등록 일시 -->
+						<!-- 수정 일시 -->
 						<div class="col-md-6">
-							<label for="regDt--${pageName}${pageDataName2}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end">등록 일시</label>
-							<input type="text" class="form-control w-45" id="regDt--${pageName}${pageDataName2}" name="regDt" data-map="REG_DT" readonly />
+                            <label for="mdfcnDt--${pageName}${pageDataName2}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end">수정일시</label>
+                            <input type="text" class="form-control w-45" id="mdfcnDt--${pageName}${pageDataName2}" name="mdfcnDt" data-map="MDFCN_DT" readonly />
 						</div>
-						<!-- 등록자 -->
+						<!-- 수정자 -->
 						<div class="col-md-6">
-							<label for="rgtrNm--${pageName}${pageDataName2}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end">등록자</label>
-							<input type="text" class="form-control w-40" id="rgtrNm--${pageName}${pageDataName2}" name="rgtrNm" data-map="RGTR_NM" readonly />
+                            <label for="mdfrNm--${pageName}${pageDataName2}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end">수정자</label>
+                            <input type="text" class="form-control w-40" id="mdfrNm--${pageName}${pageDataName2}" name="mdfrNm" data-map="MDFR_NM" readonly />
 						</div>
 					</div> <!-- <div class="row g-1"> -->
 				</form>
@@ -153,7 +153,7 @@
 					<!-- DataTables(그리드) -->
 					<div class="card-datatable text-nowrap">
 						<div class="dataTables_wrapper dt-bootstrap5 no-footer" id="DataTables_Table_0_wrapper--${pageName}">
-							<div class="table-responsive ox-scroll oy-scroll h-px-350" id="table-responsive-crdnSttsHstry--${pageName}">
+							<div class="table-responsive ox-scroll oy-scroll h-px-300" id="table-responsive-crdnSttsHstry--${pageName}">
 								<table class="table-layout-fixed dataTable datatables-ajax table table-bordered no-footer"
 										id="DataTables_Table_0--${pageName}" aria-describedby="DataTables_Table_0_info">
 									<thead class="sticky-thead">
@@ -203,7 +203,7 @@
 					<!-- DataTables(그리드) -->
 					<div class="card-datatable text-nowrap">
 						<div class="dataTables_wrapper dt-bootstrap5 no-footer" id="DataTables_Table_1_wrapper--${pageName}">
-							<div class="table-responsive ox-scroll oy-scroll h-px-350" id="table-responsive-1--${pageName}">
+							<div class="table-responsive ox-scroll oy-scroll h-px-300" id="table-responsive-1--${pageName}">
 								<table class="table-layout-fixed dataTable datatables-ajax table table-bordered no-footer"
 										id="DataTables_Table_1--${pageName}" aria-describedby="DataTables_Table_0_info">
 									<thead class="sticky-thead">
@@ -272,6 +272,7 @@
 				  RDCT_YMD: dateFormat
 				, RDCT_AMT: numberFormat
 				, REG_DT: datetimeFormat
+				, MDFCN_DT: datetimeFormat
 			}
 		});
 
@@ -284,6 +285,7 @@
 			, formats: {
 				  LEVY_EXCL_YMD: dateFormat
 				, REG_DT: datetimeFormat
+				, MDFCN_DT: datetimeFormat
 			}
 		});