From 0bb9e6da70b587f0e1c6f42bcf5f081807120eda Mon Sep 17 00:00:00 2001
From: JoJH <jaehyun81@xit.co.kr>
Date: Mon, 28 Oct 2024 11:19:13 +0900
Subject: [PATCH] =?UTF-8?q?1.=20=EC=9E=84=EB=8C=80=EC=B0=A8=EA=B3=84?=
 =?UTF-8?q?=EC=95=BD=20=EB=93=B1=EB=A1=9D=20=EC=A1=B0=ED=9A=8C=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95.=202.=20=EB=8B=A8=EC=86=8D=EC=A1=B0=ED=9A=8C=20?=
 =?UTF-8?q?=EB=B0=8F=20=EB=82=A9=EB=B6=80=EC=95=88=EB=82=B4=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/jsp/fims/rent/rent02010-main.jsp  | 21 ++++++++++---------
 .../WEB-INF/jsp/fims/rent/rent02050-main.jsp  |  3 ++-
 .../WEB-INF/jsp/fims/rent/rent03010-main.jsp  |  4 +++-
 .../WEB-INF/jsp/fims/rent/rent03020-info.jsp  |  4 ++--
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/fims/rent/rent02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/rent/rent02010-main.jsp
index 7cb8381b..96f009fd 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/rent/rent02010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/rent/rent02010-main.jsp
@@ -353,8 +353,9 @@
 
             // 기본 데이터 설정
             $P.$findn("schCrdnYmdFrom").datepicker("setDate", "2024-06-01");    // 단속 일자 시작
-            $P.$findn("schCrdnYmdTo").datepicker("setDate", TODAY());           // 단속 일자 종료
-            $P.$findn("schVhrno").val("12보3663");                              // 자동차등록번호
+            $P.$findn("schCrdnYmdTo").datepicker("setDate", "2024-06-30");      // 단속 일자 종료
+//            $P.$findn("schCrdnYmdFrom").datepicker("setDate", DateSupport.getAddDay(-10));  // 단속 일자 시작
+//            $P.$findn("schCrdnYmdTo").datepicker("setDate", TODAY());           // 단속 일자 종료
             $P.$findn("byOutput").val("동적 검색");                             // 동적 검색
 
             // 그리드 th
@@ -397,14 +398,14 @@
             let ymdTo = new Date($P.$findn("schCrdnYmdTo").val());
             let diffDays = (ymdTo.getTime() - ymdFrom.getTime()) / (1000 * 60 * 60 * 24);
 
