From 2b1e7baf6fb22d6b822eb0d4d45de7d68c2b21c1 Mon Sep 17 00:00:00 2001
From: jjh <jaehyun81@xit.co.kr>
Date: Fri, 6 Oct 2023 18:16:55 +0900
Subject: [PATCH] =?UTF-8?q?=EC=82=AC=EC=A0=84=ED=86=B5=EC=A7=80=20?=
 =?UTF-8?q?=EB=B0=9C=EC=86=A1=20=EB=8C=80=EC=83=81=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/sndb/sndng-mapper.xml     | 33 ++++++++++++-------
 .../WEB-INF/jsp/fims/sndb/sndb01010-main.jsp  | 23 +++++++++----
 .../WEB-INF/jsp/fims/sndb/sndb01020-info.jsp  |  6 ++--
 .../WEB-INF/jsp/fims/sndb/sndb01050-main.jsp  | 23 ++++++++++---
 4 files changed, 60 insertions(+), 25 deletions(-)

diff --git a/src/main/resources/sql/mapper/fims/sndb/sndng-mapper.xml b/src/main/resources/sql/mapper/fims/sndb/sndng-mapper.xml
index 7da90459..9d9e3bd2 100644
--- a/src/main/resources/sql/mapper/fims/sndb/sndng-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/sndb/sndng-mapper.xml
@@ -146,13 +146,13 @@
              , CC.CVLCPT_RCPT_YMD                                                                               <!-- 민원 접수 일자 -->
              , CC.CVLCPT_APLY_NO                                                                                <!-- 민원 신청 번호 -->
              , CC.CVLCPT_RCPT_NO                                                                                <!-- 민원 접수 번호 -->
+             , CC.CVLCPT_APLCNT_NM                                                                              <!-- 민원 신청인 명 -->
              , CC.CVLCPT_APLY_DT                                                                                <!-- 민원 신청 일시 -->
-             , CC.CVLCPT_APLY_TTL_NM                                                                            <!-- 민원 신청 제목 명 -->
-             , CC.CVLCPT_GIST                                                                                   <!-- 민원 요지 -->
+             , CC.CVLCPT_PRCS_PIC_NM                                                                            <!-- 민원 처리 담당자 명 -->
+             , CC.CVLCPT_PRCS_CD                                                                                <!-- 민원 처리 코드 -->
              , (SELECT FN_GET_CODE_NM('FIM017', CC.CVLCPT_PRCS_CD) FROM DUAL)           AS CVLCPT_PRCS_NM       <!-- 민원 처리 명 -->
-             , CC.CVLCPT_PRCS_SUMRY                                                                             <!-- 민원 처리 요약 -->
-             , CC.CVLCPT_PRCS_RSLT_CN                                                                           <!-- 민원 처리 결과 내용 -->
              , CC.CVLCPT_PRCS_CMPTN_DT                                                                          <!-- 민원 처리 완료 일시 -->
+             , CC.CVLCPT_TRSM_CD                                                                                <!-- 민원 전송 코드 -->
              , (SELECT FN_GET_CODE_NM('FIM018', CC.CVLCPT_TRSM_CD) FROM DUAL)           AS CVLCPT_TRSM_NM       <!-- 민원 전송 명 -->
              , CC.CVLCPT_TRSM_DT                                                                                <!-- 민원 전송 일시 -->
              , P.RTPYR_ID                                                                                       <!-- 납부자 ID -->
@@ -168,15 +168,12 @@
              , LE.LEVY_EXCL_YMD                                                                                 <!-- 부과 제외 일자 -->
              , LE.LEVY_EXCL_RSN_CD                                                                              <!-- 부과 제외 사유 코드 -->
              , (SELECT FN_GET_CODE_NM('FIM022', LE.LEVY_EXCL_RSN_CD) FROM DUAL)         AS LEVY_EXCL_RSN_NM     <!-- 부과 제외 사유 명 -->
-             , LE.ETC_CN                                                                                        <!-- 기타 내용 -->
-             , L.LEVY_ID                                                                                        <!-- 부과 ID -->
           FROM TB_CRDN              C
          INNER JOIN TB_CRDN_ADI     CA  ON (C.CRDN_ID   = CA.CRDN_ID)
          INNER JOIN TB_VLTN_INFO    VI  ON (C.VLTN_ID   = VI.VLTN_ID)
     LEFT OUTER JOIN TB_CRDN_CVLCPT  CC  ON (C.LINK_ID   = CC.CVLCPT_LINK_ID AND C.CVLCPT_LINK_YN = 'Y' AND CC.DEL_YN = 'N')
     LEFT OUTER JOIN TB_PAYER        P   ON (C.RTPYR_ID  = P.RTPYR_ID)
     LEFT OUTER JOIN TB_LEVY_EXCL    LE  ON (C.CRDN_ID   = LE.CRDN_ID AND LE.DEL_YN = 'N')
