From 278af34db761c46fe3cae3575789042d66d6c0fa Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Tue, 18 Jul 2023 14:26:42 +0900
Subject: [PATCH] =?UTF-8?q?=EB=AF=BC=EC=9B=90=EC=A0=91=EC=88=98=EC=9E=90?=
 =?UTF-8?q?=EB=A3=8C=20=EB=8F=99=EC=A0=81=20=EA=B2=80=EC=83=89=20=EA=B8=B0?=
 =?UTF-8?q?=EB=8A=A5=20=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sql/mapper/fims/crdn/crdn01-mapper.xml    | 45 +++++++++++++++++--
 .../sql/mapper/fims/crdn/crdn05-mapper.xml    |  2 +-
 .../WEB-INF/jsp/fims/crdn/crdn01010-main.jsp  | 26 +++++------
 .../WEB-INF/jsp/fims/crdn/crdn01030-main.jsp  |  2 +-
 .../WEB-INF/jsp/fims/crdn/crdn05010-main.jsp  |  2 +-
 5 files changed, 57 insertions(+), 20 deletions(-)

diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml
index ac2780f0..6d8a1b24 100644
--- a/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml
@@ -161,7 +161,7 @@ SELECT C.CRDN_ID                                      <!-- 단속 ID -->
      , 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) ASVLTN_ARTCL <!-- 위반내용 -->
+     , (SELECT VLTN_ARTCL FROM TB_VLTN_INFO WHERE VLTN_ID = C.VLTN_ID) AS VLTN_ARTCL <!-- 위반내용 -->
      , CC.CVLCPT_RCPT_NO                              <!-- 민원 접수 번호 -->
      , C.VHRNO                                        <!-- 차량번호 -->
      , C.CRDN_PLC
@@ -171,7 +171,44 @@ SELECT C.CRDN_ID                                      <!-- 단속 ID -->
    AND C.TASK_SE_CD = #{taskSeCd}
    AND C.CRDN_STTS_CD = '01'
 <if test="by != null and by != '' and term != null">
