From f83b1d4a951724405f7f8bd6d5a6a99c785bb548 Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Fri, 26 May 2023 14:03:23 +0900
Subject: [PATCH] =?UTF-8?q?fix=20:=20=EC=88=98=EA=B8=B0=20=EB=93=B1?=
 =?UTF-8?q?=EB=A1=9D=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=88=98=EC=A0=95=20?=
 =?UTF-8?q?=EC=A4=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cmm/web/FimsCrackDownMgtController.java   | 21 ++++----
 .../biz/cmm/cmmFimsCrackdownEditPopup.jsp     | 51 ++++++++++++-------
 .../jsp/fims/biz/rt/rtInitialDataForm.jsp     | 21 +++++---
 .../jsp/fims/biz/rt/rtRegltMgtPopup.jsp       |  8 ++-
 4 files changed, 62 insertions(+), 39 deletions(-)

diff --git a/src/main/java/kr/xit/fims/biz/cmm/web/FimsCrackDownMgtController.java b/src/main/java/kr/xit/fims/biz/cmm/web/FimsCrackDownMgtController.java
index 69e66df7..6dee7cdd 100644
--- a/src/main/java/kr/xit/fims/biz/cmm/web/FimsCrackDownMgtController.java
+++ b/src/main/java/kr/xit/fims/biz/cmm/web/FimsCrackDownMgtController.java
@@ -54,6 +54,7 @@ public class FimsCrackDownMgtController extends AbstractController {
 
     @RequestMapping(name = "", value = "/cmmFimsCrackdownEditPopup")
     public ModelAndView cmmFimsCrackdownEditPopup(final FimsCrackdownDTO.Request dto){
+
         ModelAndView mav = new ModelAndView();
 
         mav.addObject("extnlCarUrl", extnlCarUrl);
@@ -65,12 +66,17 @@ public class FimsCrackDownMgtController extends AbstractController {
             mav.addObject("pageTitle", "과태료 시스템 등록");
         }
         FimsConst.CrdnSeCd crdnSeCdEnum = null;
-        for (FimsConst.CrdnSeCd e : FimsConst.CrdnSeCd.values()) {
-            if (e.getCode().equals(dto.getCrdnSeCd())) {
-                crdnSeCdEnum = e;
-                break;
+        if(dto.getCrdnSeCd() != null && !dto.getCrdnSeCd().equals("")){
+            for (FimsConst.CrdnSeCd e : FimsConst.CrdnSeCd.values()) {
+                if (e.getCode().equals(dto.getCrdnSeCd())) {
+                    crdnSeCdEnum = e;
+                    break;
+                }
             }
+        } else {
+            crdnSeCdEnum = FimsConst.CrdnSeCd.UNKNOWN;
         }
+
         mav.addObject("txtTitle", Objects.requireNonNull(crdnSeCdEnum, "초기자료 편집").getDesc());
         mav.setViewName(FimsConst.FIMS_JSP_BASE_PATH + "cmm/cmmFimsCrackdownEditPopup.popup");
 
@@ -113,12 +119,7 @@ public class FimsCrackDownMgtController extends AbstractController {
     public ModelAndView cmmImposePopup(final String bizDiv){
         ModelAndView mav = new ModelAndView(FimsConst.FIMS_JSP_BASE_PATH +"cmm/cmmImposePopup.popup");
         mav.addObject("pageTitle", "과태료 시스템 등록");
-        //mav.addObject("bizDiv", bizDiv);
-        //if(bizDiv.equals(FimsConst.PopupWorkDiv.ENLIGHT.getCode())) {
-        //    mav.addObject("txtTitle", FimsConst.PopupWorkDiv.ENLIGHT.getDesc());
-        //}else {
-        //    mav.addObject("txtTitle", FimsConst.PopupWorkDiv.DISALLOW.getDesc());
-        //}
+
         mav.addObject("txtTitle", "과태료 시스템 등록");
         return mav;
     }
diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownEditPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownEditPopup.jsp
index e4176643..7b10d0d5 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownEditPopup.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownEditPopup.jsp
@@ -231,7 +231,7 @@ Date       Author       Description
           </table>
         </form>
         <div class="container-window-btn1">
-          <div class="container-window-btn-right">
+          <div id="pageNavDiv" class="container-window-btn-right">
             <button type="button" id="double_prev" name="double_prev" class="btn btn-sm btn-pagination">
               <i class="fa-solid fa-angles-left"></i>
             </button>
@@ -246,6 +246,7 @@ Date       Author       Description
               <i class="fa-solid fa-angles-right"></i>
             </button>
           </div>
+          <a href="#" class="btn btn-blue" id="btnInst">등록</a>
           <c:if test="${!isImpose}">
             <a href="#" class="btn btn-blue" id="btnImposeTgt">부과대상</a>
             <a href="#" class="btn btn-blue" id="btnEnlight">계도처리</a>
@@ -605,7 +606,7 @@ Date       Author       Description
       if (!fnPopupBiz.validate()) return;
 
       cmmBizAjax('add', {
-        url: '<c:url value="/cmm/fimsPopup/add.do"/>'
+        url: fimsApiUrl.ADD_RT_REGLT
         , data: $("#frmSearch").serialize()
       })
     }
@@ -666,11 +667,7 @@ Date       Author       Description
    * event
    **************************************************************************/
   $(() => {
-    // $(window).on("unload", function (e) {
-    //   window.opener?.unblockUI();
-    //   window.opener?.callbackSearch();
-    //   return null;
-    // });
+
 
     $("#btnClose").on('click', () => {
 
@@ -684,6 +681,11 @@ Date       Author       Description
 
     });
 
+    $("#btnInst").on('click', () => {
+      fnPopupBiz.add();
+    });
+
+
     $('#addrSearch').on('click', () => CmmPopup.zipPopup());
 
     $('#vhcleSearch').on('click', () => {
@@ -723,13 +725,7 @@ Date       Author       Description
 
     $('#btnImpose').on('click', (e) => {
       alert('과태료 시스템 인터페이스(세올)');
-      // let saveData = fnPopupBiz.getSaveData();
-      //
-      // cmmAjax({
-      //   url: '/fims/biz/cmm/saveImposeTgt.do'
-      //   ,contentType: 'application/json'
-      //   ,data: JSON.stringify(saveData)
-      // })
+
     });
 
     $('#btnRemove').on('click', () => {
@@ -769,11 +765,28 @@ Date       Author       Description
    **************************************************************************/
   $(document).ready(function(){
 
-    fnPopupBiz.search({
-      crdnId: '${param.crdnId}'
-      ,crdnSeCd: '${param.crdnSeCd}'
-      ,crdnSttsCd: '${param.crdnSttsCd}'
-    });
+    if('${param.crdnId}' != ""){
+
+      fnPopupBiz.search({
+        crdnId: '${param.crdnId}'
+        ,crdnSeCd: '${param.crdnSeCd}'
+        ,crdnSttsCd: '${param.crdnSttsCd}'
+      });
+
+      $("#btnInst").hide();
+    } else {
+      $("#pageNavDiv").hide();
+      $("#btnImposeTgt").hide();
+      $("#btnEnlight").hide();
+      $("#btnDisallow").hide();
+
+      $("#btnInst").show();
+
+      $("#crdnRegSeCd").val("20");
+      $("#crdnRegSeCd").attr("disabled","disabled");
+
+      $("#crdnSeCd").removeAttr("disabled");
+    }
 
   });
 
diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtInitialDataForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtInitialDataForm.jsp
index f5771200..8b3dd225 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtInitialDataForm.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtInitialDataForm.jsp
@@ -24,7 +24,8 @@ Date       Author       Description
     <div class="container-page-btn">
         <button type="button" class="btn btn-outline-dark">초기화</button>
         <span class="container-window-btn-right">
-            <button type="button" class="btn btn-darkgray" id="" title="등록 또는 불러오기">등록 또는 불러오기</button>
+            <button type="button" class="btn btn-darkgray" id="btnMenualRegist" title="위반자료수기등록">위반자료수기등록</button>
+            <button type="button" class="btn btn-darkgray" id="" title="불러오기">불러오기</button>
         </span>
     </div>
 
@@ -34,6 +35,13 @@ Date       Author       Description
             <div class="row">
                 <div class="col-11">
                     <div class="row">
+                        <div class="col-12">
+                            <label class="form-label fw-bold form-search-title">시스템구분</label>
+                            <span class="form-search-linebox">
+                            <code:radio grpId="FIM001" id="sysSeCd" name="sysSeCd" defaultSelect='${sessionScope.XitLoginSession.orgnztId}'
+                                        onclick="search$$s()" cls="form-check-input" alt="시스템구분"/>
+                            </span>
+                        </div>
                         <div class="col-12">
                             <select id="sch_date_opt" name="sch_date_opt" class="form-select">
                                 <option value="crdnYmd">단속일자</option>
@@ -49,13 +57,6 @@ Date       Author       Description
                             <code:select id="crdnSttsCd" name="crdnSttsCd"
                                          grpId="FIM010" defaultSelect="01" title="단속처리상태" cls="form-select" alt="단속처리상태" disabled="false"/>
                         </div>
-                        <div class="col-12">
-                            <label class="form-label fw-bold form-search-title">시스템구분</label>
-                            <span class="form-search-linebox">
-                            <code:radio grpId="FIM001" id="sysSeCd" name="sysSeCd" defaultSelect='${sessionScope.XitLoginSession.orgnztId}'
-                                        onclick="search$$s()" cls="form-check-input" alt="시스템구분"/>
-                        </span>
-                        </div>
                         <div class="col-12">
                             <label class="form-label fw-bold form-search-title">단속구분</label>
                             <span class="form-search-linebox">
@@ -408,6 +409,10 @@ Date       Author       Description
 
         $('#btnSearch').on('click', () => search$$s());
 
+        $('#btnMenualRegist').on('click', () => {
+            fnBiz.pagePopup('edit', {});
+        });
+
         $('#btnExtrRegist').on('click', () => {
             fnBiz.pagePopup('file');
         });
diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtRegltMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtRegltMgtPopup.jsp
index 382b3014..def748d0 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtRegltMgtPopup.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtRegltMgtPopup.jsp
@@ -51,9 +51,13 @@
                             <th>단속장소</th>
                             <td colspan=""><input type="text" id="crdnPlc" name="crdnPlc" value="${dto.crdnPlc }"></td>
                             <th>단속시작시간</th>
-                            <td colspan=""><input type="text" id="crdnBgngTm" name="crdnBgngTm" value="${dto.crdnBgngTm }"></td>
+                            <td colspan="">
+                                <input type="text" id="crdnBgngTm" name="crdnBgngTm" data-fmt-type="time" value="${dto.crdnBgngTm }">
+                            </td>
                             <th>단속종료시간</th>
-                            <td><input type="text" id="crdnEndHr" name="crdnEndHr" value="${dto.crdnEndHr }"></td>
+                            <td>
+                                <input type="text" id="crdnEndHr" name="crdnEndHr" data-fmt-type="time" value="${dto.crdnEndHr }">
+                            </td>
                         </tr>
                         <tr>
                             <th>위반법규</th>