-    LEFT OUTER JOIN TB_LEVY         L   ON (C.CRDN_ID   = L.CRDN_ID  AND L.DEL_YN  = 'N')
 	</sql>
 
     <select id="selectWrngSndngTrgtList" parameterType="map" resultType="dataobject">/* 계고장 발송 대상 목록 조회(sndngMapper.selectWrngSndngTrgtList) */
@@ -295,9 +292,14 @@
                     <choose>
                         <when test="by == 'levyExclYmd'"> LE.LEVY_EXCL_YMD </when>
                         <when test="by == 'levyExclRsnCd'"> LE.LEVY_EXCL_RSN_CD </when>
-                        <when test="by == 'etcCn'"> LE.ETC_CN </when>
+                        <when test="by == 'cvlcptAplyNo'"> CC.CVLCPT_APLY_NO </when>
+                        <when test="by == 'cvlcptRcptNo'"> CC.CVLCPT_RCPT_NO </when>
+                        <when test="by == 'cvlcptRcptYmd'"> CC.CVLCPT_RCPT_YMD </when>
+                        <when test="by == 'cvlcptPrcsPicNm'"> CC.CVLCPT_PRCS_PIC_NM </when>
+                        <when test="by == 'cvlcptPrcsCd'"> CC.CVLCPT_PRCS_CD </when>
                         <when test="by == 'crdnYmd'"> C.CRDN_YMD </when>
                         <when test="by == 'vhrno'"> C.VHRNO </when>
+                        <when test="by == 'vltnArtcl'"> VI.VLTN_ARTCL </when>
                         <when test="by == 'crdnStdgNm'"> C.CRDN_STDG_NM </when>
                         <when test="by == 'crdnPlc'"> C.CRDN_PLC </when>
                         <when test="by == 'ffnlgCrdnAmt'"> C.FFNLG_CRDN_AMT </when>
@@ -379,10 +381,14 @@
              , CC.CVLCPT_RCPT_YMD                                                                               <!-- 민원 접수 일자 -->
              , CC.CVLCPT_APLY_NO                                                                                <!-- 민원 신청 번호 -->
              , CC.CVLCPT_RCPT_NO                                                                                <!-- 민원 접수 번호 -->
-             , CC.CVLCPT_PRCS_SUMRY                                                                             <!-- 민원 처리 요약 -->
+             , CC.CVLCPT_APLCNT_NM                                                                              <!-- 민원 신청인 명 -->
+             , CC.CVLCPT_APLY_DT                                                                                <!-- 민원 신청 일시 -->
+             , CC.CVLCPT_PRCS_PIC_NM                                                                            <!-- 민원 처리 담당자 명 -->
              , CC.CVLCPT_PRCS_CD                                                                                <!-- 민원 처리 코드 -->
+             , (SELECT FN_GET_CODE_NM('FIM017', CC.CVLCPT_PRCS_CD) FROM DUAL)           AS CVLCPT_PRCS_NM       <!-- 민원 처리 명 -->
              , CC.CVLCPT_PRCS_CMPTN_DT                                                                          <!-- 민원 처리 완료 일시 -->
              , CC.CVLCPT_TRSM_CD                                                                                <!-- 민원 전송 코드 -->
+             , (SELECT FN_GET_CODE_NM('FIM018', CC.CVLCPT_TRSM_CD) FROM DUAL)           AS CVLCPT_TRSM_NM       <!-- 민원 전송 명 -->
              , CC.CVLCPT_TRSM_DT                                                                                <!-- 민원 전송 일시 -->
              , P.RTPYR_ID                                                                                       <!-- 납부자 ID -->
              , P.RTPYR_NO                                                                                       <!-- 납부자 번호 -->
@@ -497,11 +503,14 @@
                 <when test="mainOption == 'codeValue' or mainOption == 'match' or mainOption == 'ymd'">
                     <include refid="dynamicSearch.start" />
                     <choose>