-
+	<choose>
+		<when test="by == 'crdnRegSeCd'">
+AND FN_GET_CODE_NM('FIM026', C.CRDN_REG_SE_CD) LIKE CONCAT('%', #{term}, '%') 
+		</when>
+		<when test="by == 'cvlcptAplcntNm'">
+AND CC.CVLCPT_APLCNT_NM LIKE CONCAT('%', #{term}, '%')
+		</when>
+		<when test="by == 'cvlcptPrcsPicNm'">
+AND CC.CVLCPT_PRCS_PIC_NM LIKE CONCAT('%', #{term}, '%')
+		</when>
+		<when test="by == 'cvlcptPrcsPicTelno'">
+AND CC.CVLCPT_PRCS_PIC_TELNO LIKE CONCAT('%', #{term}, '%')
+		</when>
+		<when test="by == 'cvlcptRcptYmd'">
+AND CC.CVLCPT_RCPT_YMD = REPLACE(#{term},'-','')
+		</when>
+		<when test="by == 'cvlcptPrcsPrnmntDt'">
+AND SUBSTR(CC.CVLCPT_PRCS_PRNMNT_DT,1,8) = REPLACE(#{term},'-','')
+		</when>
+		<when test="by == 'crdnYmd'">
+AND C.CRDN_YMD = REPLACE(#{term},'-','')
+		</when>
+		<when test="by == 'atchFileCnt'">
+AND C.ATCH_FILE_CNT = #{term}
+		</when>
+		<when test="by == 'vltnArtcl'">
+AND (SELECT VLTN_ARTCL FROM TB_VLTN_INFO WHERE VLTN_ID = C.VLTN_ID) LIKE CONCAT('%', #{term}, '%')
+		</when>
+		<when test="by == 'cvlcptRcptNo'">
+AND CC.CVLCPT_RCPT_NO LIKE CONCAT('%', #{term}, '%')
+		</when>
+		<when test="by == 'vhrno'">
+AND C.VHRNO LIKE CONCAT('%', #{term}, '%')
+		</when>
+		<otherwise>
+		
+		</otherwise>
+	</choose>
 </if>
 <if test="schCvlcptRcptYmdFrom != null or schCvlcptRcptYmdTo != null">
 	<if test="schCvlcptRcptYmdFrom != null">AND CC.CVLCPT_RCPT_YMD <![CDATA[ >= ]]> #{schCvlcptRcptYmdFrom} </if>
@@ -189,7 +226,7 @@ SELECT C.CRDN_ID                                      <!-- 단속 ID -->
 <include refid="utility.paging-prefix"/>
 SELECT C.CRDN_ID                                      <!-- 단속 ID -->
      , C.CRDN_REG_SE_CD        <!-- 단속 등록 구분 코드 -->
-     , (SELECT VLTN_ARTCL FROM TB_VLTN_INFO WHERE VLTN_ID = C.VLTN_ID) ASVLTN_ARTCL <!-- 위반내용 -->
+     , (SELECT VLTN_ARTCL FROM TB_VLTN_INFO WHERE VLTN_ID = C.VLTN_ID) AS VLTN_ARTCL <!-- 위반내용 -->
      , 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 <!-- 민원 처리 담당자 전화번호 -->
@@ -209,7 +246,7 @@ SELECT C.CRDN_ID                                      <!-- 단속 ID -->
    AND C.CRDN_REG_SE_CD = '02'
    AND CC.CVLCPT_PRCS_CD IN ('02','03','04')
 <if test="by != null and by != '' and term != null">
-
+	
 </if>
 <if test="schCvlcptRcptYmdFrom != null or schCvlcptRcptYmdTo != null">
 	<if test="schCvlcptRcptYmdFrom != null">AND CC.CVLCPT_RCPT_YMD <![CDATA[ >= ]]> #{schCvlcptRcptYmdFrom} </if>
diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn05-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn05-mapper.xml
index 8d9b4ddd..3767f5ed 100644
--- a/src/main/resources/sql/mapper/fims/crdn/crdn05-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/crdn/crdn05-mapper.xml
@@ -11,7 +11,7 @@ SELECT C.CRDN_ID               <!-- 단속 ID -->
      , CONCAT(C.CRDN_YMD,'',C.CRDN_TM) AS CRDN_YMD_TM <!-- 단속 일시 -->
      , C.VHRNO                 <!-- 차량번호 -->
      , C.CRDN_PLC              <!-- 단속 장소 -->
-     , (SELECT VLTN_ARTCL FROM TB_VLTN_INFO WHERE VLTN_ID = C.VLTN_ID) ASVLTN_ARTCL
+     , (SELECT VLTN_ARTCL FROM TB_VLTN_INFO WHERE VLTN_ID = C.VLTN_ID) AS VLTN_ARTCL
      , C.DEL_YN
      , C.RGTR
 	 , C.REG_DT
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp
index e2382734..45d31054 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp
@@ -77,19 +77,19 @@
 								<table id="DataTables_Table_0--${pageName}"
 									class="datatables-ajax table table-bordered dataTable no-footer">
 									<thead id="crdnThead--${pageName}">
-										<tr>
+										<tr data-by="by--${pageName}" data-by-output="byOutput--${pageName}">
 											<th width="80">No.</th>
-											<th width="80">등록구분</th>
-											<th width="80">신고자</th>
-											<th width="80">담당자</th>
-											<th width="80">담당자전화번호</th>
-											<th width="80">접수일자</th>
-											<th width="80">처리기한</th>
-											<th width="80">위반일자</th>
-											<th width="80">사진건수</th>
-											<th width="80">위반내용</th>
-											<th width="80">접수번호</th>
-											<th width="80">차량번호</th>
+											<th width="80" onclick="searchFromGridTitle('CRDN_REG_SE_CD',this.innerText);">등록구분</th>
+											<th width="80" onclick="searchFromGridTitle('CVLCPT_APLCNT_NM',this.innerText);">신고자</th>
+											<th width="80" onclick="searchFromGridTitle('CVLCPT_PRCS_PIC_NM',this.innerText);">담당자</th>
+											<th width="80" onclick="searchFromGridTitle('CVLCPT_PRCS_PIC_TELNO',this.innerText);">담당자전화번호</th>
+											<th width="80" onclick="searchFromGridTitle('CVLCPT_RCPT_YMD',this.innerText);">접수일자</th>
+											<th width="80" onclick="searchFromGridTitle('CVLCPT_PRCS_PRNMNT_DT',this.innerText);">처리기한</th>
+											<th width="80" onclick="searchFromGridTitle('CRDN_YMD','위반일자');">위반일시</th>
+											<th width="80" onclick="searchFromGridTitle('ATCH_FILE_CNT',this.innerText);">사진건수</th>
+											<th width="80" onclick="searchFromGridTitle('VLTN_ARTCL',this.innerText);">위반내용</th>
+											<th width="80" onclick="searchFromGridTitle('CVLCPT_RCPT_NO',this.innerText);">접수번호</th>
+											<th width="80" onclick="searchFromGridTitle('VHRNO',this.innerText);">차량번호</th>
 										</tr>
 									</thead>
 				                    <tbody id="crdnTbody--${pageName}"></tbody>
@@ -104,7 +104,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">{ATCH_FILE_CNT}</td>
-				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{ASVLTN_ARTCL}</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>
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01030-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01030-main.jsp
index 027a9d57..9176794b 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01030-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01030-main.jsp
@@ -106,7 +106,7 @@
 										<tr data-key="{CRDN_ID}">
 											<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-end">{ROW_NUM}</td>
 											<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{CRDN_REG_SE_CD}</td>
-				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{ASVLTN_ARTCL}</td>
+				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{VLTN_ARTCL}</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>
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{CVLCPT_PRCS_PIC_TELNO}</td>
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05010-main.jsp
index 2a495cf6..01084636 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05010-main.jsp
@@ -76,7 +76,7 @@
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{CRDN_YMD_TM}</td>
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{VHRNO}</td>
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-start">{CRDN_PLC}</td>
-				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-start">{ASVLTN_ARTCL}</td>
+				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-start">{VLTN_ARTCL}</td>
 				                    	</tr>
 			                    	</template>
 			                    	<template id="crdnNotFound--${pageName}">