-//             if (diffDays > 30) {
-//                 dialog.alert({
-//                       content: "단속일자 기간을 최대 30일 이내로 지정하시기 바랍니다."
-//                     , init: () => { AppSupport.setDialogZindex(); }
-//                     , onOK: () => { }
-//                 });
-//                 return;
-//             }
+            if (diffDays > 30) {
+                dialog.alert({
+                      content: "단속일자 기간을 최대 30일 이내로 지정하시기 바랍니다."
+                    , init: () => { AppSupport.setDialogZindex(); }
+                    , onOK: () => { }
+                });
+                return;
+            }
 
             if (tabName == "계약서등록") {
                 $P.ctrl.query.dmndYn = "N";                                      // 변경 요청 여부 N
diff --git a/src/main/webapp/WEB-INF/jsp/fims/rent/rent02050-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/rent/rent02050-main.jsp
index d6a42946..6450cb3a 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/rent/rent02050-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/rent/rent02050-main.jsp
@@ -350,7 +350,8 @@
             // 기본 데이터 설정
             $P.$findn("schCrdnYmdFrom").datepicker("setDate", DateSupport.getAddDay(-365)); // 단속 일자 시작
             $P.$findn("schCrdnYmdTo").datepicker("setDate", TODAY());                       // 단속 일자 종료
-            $P.$findn("schVhrno").val("12보3663");                                          // 자동차등록번호
+//          $P.$findn("schCrdnYmdFrom").datepicker("setDate", DateSupport.getAddDay(-10));    // 단속 일자 시작
+//          $P.$findn("schCrdnYmdTo").datepicker("setDate", TODAY());             // 단속 일자 종료
             $P.$findn("byOutput").val("동적 검색");                             // 동적 검색
 
             // 그리드 th
diff --git a/src/main/webapp/WEB-INF/jsp/fims/rent/rent03010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/rent/rent03010-main.jsp
index 23fc09ba..064b07a4 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/rent/rent03010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/rent/rent03010-main.jsp
@@ -108,6 +108,7 @@
                                 <th class="cmn" style="width: 160px;">업무구분</th>
                                 <th class="cmn" style="width: 180px;" onclick="FimsSupport.searchFromGridTitle('CRDN_YMD', this.innerText, 'ymd', '');">단속일시</th>
                                 <th class="cmn" style="width: 160px;" onclick="FimsSupport.searchFromGridTitle('VHRNO', this.innerText, 'match', 'part');">자동차등록번호</th>
+                                <th class="cmn" style="width: 120px;" onclick="FimsSupport.searchFromGridTitle('RTPYR_SE_CD', this.innerText, 'codeValue', 'FIM011');">납부자구분</th>
                                 <th class="cmn" style="width: 160px;" onclick="FimsSupport.searchFromGridTitle('RTPYR_NM', this.innerText, 'match', 'part');">납부자명</th>
                                 <th class="cmn" style="width: 160px;" onclick="FimsSupport.searchFromGridTitle('CRDN_STDG_NM', this.innerText, 'match', 'part');">단속법정동</th>
                                 <th class="cmn" style="width: 280px;" onclick="FimsSupport.searchFromGridTitle('CRDN_PLC', this.innerText, 'match', 'part');">단속장소</th>
@@ -151,6 +152,7 @@
                                     <td class="cmn text-center" onclick ondblclick>{TASK_SE_NM}</td>
                                     <td class="cmn text-center" onclick ondblclick>{CRDN_DT}</td>
                                     <td class="cmn text-start"  onclick ondblclick>{VHRNO}</td>
+                                    <td class="cmn text-center" onclick ondblclick>{RTPYR_SE_NM}</td>
                                     <td class="cmn text-start"  onclick ondblclick>{RTPYR_NM}</td>
                                     <td class="cmn text-center" onclick ondblclick>{CRDN_STDG_NM}</td>
                                     <td class="cmn text-start"  onclick ondblclick>{CRDN_PLC}</td>
@@ -187,7 +189,7 @@
                             </template>
                             <template name="tmpltNotFound">
                                 <tr class="cmn">
-                                    <td valign="top" colspan="37" class="dataTables_empty text-center">${prefixName} 정보를 찾지 못했습니다.</td>
+                                    <td valign="top" colspan="38" class="dataTables_empty text-center">${prefixName} 정보를 찾지 못했습니다.</td>
                                 </tr>
                             </template>
                         </table>
diff --git a/src/main/webapp/WEB-INF/jsp/fims/rent/rent03020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/rent/rent03020-info.jsp
index 0aa5c53d..628e2271 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/rent/rent03020-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/rent/rent03020-info.jsp
@@ -54,8 +54,8 @@
                             <input is="id-input" type="text" class="form-control w-40" name="vhclColr" data-map="VHCL_COLR" readonly />
                         </div>
                         <div class="col-md-6">
-                            <label is="name-label" class="col-form-label bg-lighter pe-2 w-px-120 text-sm-end" for="rtpyrNoMask">납부자번호</label>
-                            <input is="id-input" type="text" class="form-control w-40" name="rtpyrNoMask" data-map="RTPYR_NO_MASK" readonly />
+                            <label is="name-label" class="col-form-label bg-lighter pe-2 w-px-120 text-sm-end" for="rtpyrSeNm">납부자구분</label>
+                            <input is="id-input" type="text" class="form-control w-25" name="rtpyrSeNm" data-map="RTPYR_SE_NM" readonly />
                         </div>
                         <div class="col-md-6">
                             <label is="name-label" class="col-form-label bg-lighter pe-2 w-px-120 text-sm-end" for="rtpyrNm">납부자명</label>