-                        <when test="by == 'levyExclYmd'"> LE.LEVY_EXCL_YMD </when>
-                        <when test="by == 'levyExclRsnCd'"> LE.LEVY_EXCL_RSN_CD </when>
-                        <when test="by == 'etcCn'"> LE.ETC_CN </when>
+                        <when test="by == 'cvlcptAplyNo'"> CC.CVLCPT_APLY_NO </when>
+                        <when test="by == 'cvlcptRcptNo'"> CC.CVLCPT_RCPT_NO </when>
+                        <when test="by == 'cvlcptRcptYmd'"> CC.CVLCPT_RCPT_YMD </when>
+                        <when test="by == 'cvlcptPrcsPicNm'"> CC.CVLCPT_PRCS_PIC_NM </when>
+                        <when test="by == 'cvlcptPrcsCd'"> CC.CVLCPT_PRCS_CD </when>
                         <when test="by == 'crdnYmd'"> C.CRDN_YMD </when>
                         <when test="by == 'vhrno'"> C.VHRNO </when>
+                        <when test="by == 'vltnArtcl'"> VI.VLTN_ARTCL </when>
                         <when test="by == 'crdnStdgNm'"> C.CRDN_STDG_NM </when>
                         <when test="by == 'crdnPlc'"> C.CRDN_PLC </when>
                         <when test="by == 'ffnlgCrdnAmt'"> C.FFNLG_CRDN_AMT </when>
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01010-main.jsp
index a0d2b35b..014f0c1e 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01010-main.jsp
@@ -58,9 +58,9 @@
 										<button type="button" class="bx bx-sm bx-calendar bg-white"></button>
 									</span>
 								</div>
-								<!-- 위반내역 -->
+								<!-- 위반항목 -->
 								<div class="col-6">
-									<label class="form-label fw-bold form-search-title">위반내역</label>
+									<label class="form-label fw-bold form-search-title">위반항목</label>
 		                            <select class="form-select" id="schVltnId--${pageName}" name="schVltnId">
 		                            	<option value="">전체</option>
 		                            	<c:forEach items="${FIM004List}" var="item">
@@ -177,9 +177,14 @@
 											</th>
 											<th class="cmn" style="width: 120px;" onclick="searchFromGridTitle('LEVY_EXCL_YMD', this.innerText, 'ymd', '');">계고일자</th>
 											<th class="cmn" style="width: 160px;" onclick="searchFromGridTitle('LEVY_EXCL_RSN_CD', this.innerText, 'codeValue', 'FIM022');">계고사유</th>
-											<th class="cmn" style="width: 280px;" onclick="searchFromGridTitle('ETC_CN', this.innerText, 'match', 'part');">기타내용</th>
+											<th class="cmn" style="width: 180px;" onclick="searchFromGridTitle('CVLCPT_APLY_NO', this.innerText, 'match', 'part');">민원신청번호</th>
+											<th class="cmn" style="width: 180px;" onclick="searchFromGridTitle('CVLCPT_RCPT_NO', this.innerText, 'match', 'part');">민원접수번호</th>
+											<th class="cmn" style="width: 140px;" onclick="searchFromGridTitle('CVLCPT_RCPT_YMD', this.innerText, 'ymd', '');">민원접수일자</th>
+											<th class="cmn" style="width: 180px;" onclick="searchFromGridTitle('CVLCPT_PRCS_PIC_NM', this.innerText, 'match', 'part');">민원처리담당자</th>
+											<th class="cmn" style="width: 140px;" onclick="searchFromGridTitle('CVLCPT_PRCS_CD', this.innerText, 'codeValue', 'FIM017');">민원처리결과</th>
 											<th class="cmn" style="width: 180px;" onclick="searchFromGridTitle('CRDN_YMD', this.innerText, 'ymd', '');">단속일시</th>
 											<th class="cmn" style="width: 140px;" onclick="searchFromGridTitle('VHRNO', this.innerText, 'match', 'part');">차량번호</th>
+											<th class="cmn" style="width: 140px;" onclick="searchFromGridTitle('VLTN_ARTCL', this.innerText, 'match', 'part');">위반항목</th>
 											<th class="cmn" style="width: 160px;" onclick="searchFromGridTitle('CRDN_STDG_NM', this.innerText, 'match', 'part');">법정동</th>
 											<th class="cmn" style="width: 280px;" onclick="searchFromGridTitle('CRDN_PLC', this.innerText, 'match', 'part');">단속장소</th>
 											<th class="cmn" style="width: 120px;" onclick="searchFromGridTitle('FFNLG_AMT', this.innerText, 'match', 'part');">과태료금액</th>
@@ -204,9 +209,14 @@
 											</td>
 											<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{LEVY_EXCL_YMD}</td>
 											<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{LEVY_EXCL_RSN_NM}</td>
