From 0b9a1ed5c0399343aec38e3882339171544065f1 Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Tue, 29 Aug 2023 17:41:46 +0900
Subject: [PATCH] =?UTF-8?q?=EB=AF=BC=EC=9B=90=EA=B4=80=EB=A0=A8=ED=99=94?=
 =?UTF-8?q?=EB=A9=B4=EC=97=90=20=EB=AF=BC=EC=9B=90=EB=AA=A9=EB=A1=9D?=
 =?UTF-8?q?=EB=B2=88=ED=98=B8=20=ED=91=9C=EC=B6=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml  | 15 +++++++++++++--
 .../WEB-INF/jsp/fims/cvlc/cvlc01010-main.jsp    | 11 +++++++----
 .../WEB-INF/jsp/fims/cvlc/cvlc01050-info.jsp    | 17 ++++++++++++-----
 .../WEB-INF/jsp/fims/cvlc/cvlc02010-main.jsp    |  5 ++++-
 .../WEB-INF/jsp/fims/cvlc/cvlc02060-info.jsp    |  2 +-
 5 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml b/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml
index befe183c..9f19e966 100644
--- a/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml
@@ -177,13 +177,19 @@ SELECT C.CRDN_ID                                      <!-- 단속 ID -->
      , C.CRDN_REG_SE_CD                               <!-- 단속 등록 구분 코드 -->
      , CC.CVLCPT_APLCNT_NM                            <!-- 민원 신청인 명 -->
      , CC.CVLCPT_PRCS_PIC_NM                          <!-- 민원 처리 담당자 명 -->
-     , (SELECT TELNO FROM TB_USER WHERE USER_ID = CC.CVLCPT_PRCS_PIC) AS CVLCPT_PRCS_PIC_TELNO <!-- 민원 처리 담당자 전화번호 -->
+     , (SELECT TELNO 
+          FROM TB_USER 
+         WHERE USER_ID = CC.CVLCPT_PRCS_PIC
+        ) AS CVLCPT_PRCS_PIC_TELNO                    <!-- 민원 처리 담당자 전화번호 -->
      , CC.CVLCPT_RCPT_YMD                             <!-- 민원 접수 일자 -->
      , CC.CVLCPT_PRCS_PRNMNT_DT                       <!-- 민원 처리 예정 일시 -->
      , CONCAT(C.CRDN_YMD,'',C.CRDN_TM) AS CRDN_YMD_TM <!-- 단속 일시 -->
      , C.ATCH_FILE_CNT                                <!-- 첨부 파일 수 -->
-     , (SELECT VLTN_ARTCL FROM TB_VLTN_INFO WHERE VLTN_ID = C.VLTN_ID) AS VLTN_ARTCL <!-- 위반내용 -->
+     , (SELECT VLTN_ARTCL 
+          FROM TB_VLTN_INFO 
+         WHERE VLTN_ID = C.VLTN_ID) AS VLTN_ARTCL     <!-- 위반내용 -->
      , CC.CVLCPT_RCPT_NO                              <!-- 민원 접수 번호 -->
+     , CC.CVLCPT_LIST_NO                              <!-- 민원 목록 번호 -->
      , C.VHRNO                                        <!-- 차량번호 -->
      , C.CRDN_PLC
   FROM TB_CRDN C
@@ -205,6 +211,7 @@ SELECT C.CRDN_ID                                      <!-- 단속 ID -->
 				<when test="by == 'crdnYmd'">C.CRDN_YMD</when>
 				<when test="by == 'atchFileCnt'">C.ATCH_FILE_CNT</when>
 				<when test="by == 'cvlcptRcptNo'">CC.CVLCPT_RCPT_NO</when>
+				<when test="by == 'cvlcptListNo'">CC.CVLCPT_LIST_NO</when>
 				<when test="by == 'vhrno'">C.VHRNO</when>
 			</choose>
 			<include refid="dynamicSearch.center" />#{term}<include refid="dynamicSearch.end" />
