From 39803cbffa131f3e7b784b5082de7134e0893af7 Mon Sep 17 00:00:00 2001
From: jjh <jaehyun81@xit.co.kr>
Date: Thu, 21 Sep 2023 16:12:08 +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-=20=EC=B2=98=EB=A6=AC=EC=83=81=EC=84=B8=EC=A0=95=EB=B3=B4?=
 =?UTF-8?q?=20-=20=EC=A3=BC=EC=86=8C=EB=B3=80=EB=8F=99=EC=9D=B4=EB=A0=A5?=
 =?UTF-8?q?=20=EC=A1=B0=ED=9A=8C=20=EC=88=98=EC=A0=95.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xit/fims/sprt/web/Sprt02Controller.java   |  2 +-
 .../fims/cmmn/crdnPayerHstry-mapper.xml       |  3 +
 .../sql/mapper/fims/sprt/totalInfo-mapper.xml |  5 +-
 .../jsp/fims/payer/payer01020-info.jsp        |  2 +
 .../WEB-INF/jsp/fims/sprt/sprt02020-info.jsp  | 37 ++++++++----
 .../WEB-INF/jsp/fims/sprt/sprt02050-info.jsp  | 60 ++++++++++---------
 6 files changed, 66 insertions(+), 43 deletions(-)

diff --git a/src/main/java/cokr/xit/fims/sprt/web/Sprt02Controller.java b/src/main/java/cokr/xit/fims/sprt/web/Sprt02Controller.java
index 76534374..8372bc4a 100644
--- a/src/main/java/cokr/xit/fims/sprt/web/Sprt02Controller.java
+++ b/src/main/java/cokr/xit/fims/sprt/web/Sprt02Controller.java
@@ -365,7 +365,7 @@ public class Sprt02Controller extends ApplicationController {
 		// 단속 납부자 이력(TB_CRDN_PAYER_HSTRY) 조회
 		CrdnPayerHstryQuery crdnPayerHstryQuery = new CrdnPayerHstryQuery();
 		crdnPayerHstryQuery.setCrdnId(req.getCrdnId());
-		crdnPayerHstryQuery.setOrderBy("CPH.REG_DT DESC, CPH.CHG_HSTRY_ID DESC");
+		crdnPayerHstryQuery.setOrderBy("PH.REG_DT DESC, PH.RTPYR_ID DESC, PH.HSTRY_SN DESC");
 
 		List<?> crdnPayerHstry = crdnPayerHstryService.getCrdnPayerHstrys(crdnPayerHstryQuery);
 
diff --git a/src/main/resources/sql/mapper/fims/cmmn/crdnPayerHstry-mapper.xml b/src/main/resources/sql/mapper/fims/cmmn/crdnPayerHstry-mapper.xml
index 091e8a07..c0a1a66d 100644
--- a/src/main/resources/sql/mapper/fims/cmmn/crdnPayerHstry-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/cmmn/crdnPayerHstry-mapper.xml
@@ -26,6 +26,9 @@
              , PH.RTPYR_NM                                                                                      /* 납부자 명 */
              , PH.ZIP                                                                                           /* 우편번호 */
              , PH.WHOL_ADDR                                                                                     /* 전체 주소 */
+             , PH.REG_DT                                                                AS PH_REG_DT            /* 등록 일시 */
+             , PH.RGTR                                                                  AS PH_RGTR              /* 등록자 */
+             , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = PH.RGTR)                AS PH_RGTR_NM           /* 등록자 명 */
           FROM TB_CRDN_PAYER_HSTRY  CPH
          INNER JOIN TB_PAYER_HSTRY  PH  ON (CPH.RTPYR_ID = PH.RTPYR_ID)
     </sql>
diff --git a/src/main/resources/sql/mapper/fims/sprt/totalInfo-mapper.xml b/src/main/resources/sql/mapper/fims/sprt/totalInfo-mapper.xml
index 181ea6fb..ff3631dd 100644
--- a/src/main/resources/sql/mapper/fims/sprt/totalInfo-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/sprt/totalInfo-mapper.xml
@@ -21,7 +21,7 @@
     LEFT OUTER JOIN TB_LEVY         L   ON (C.CRDN_ID   = L.CRDN_ID AND L.DEL_YN = 'N')                         /* 부과 대장 */
 	</sql>
 