-											<td class="cmn text-start"  onclick="{onclick}" ondblclick="{ondblclick}">{ETC_CN}</td>
+											<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{CVLCPT_APLY_NO}</td>
+											<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{CVLCPT_RCPT_NO}</td>
+											<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{CVLCPT_RCPT_YMD}</td>
+											<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{CVLCPT_PRCS_PIC_NM}</td>
+											<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{CVLCPT_PRCS_NM}</td>
 											<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{CRDN_YMD_TM}</td>
 											<td class="cmn text-start"  onclick="{onclick}" ondblclick="{ondblclick}">{VHRNO}</td>
+											<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{VLTN_ARTCL}</td>
 											<td class="cmn text-start"  onclick="{onclick}" ondblclick="{ondblclick}">{CRDN_STDG_NM}</td>
 											<td class="cmn text-start"  onclick="{onclick}" ondblclick="{ondblclick}">{CRDN_PLC}</td>
 											<td class="cmn text-end"	onclick="{onclick}" ondblclick="{ondblclick}">{FFNLG_AMT}</td>
@@ -223,7 +233,7 @@
 									</template>
 									<template id="${infoPrefix}NotFound--${pageName}">
 										<tr class="odd">
-											<td valign="top" colspan="19" class="dataTables_empty text-center">${prefixName} 정보를 찾지 못했습니다.</td>
+											<td valign="top" colspan="24" class="dataTables_empty text-center">${prefixName} 정보를 찾지 못했습니다.</td>
 										</tr>
 									</template>
 								</table>