@@ -231,6 +238,7 @@ AND (SELECT VLTN_ARTCL FROM TB_VLTN_INFO WHERE VLTN_ID = C.VLTN_ID) LIKE CONCAT(
 /* 민원내역 원본 보기(crdnCvlcptMapper.selectCivilComplaintOriginalInfo) */
 SELECT C.CRDN_ID                <!-- 단속 ID -->
      , CC.CVLCPT_RCPT_NO        <!-- 민원 접수 번호 -->
+     , CC.CVLCPT_LIST_NO        <!-- 민원 목록 번호 -->
      , CC.CVLCPT_APLCNT_NM      <!-- 민원 신청인 명 -->
      , CC.CVLCPT_RCPT_YMD       <!-- 민원 접수 일자 -->
      , CC.CVLCPT_PRCS_PRNMNT_DT <!-- 민원 처리 예정 일시 -->
@@ -246,6 +254,7 @@ SELECT C.CRDN_ID                <!-- 단속 ID -->
 /* 민원내역 원본 보기(한글 파일)(crdnCvlcptMapper.selectCivilComplaintOriginalInfoHwp) */
 SELECT C.CRDN_ID                <!-- 단속 ID -->
      , CC.CVLCPT_RCPT_NO        <!-- 민원 접수 번호 -->
+     , CC.CVLCPT_LIST_NO        <!-- 민원 목록 번호 -->
      , CC.CVLCPT_APLCNT_NM      <!-- 민원 신청인 명 -->
      , CC.CVLCPT_RCPT_YMD       <!-- 민원 접수 일자 -->
      , CC.CVLCPT_PRCS_PRNMNT_DT <!-- 민원 처리 예정 일시 -->
@@ -566,6 +575,7 @@ SELECT C.CRDN_ID                                      <!-- 단속 ID -->
      , CC.CVLCPT_PRCS_PRNMNT_DT                       <!-- 민원 처리 예정 일시 -->
      , CONCAT(C.CRDN_YMD,'',C.CRDN_TM) AS CRDN_YMD_TM <!-- 단속 일시 -->
      , CC.CVLCPT_RCPT_NO                              <!-- 민원 접수 번호 -->
+     , CC.CVLCPT_LIST_NO                              <!-- 민원 목록 번호 -->
      , C.VHRNO                                        <!-- 차량번호 -->
      , LE.LEVY_EXCL_RSN_CD                            <!-- 부과 제외 사유 코드 -->
      , C.ETC_CN                                       <!-- 기타 내용 -->
@@ -596,6 +606,7 @@ SELECT C.CRDN_ID                                      <!-- 단속 ID -->
 				<when test="by == 'cvlcptPrcsPrnmntDt'">CC.CVLCPT_PRCS_PRNMNT_DT</when>
 				<when test="by == 'crdnYmd'">C.CRDN_YMD</when>
 				<when test="by == 'cvlcptRcptNo'">CC.CVLCPT_RCPT_NO</when>
+				<when test="by == 'cvlcptListNo'">CC.CVLCPT_LIST_NO</when>
 				<when test="by == 'vhrno'">C.VHRNO</when>
 				<when test="by == 'levyExclRsnCd'">LE.LEVY_EXCL_RSN_CD</when>
 				<when test="by == 'etcCn'">C.ETC_CN</when>
diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01010-main.jsp
index 976585f4..673461e2 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01010-main.jsp
@@ -81,6 +81,10 @@
 										<tr data-by="by--${pageName}" data-by-output="byOutput--${pageName}"
 											data-main-option="mainOption--${pageName}" data-sub-option="subOption--${pageName}">
 											<th style="min-width: 80px;">No.</th>
+											<th onclick="searchFromGridTitle('CVLCPT_RCPT_NO',this.innerText,'match','part');"
+											style="min-width: 80px;">접수번호</th>
+											<th onclick="searchFromGridTitle('CVLCPT_LIST_NO',this.innerText,'match','part');"
+											style="min-width: 80px;">목록번호</th>
 											<th onclick="searchFromGridTitle('CRDN_REG_SE_CD',this.innerText,'codeValue','FIM026');"
 											style="min-width: 80px;">등록구분</th>
 											<th onclick="searchFromGridTitle('CVLCPT_APLCNT_NM',this.innerText,'match','part');"
@@ -99,8 +103,6 @@
 											style="min-width: 80px;">사진건수</th>
 											<th onclick="searchFromGridTitle('VLTN_ARTCL',this.innerText);"
 											style="min-width: 80px;">위반내용</th>
-											<th onclick="searchFromGridTitle('CVLCPT_RCPT_NO',this.innerText,'match','part');"
-											style="min-width: 80px;">접수번호</th>
 											<th onclick="searchFromGridTitle('VHRNO',this.innerText,'match','part');"
 											style="min-width: 80px;">차량번호</th>
 										</tr>
@@ -109,6 +111,8 @@
 									<template id="crdnRow--${pageName}">
 										<tr data-key="{CRDN_ID}">
 											<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-end">{ROW_NUM}</td>
+											<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{CVLCPT_RCPT_NO}</td>
+											<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{CVLCPT_LIST_NO}</td>
 											<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{CRDN_REG_SE_CD}</td>
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{CVLCPT_APLCNT_NM}</td>
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{CVLCPT_PRCS_PIC_NM}</td>
@@ -118,13 +122,12 @@
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{CRDN_YMD_TM}</td>
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{ATCH_FILE_CNT}</td>
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{VLTN_ARTCL}</td>
-				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{CVLCPT_RCPT_NO}</td>
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{VHRNO}</td>
 				                    	</tr>
 									</template>
 									<template id="crdnNotFound--${pageName}">
 										<tr>
-											<td valign="top" colspan="12" class="dataTables_empty text-center">민원 정보를 찾지 못했습니다.</td>
+											<td valign="top" colspan="13" class="dataTables_empty text-center">민원 정보를 찾지 못했습니다.</td>
 										</tr>
 									</template>
 								</table>
diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01050-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01050-info.jsp
index ef66210c..51ec65e4 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01050-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01050-info.jsp
@@ -3,11 +3,18 @@
 <c:set var="pageKorName" scope="request">민원 원본 보기</c:set>
 
 <div class="d-flex flex-row justify-content-evenly">
-	<div class="card" title="민원원본">
+	<div class="card">
 		<form id="frmEdit--${pageName}">
 			<input id="crdnId--${pageName}" name="crdnId" type="hidden" data-map="CRDN_ID" />
 			
 			<div class="row g-1">
+				<div class="col-md-4">
+					<label for="cvlcptListNo--${pageName}" class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end">
+						목록번호
+					</label>
+					<input type="text" id="cvlcptListNo--${pageName}" name="cvlcptListNo" data-map="CVLCPT_LIST_NO"
+						class="form-control" readonly />
+				</div>
 				<div class="col-md-4">
 					<label for="cvlcptRcptNo--${pageName}" class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end">
 						접수번호
@@ -36,14 +43,14 @@
 					<input type="text" id="cvlcptPrcsPrnmtDt--${pageName}" name="cvlcptPrcsPrnmtDt" data-map="CVLCPT_PRCS_PRNMNT_DT"
 						class="form-control" readonly />
 				</div>
-				<div class="col-md-4">
-					<button type="button" class="btn btn-blue" id="btnMakeHwp--${pageName}" title="한글파일 다운">한글파일 다운</button>
-					<div id="tempArea--${pageName}"></div>
-				</div>
 				<div class="col-md-12">
 					<label for="cvlcptAplyCn--${pageName}" class="w-px-150 bg-lighter pe-2 col-form-label text-sm-center">
 						민원 내용
 					</label>
+					<span class="float-end pe-4">
+						<button type="button" class="btn btn-blue" id="btnMakeHwp--${pageName}" title="한글파일 다운">한글파일 다운</button>
+						<div id="tempArea--${pageName}"></div>
+					</span>
 				</div>
 				<div class="col-md-12">
 					<div class="px-2">
diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02010-main.jsp
index 9d5e739e..9f03d8a3 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02010-main.jsp
@@ -113,6 +113,8 @@
 											style="min-width: 80px;">위반일시</th>
 											<th onclick="searchFromGridTitle('CVLCPT_RCPT_NO',this.innerText,'match','part');"
 											style="min-width: 80px;">접수번호</th>
+											<th onclick="searchFromGridTitle('CVLCPT_LIST_NO',this.innerText,'match','part');"
+											style="min-width: 80px;">목록번호</th>
 											<th onclick="searchFromGridTitle('VHRNO',this.innerText,'match','part');"
 											style="min-width: 80px;">차량번호</th>
 											<th onclick="searchFromGridTitle('LEVY_EXCL_RSN_CD',this.innerText,'codeValue','FIM022');"
@@ -137,6 +139,7 @@
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{CVLCPT_PRCS_PRNMNT_DT}</td>
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{CRDN_YMD_TM}</td>
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{CVLCPT_RCPT_NO}</td>
+				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{CVLCPT_LIST_NO}</td>
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{VHRNO}</td>
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{LEVY_EXCL_RSN_CD}</td>
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{ETC_CN}</td>
@@ -144,7 +147,7 @@
 									</template>
 									<template id="crdnNotFound--${pageName}">
 										<tr>
-											<td valign="top" colspan="13" class="dataTables_empty text-center">민원 정보를 찾지 못했습니다.</td>
+											<td valign="top" colspan="14" class="dataTables_empty text-center">민원 정보를 찾지 못했습니다.</td>
 										</tr>
 									</template>
 								</table>
diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02060-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02060-info.jsp
index df2b9046..a4a1e7a0 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02060-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02060-info.jsp
@@ -3,7 +3,7 @@
 <c:set var="pageKorName" scope="request">민원 답변내용 미리보기</c:set>
 
 <div class="d-flex flex-row justify-content-evenly">
-	<div class="card" title="민원답변내용미리보기">
+	<div class="card">
 		<form id="frmEdit--${pageName}">
 			<input id="crdnId--${pageName}" name="crdnId" type="hidden" data-map="CRDN_ID" />
 			<input id="cvlcptLinkId--${pageName}" name="cvlcptLinkId" type="hidden" data-map="CVLCPT_LINK_ID" />