-	<select id="selectCrdnInfo" parameterType="String" resultType="dataobject">/* 개별총정보 조회(sprt02Mapper.selectCrdnPayerInfo) */
+	<select id="selectCrdnInfo" parameterType="String" resultType="dataobject">/* 개별총정보 조회(sprt02Mapper.selectCrdnInfo) */
         <include refid="selectCrdn" />
          WHERE C.CRDN_ID                =  #{crdnId}                                                            /* 단속 ID */
 	</select>
@@ -116,6 +116,9 @@
              , P.ZIP                                                                                            /* 우편번호 */
              , P.ADDR                                                                                           /* 주소 */
              , P.DTL_ADDR                                                                                       /* 상세 주소 */
+             , P.WHOL_ADDR                                                                                      /* 전체 주소 */
+             , P.MDFCN_DT                                                               AS P_MDFCN_DT           /* 수정 일시 */
+             , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = P.MDFR)                 AS P_MDFR_NM            /* 수정자 명 */
              , CC.CVLCPT_APLY_SE_CD                                                                             /* 민원 신청 구분 코드 */
              , CC.DSTRBNC_YN                                                                                    /* 1면 방해 여부 */
              , CC.CVLCPT_RCPT_YMD                                                                               /* 민원 접수 일자 */
diff --git a/src/main/webapp/WEB-INF/jsp/fims/payer/payer01020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/payer/payer01020-info.jsp
index 55f3af0f..634cb3eb 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/payer/payer01020-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/payer/payer01020-info.jsp
@@ -177,6 +177,8 @@
 
   		let create = isEmpty(info.rtpyrId);
 