@@ -271,7 +281,8 @@
 			, getInfo : wctx.url("/sprt/sprt02/010/main.do")					// 개별총정보
 		}
 		, formats : {
-	    	  LEVY_EXCL_YMD : dateFormat
+			  CVLCPT_RCPT_YMD : dateFormat
+	    	, LEVY_EXCL_YMD : dateFormat
 	    	, CRDN_YMD_TM : datetimeFormat
 	    	, FFNLG_AMT : numberFormat
 	    	, REG_DT : datetimeFormat
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01020-info.jsp
index 92c651a1..358ce752 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01020-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01020-info.jsp
@@ -128,8 +128,8 @@
 										<td class="cmn text-start"  onclick="{onclick}" ondblclick="{ondblclick}">{RTPYR_NM}</td>
 										<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{RTPYR_BRDT}</td>
 										<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{ZIP}</td>
-										<td class="cmn text-start" onclick="{onclick}" ondblclick="{ondblclick}">{ADDR}</td>
-										<td class="cmn text-start" onclick="{onclick}" ondblclick="{ondblclick}">{DTL_ADDR}</td>
+										<td class="cmn text-start"  onclick="{onclick}" ondblclick="{ondblclick}">{ADDR}</td>
+										<td class="cmn text-start"  onclick="{onclick}" ondblclick="{ondblclick}">{DTL_ADDR}</td>
 										<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{REG_DT}</td>
 										<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{RGTR_NM}</td>
 										<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{MDFCN_DT}</td>
@@ -139,7 +139,7 @@
 								</template>
 								<template id="${infoPrefix}NotFound--${pageName}">
 									<tr class="odd">
-										<td valign="top" colspan="23" class="dataTables_empty text-center">${prefixName} 정보를 찾지 못했습니다.</td>
+										<td valign="top" colspan="24" class="dataTables_empty text-center">${prefixName} 정보를 찾지 못했습니다.</td>
 									</tr>
 								</template>
 							</table>
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01050-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01050-main.jsp
index 263c151d..b0090976 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01050-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01050-main.jsp
@@ -58,9 +58,9 @@
 										<button type="button" class="bx bx-sm bx-calendar bg-white"></button>
 									</span>
 								</div>
-								<!-- 위반내역 -->
+								<!-- 위반항목 -->
 								<div class="col-6">
-									<label class="form-label fw-bold form-search-title">위반내역</label>
+									<label class="form-label fw-bold form-search-title">위반항목</label>
 		                            <select class="form-select" id="schVltnId--${pageName}" name="schVltnId">
 		                            	<option value="">전체</option>
 		                            	<c:forEach items="${FIM004List}" var="item">
@@ -162,8 +162,14 @@
 											<th class="cmn" style="width: 56px;">
 												<input type="checkbox" class="form-check-input" onchange="${pageName}Control.select(this.checked);">
 											</th>
+											<th class="cmn" style="width: 180px;" onclick="searchFromGridTitle('CVLCPT_APLY_NO', this.innerText, 'match', 'part');">민원신청번호</th>
+											<th class="cmn" style="width: 180px;" onclick="searchFromGridTitle('CVLCPT_RCPT_NO', this.innerText, 'match', 'part');">민원접수번호</th>
+											<th class="cmn" style="width: 140px;" onclick="searchFromGridTitle('CVLCPT_RCPT_YMD', this.innerText, 'ymd', '');">민원접수일자</th>
+											<th class="cmn" style="width: 180px;" onclick="searchFromGridTitle('CVLCPT_PRCS_PIC_NM', this.innerText, 'match', 'part');">민원처리담당자</th>
+											<th class="cmn" style="width: 140px;" onclick="searchFromGridTitle('CVLCPT_PRCS_CD', this.innerText, 'codeValue', 'FIM017');">민원처리결과</th>
 											<th class="cmn" style="width: 180px;" onclick="searchFromGridTitle('CRDN_YMD', this.innerText, 'ymd', '');">단속일시</th>
 											<th class="cmn" style="width: 140px;" onclick="searchFromGridTitle('VHRNO', this.innerText, 'match', 'part');">차량번호</th>
+											<th class="cmn" style="width: 140px;" onclick="searchFromGridTitle('VLTN_ARTCL', this.innerText, 'match', 'part');">위반항목</th>
 											<th class="cmn" style="width: 160px;" onclick="searchFromGridTitle('CRDN_STDG_NM', this.innerText, 'match', 'part');">법정동</th>
 											<th class="cmn" style="width: 280px;" onclick="searchFromGridTitle('CRDN_PLC', this.innerText, 'match', 'part');">단속장소</th>
 											<th class="cmn" style="width: 120px;" onclick="searchFromGridTitle('FFNLG_AMT', this.innerText, 'match', 'part');">과태료금액</th>
@@ -188,8 +194,14 @@
 											<td class="cmn text-center">
 												<input type="checkbox" class="form-check-input" value="{CRDN_ID}" onchange="${pageName}Control.select('{CRDN_ID}', this.checked);">
 											</td>
+											<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{CVLCPT_APLY_NO}</td>
+											<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{CVLCPT_RCPT_NO}</td>
+											<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{CVLCPT_RCPT_YMD}</td>
+											<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{CVLCPT_PRCS_PIC_NM}</td>
+											<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{CVLCPT_PRCS_NM}</td>
 											<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{CRDN_YMD_TM}</td>
 											<td class="cmn text-start"  onclick="{onclick}" ondblclick="{ondblclick}">{VHRNO}</td>
+											<td class="cmn text-center"  onclick="{onclick}" ondblclick="{ondblclick}">{VLTN_ARTCL}</td>
 											<td class="cmn text-start"  onclick="{onclick}" ondblclick="{ondblclick}">{CRDN_STDG_NM}</td>
 											<td class="cmn text-start"  onclick="{onclick}" ondblclick="{ondblclick}">{CRDN_PLC}</td>
 											<td class="cmn text-end"	onclick="{onclick}" ondblclick="{ondblclick}">{FFNLG_AMT}</td>
@@ -208,7 +220,7 @@
 									</template>
 									<template id="${infoPrefix}NotFound--${pageName}">
 										<tr class="odd">
-											<td valign="top" colspan="17" class="dataTables_empty text-center">${prefixName} 정보를 찾지 못했습니다.</td>
+											<td valign="top" colspan="23" class="dataTables_empty text-center">${prefixName} 정보를 찾지 못했습니다.</td>
 										</tr>
 									</template>
 								</table>
@@ -256,7 +268,8 @@
 			, getInfo : wctx.url("/sprt/sprt02/010/main.do")					// 개별총정보
 		}
 		, formats : {
-	    	  CRDN_YMD_TM : datetimeFormat
+			  CVLCPT_RCPT_YMD : dateFormat
+	    	, CRDN_YMD_TM : datetimeFormat
 	    	, FFNLG_AMT : numberFormat
 	    	, ADVNTCE_AMT : numberFormat
 	    	, REG_DT : datetimeFormat
@@ -501,6 +514,8 @@
 		${pageName}Control.query = getParams${pageName}();
 		${pageName}Control.query.delYn = "N";					// 삭제 여부
 		${pageName}Control.query.crdnDelYn = "N";				// 단속 대장 삭제 여부
+		// if () { }	주정차, 전용차로 위반
+		// else { }		기타
 		${pageName}Control.query.crdnSttsCd = "21";				// 21 납부자 등록
 
 		${pageName}Control.load();