+  		info.rtpyrInptSeCd = "01";						// 납부자 입력 구분 코드
+
 		ajax.post({
 			  url : !create ? ${pageName}Control.urls.update : ${pageName}Control.urls.create
 			, data : info
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 0fb8fc99..d0ca3265 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
@@ -243,18 +243,28 @@
 						<!-- 납부자 번호 -->
 						<div class="col-md-4">
 							<label for="rtpyrNo--${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="rtpyrNo--${pageName}" name="rtpyrNo" data-map="RTPYR_NO" readonly />
+							<input type="text" class="form-control w-40" id="rtpyrNo--${pageName}" name="rtpyrNo" data-map="RTPYR_NO" readonly />
 						</div>
-						<!-- 납부자 주소 --><!-- 납부자 우편번호 -->
-						<div class="col-md-12">
-							<label for="addr--${pageName}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end">주소</label>
-							<input type="text" class="form-control w-80" id="addr--${pageName}" name="addr" data-map="ADDR" readonly />
-							<input type="text" class="form-control w-px-75" id="zip--${pageName}" name="zip" data-map="ZIP" readonly />
+						<!-- 납부자 전화번호 -->
+						<div class="col-md-4">
+							<label for="addr--${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="addr--${pageName}" name="addr" data-map="RTPYR_TELNO" readonly />
+						</div>
+						<!-- 납부자 휴대 전화번호 -->
+						<div class="col-md-4">
+							<label for="rtpyrMblTelno--${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="rtpyrMblTelno--${pageName}" name="rtpyrMblTelno" data-map="RTPYR_MBL_TELNO" readonly />
+						</div>
+						<!-- 납부자 이메일 -->
+						<div class="col-md-4">
+							<label for="rtpyrEml--${pageName}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end">이메일</label>
+							<input type="text" class="form-control w-60" id="rtpyrEml--${pageName}" name="rtpyrEml" data-map="RTPYR_EML" readonly />
 						</div>
-						<!-- 납부자 상세주소 -->
+						<!-- 납부자 전체주소 -->
 						<div class="col-md-12">
-							<label for="dtlAddr--${pageName}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end">상세 주소</label>
-							<input type="text" class="form-control w-87" id="dtlAddr--${pageName}" name="dtlAddr" data-map="DTL_ADDR" readonly />
+							<label for="wholAddr--${pageName}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end">주소</label>
+							<input type="text" class="form-control w-80" id="wholAddr--${pageName}" name="wholAddr" data-map="WHOL_ADDR" readonly />
+							<input type="text" class="form-control w-px-75" id="zip--${pageName}" name="zip" data-map="ZIP" readonly />
 						</div>
 						<!-- 납부자 입력 구분 코드 -->
 						<div class="col-md-4">
@@ -263,13 +273,13 @@
 						</div>
 						<!-- 수정 일시 -->
 						<div class="col-md-4">
-							<label for="payerMdfcnDt--${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="payerMdfcnDt--${pageName}" name="payerMdfcnDt" data-map="PAYER_MDFCN_DT" readonly />
+							<label for="pMdfcnDt--${pageName}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end">수정 일시</label>
+							<input type="text" class="form-control w-45" id="pMdfcnDt--${pageName}" name="pMdfcnDt" data-map="P_MDFCN_DT" readonly />
 						</div>
 						<!-- 수정자 -->
 						<div class="col-md-4">
-							<label for="payerMdfr--${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="payerMdfr--${pageName}" name="payerMdfr" data-map="PAYER_MDFR" readonly />
+							<label for="pMdfrNm--${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="pMdfrNm--${pageName}" name="pMdfrNm" data-map="P_MDFR_NM" readonly />
 						</div>
 					</div>
 				</div> <!-- 납부자 정보 <div class="card"> -->
@@ -335,6 +345,7 @@
 			, SUM_AMT : numberFormat											// 합계 금액
 			, CRDN_BGNG_TM : timeFormat
 			, CRDN_END_TM : timeFormat
+			, P_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 fd148cbd..0e857baa 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
@@ -150,28 +150,30 @@
 					<div class="card-datatable text-nowrap">
 						<div id="DataTables_Table_0_wrapper--${pageName}${pageDataName3}" class="dataTables_wrapper dt-bootstrap5 no-footer">
 							<div id="table-responsive--${pageName}${pageDataName3}" class="table-responsive" style="overflow-x:scroll; height:340px; overflow-y:scroll;" >
-								<table class="dataTable datatables-ajax table table-bordered no-footer" id="DataTables_Table_0--${pageName}${pageDataName3}" aria-describedby="DataTables_Table_0_info">
-									<thead>
+								<table class="table-layout-fixed dataTable datatables-ajax table table-bordered no-footer" id="DataTables_Table_0--${pageName}${pageDataName3}" aria-describedby="DataTables_Table_0_info">
+									<thead class="sticky-thead">
 										<tr id="theadTr--${pageName}${pageDataName3}">
-											<th>등록일시</th>
-											<th>등록사용자</th>
-											<th>단속상태</th>
-											<th>기타내용</th>
+											<th class="cmn" style="width: 180px;">등록일시</th>
+											<th class="cmn" style="width: 140px;">등록사용자</th>
+											<th class="cmn" style="width: 120px;">단속상태</th>
+											<th class="cmn" style="width: 280px;">기타내용</th>
+											<th class="cmn dummy-th"></th>
 										</tr>
 									</thead>
 									<tbody id="tbody--${pageName}${pageDataName3}">
 									</tbody>
 									<template id="${infoPrefix}Row--${pageName}${pageDataName3}">
 										<tr data-key="{STTS_HSTRY_ID}">
-											<td class="text-center" onclick="{onclick}">{REG_DT}</td>
-											<td class="text-center" onclick="{onclick}">{RGTR_NM}</td>
-											<td class="text-center" onclick="{onclick}">{CRDN_STTS_NM}</td>
-											<td class="text-start" onclick="{onclick}">{ETC_CN}</td>
+											<td class="cmn text-center" onclick="{onclick}">{REG_DT}</td>
+											<td class="cmn text-center" onclick="{onclick}">{RGTR_NM}</td>
+											<td class="cmn text-center" onclick="{onclick}">{CRDN_STTS_NM}</td>
+											<td class="cmn text-start" onclick="{onclick}">{ETC_CN}</td>
+											<td class="cmn dummy-td"></td>
 										</tr>
 									</template>
 									<template id="${infoPrefix}NotFound--${pageName}${pageDataName3}">
 										<tr class="odd">
-											<td valign="top" colspan="6" class="dataTables_empty text-center">처리상태 이력 정보를 찾지 못했습니다.</td>
+											<td valign="top" colspan="5" class="dataTables_empty text-center">처리상태 이력 정보를 찾지 못했습니다.</td>
 										</tr>
 									</template>
 								</table>
@@ -192,32 +194,32 @@
 				<div class="row g-1">
 					<!-- DataTables(그리드) -->
 					<div class="card-datatable text-nowrap">
-						<div id="DataTables_Table_0_wrapper--${pageName}${pageDataName4}" class="dataTables_wrapper dt-bootstrap5 no-footer">
-							<div id="table-responsive--${pageName}${pageDataName4}" class="table-responsive" style="overflow-x:scroll; height:340px; overflow-y:scroll;" >
-								<table class="dataTable datatables-ajax table table-bordered no-footer" id="DataTables_Table_0--${pageName}${pageDataName4}" aria-describedby="DataTables_Table_0_info">
-									<thead>
+						<div class="dataTables_wrapper dt-bootstrap5 no-footer" id="DataTables_Table_0_wrapper--${pageName}${pageDataName4}">
+							<div class="table-responsive" id="table-responsive--${pageName}${pageDataName4}" style="overflow-x:scroll; height:340px; overflow-y:scroll;" >
+								<table class="table-layout-fixed dataTable datatables-ajax table table-bordered no-footer" id="DataTables_Table_0--${pageName}${pageDataName4}" aria-describedby="DataTables_Table_0_info">
+									<thead class="sticky-thead">
 										<tr id="theadTr--${pageName}${pageDataName4}">
-											<th>등록일시</th>
-											<th>등록사용자</th>
-											<th>납부자명</th>
-											<th>우편번호</th>
-											<th>전체주소</th>
+											<th class="cmn" style="width: 180px;">등록일시</th>
+											<th class="cmn" style="width: 140px;">등록사용자</th>
+											<th class="cmn" style="width: 90px;">우편번호</th>
+											<th class="cmn" style="width: 320px;">전체주소</th>
+											<th class="cmn dummy-th"></th>
 										</tr>
 									</thead>
 									<tbody id="tbody--${pageName}${pageDataName4}">
 									</tbody>
 									<template id="${infoPrefix}Row--${pageName}${pageDataName4}">
 										<tr data-key="{CHG_HSTRY_ID}">
-											<td class="text-center" onclick="{onclick}">{REG_DT}</td>
-											<td class="text-center" onclick="{onclick}">{RGTR_NM}</td>
-											<td class="text-start" onclick="{onclick}">{RTPYR_NM}</td>
-											<td class="text-center" onclick="{onclick}">{ZIP}</td>
-											<td class="text-start" onclick="{onclick}">{WHOL_ADDR}</td>
+											<td class="cmn text-center" onclick="{onclick}">{PH_REG_DT}</td>
+											<td class="cmn text-center" onclick="{onclick}">{PH_RGTR_NM}</td>
+											<td class="cmn text-center" onclick="{onclick}">{ZIP}</td>
+											<td class="cmn text-start" onclick="{onclick}">{WHOL_ADDR}</td>
+											<td class="cmn dummy-td"></td>
 										</tr>
 									</template>
 									<template id="${infoPrefix}NotFound--${pageName}${pageDataName4}">
 										<tr class="odd">
-											<td valign="top" colspan="5" class="dataTables_empty text-center">주소변동 이력 정보를 찾지 못했습니다.</td>
+											<td valign="top" colspan="6" class="dataTables_empty text-center">주소변동 이력 정보를 찾지 못했습니다.</td>
 										</tr>
 									</template>
 								</table>
@@ -299,7 +301,7 @@
 		, dataGetter : obj => obj.crdnPayerHstryList
 		, appendData : true
 		, formats : {
-			REG_DT : datetimeFormat
+			PH_REG_DT : datetimeFormat
 		}
 		, onDatasetChange : obj => {
 			renderList${pageName}${pageDataName4}();
@@ -548,7 +550,9 @@
 
 	// 이벤트 설정
 	setEvent${pageName} = () => {
-
+		// DataTables width 변경 조정
+		$("#DataTables_Table_0--${pageName}${pageDataName3}").find("th").resizable( {handles : "e"} );
+		$("#DataTables_Table_0--${pageName}${pageDataName4}").find("th").resizable( {handles : "e"} );
 	}
 
 	/**************************************************************************