From cfa42eb9cccfeccef2fe11e08daba47c4ca97609 Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Tue, 1 Aug 2023 18:03:45 +0900
Subject: [PATCH] =?UTF-8?q?=EB=8B=A8=EC=86=8D=EC=9E=90=EB=A3=8C=EA=B2=80?=
 =?UTF-8?q?=EC=82=AC=20=ED=99=94=EB=A9=B4=20=EB=8F=99=EC=A0=81=20=EA=B2=80?=
 =?UTF-8?q?=EC=83=89=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/crdn06-mapper.xml    | 41 +++++++++-
 .../WEB-INF/jsp/fims/crdn/crdn02010-main.jsp  |  2 +-
 .../WEB-INF/jsp/fims/crdn/crdn06020-main.jsp  | 76 +++++++++++++------
 3 files changed, 91 insertions(+), 28 deletions(-)

diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml
index 6dbd61e6..ecfcfbcd 100644
--- a/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml
@@ -274,7 +274,24 @@ SELECT C.CRDN_ID                                      <!-- 단속 ID -->
     </if>
 </if>
 <if test="by != null and by != '' and term != null">
-
+	<choose>
+		<when test="mainOption == 'codeValue' or mainOption == 'match' or mainOption == 'ymd'">
+			<include refid="dynamicSearch.start" />
+			<choose>
+				<when test="by == 'crdnYmd'">C.CRDN_YMD</when>
+				<when test="by == 'vhrno'">C.VHRNO</when>
+				<when test="by == 'crdnStdgNm'">C.CRDN_STDG_NM</when>
+				<when test="by == 'crdnPlc'">C.CRDN_PLC</when>
+				<when test="by == 'atchFileCnt'">C.ATCH_FILE_CNT</when>
+				<when test="by == 'crdnSttsCd'">C.CRDN_STTS_CD</when>
+				<when test="by == 'ffnlgAmt'">C.FFNLG_AMT</when>
+				<when test="by == 'crdnInptSeCd'">C.CRDN_INPT_SE_CD</when>
+			</choose>
+			<include refid="dynamicSearch.center" />#{term}<include refid="dynamicSearch.end" />
+		</when>
+		<otherwise>
+		</otherwise>
+	</choose>
 </if>
 
 <include refid="utility.orderBy" />
@@ -296,6 +313,8 @@ SELECT GROUP_CONCAT(C.CRDN_ID) AS CRDN_ID_LIST        <!-- 단속 ID -->
      </choose>
      , COUNT(*) AS CRDN_CNT                           <!-- 단속건수 -->
   FROM TB_CRDN C
+  LEFT OUTER JOIN TB_TEAM_INFO TI ON (C.TEAM_ID = TI.TEAM_ID)
+  LEFT OUTER JOIN TB_PAYER P ON (C.RTPYR_ID = P.RTPYR_ID)
  WHERE C.DEL_YN = 'N'
    AND C.TASK_SE_CD = #{taskSeCd}
    AND C.VHRNO != ''
@@ -310,7 +329,25 @@ SELECT GROUP_CONCAT(C.CRDN_ID) AS CRDN_ID_LIST        <!-- 단속 ID -->
 <if test="vhrno != null">AND C.VHRNO = #{vhrno}</if>
 <if test="schExclEnd == 'on'">AND C.CRDN_STTS_CD != '81'</if>
 <if test="by != null and by != '' and term != null">
-
+	<choose>
+		<when test="mainOption == 'codeValue' or mainOption == 'match' or mainOption == 'ymd'">
+			<include refid="dynamicSearch.start" />
+			<choose>
+				<when test="by == 'crdnYmd'">C.CRDN_YMD</when>
+				<when test="by == 'crdnInptSeCd'">C.CRDN_INPT_SE_CD</when>
+				<when test="by == 'teamNm'">TI.TEAM_NM</when>
+				<when test="by == 'vhrno'">C.VHRNO</when>
+				<when test="by == 'crdnStdgNm'">C.CRDN_STDG_NM</when>
+				<when test="by == 'crdnPlc'">C.CRDN_PLC</when>
+				<when test="by == 'crdnSttsCd'">C.CRDN_STTS_CD</when>
+				<when test="by == 'ffnlgAmt'">C.FFNLG_AMT</when>
+				<when test="by == 'rtpyrNm'">P.RTPYR_NM</when>
+			</choose>
+			<include refid="dynamicSearch.center" />#{term}<include refid="dynamicSearch.end" />
+		</when>
+		<otherwise>
+		</otherwise>
+	</choose>
 </if>
 GROUP BY C.VHRNO<if test="schOnlySamePlace == 'on'">, C.CRDN_STDG_NM </if>
 HAVING COUNT(*) <![CDATA[ >= ]]>
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp
index 2c48c413..9d4eec97 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp
@@ -1,3 +1,3 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" session="false"%>
 <%@ include file="/WEB-INF/jsp/include/taglib.jsp"%>
-<c:set var="pageKorName" scope="request">민원(새올) 개별 등록</c:set>
\ No newline at end of file
+<c:set var="pageKorName" scope="request">민원 개별 등록</c:set>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp
index 8a3e3be6..00282104 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp
@@ -103,6 +103,8 @@
 				            	<div class="col-6">
 				            		<input type="hidden" id="by--${pageName}" name="by" />
 									<input type="text" id="byOutput--${pageName}" class="form-control" readonly value="동적 검색" />
+									<input type="hidden" id="mainOption--${pageName}" name="mainOption" />
+									<input type="hidden" id="subOption--${pageName}" name="subOption" />
 									<input type="text" id="term--${pageName}" name="term" class="form-control" />
 				            	</div>
 					            <div class="col-6">
@@ -165,20 +167,30 @@
 								<table id="photoInspection_Table_0--${pageName}"
 									class="datatables-ajax table table-bordered dataTable no-footer">
 									<thead>
-										<tr>
+										<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 style="min-width: 160px;">단속일시</th>
-											<th style="min-width: 80px;">차량번호</th>
-											<th style="min-width: 80px;">위반건수</th>
+											<th onclick="searchFromGridTitle('CRDN_YMD','단속일자','ymd','');"
+											style="min-width: 160px;">단속일시</th>
+											<th onclick="searchFromGridTitle('VHRNO',this.innerText,'match','part');"
+											style="min-width: 80px;">차량번호</th>
+											<th style="min-width: 80px;" class="text-orange">위반건수</th>
 											<th style="min-width: 80px;" class="text-orange">검사결과</th>
 											<th style="min-width: 250px;" class="text-orange">처리방법</th>
-											<th style="min-width: 80px;">위반동</th>
-											<th style="min-width: 300px;">위반장소</th>
-											<th style="min-width: 80px;">사진매수</th>
-											<th style="min-width: 80px;">처리상태</th>
-											<th style="min-width: 80px;">원금액</th>
-											<th style="min-width: 80px;">감경금액</th>
-											<th style="min-width: 80px;">자료출처</th>
+											<th onclick="searchFromGridTitle('CRDN_STDG_NM',this.innerText,'match','perfect');"
+											style="min-width: 80px;">위반동</th>
+											<th onclick="searchFromGridTitle('CRDN_PLC',this.innerText,'match','part');"
+											style="min-width: 300px;">위반장소</th>
+											<th onclick="searchFromGridTitle('ATCH_FILE_CNT',this.innerText,'match','perfect');"
+											style="min-width: 80px;">사진매수</th>
+											<th onclick="searchFromGridTitle('CRDN_STTS_CD',this.innerText,'codeValue','FIM010');"
+											style="min-width: 80px;">처리상태</th>
+											<th onclick="searchFromGridTitle('FFNLG_AMT',this.innerText,'match','perfect');"
+											style="min-width: 80px;">원금액</th>
+											<th onclick="searchFromGridTitle('UNKNOWN',this.innerText,'match','perfect');"
+											style="min-width: 80px;">감경금액</th>
+											<th onclick="searchFromGridTitle('CRDN_INPT_SE_CD',this.innerText,'codeValue','FIM003');"
+											style="min-width: 80px;">자료출처</th>
 										</tr>
 				                    </thead>
 				                    <tbody id="photoInspectionTbody--${pageName}"></tbody>
@@ -233,10 +245,14 @@
 									<table id="sameVehicleInspectionMain_Table_0--${pageName}"
 										class="datatables-ajax table table-bordered dataTable no-footer">
 										<thead>
-											<tr>
-												<th>차량번호</th>
-												<th>단속동</th>
-												<th>단속건수</th>
+											<tr data-by="by--${pageName}" data-by-output="byOutput--${pageName}"
+												data-main-option="mainOption--${pageName}" data-sub-option="subOption--${pageName}">
+												<th onclick="searchFromGridTitle('VHRNO',this.innerText,'match','part');"
+												>차량번호</th>
+												<th onclick="searchFromGridTitle('CRDN_STDG_NM',this.innerText,'match','perfect');"
+												>단속동</th>
+												<th class="text-orange"
+												>단속건수</th>
 											</tr>
 					                    </thead>
 					                    <tbody id="sameVehicleInspectionMainTbody--${pageName}"></tbody>
@@ -264,16 +280,26 @@
 									<table id="sameVehicleInspectionSub_Table_0--${pageName}"
 										class="datatables-ajax table table-bordered dataTable no-footer">
 										<thead>
-											<tr>
-												<th>단속일시</th>
-												<th>자료출처</th>
-												<th>단속조</th>
-												<th>차량번호</th>
-												<th>단속동</th>
-												<th>단속장소</th>
-												<th>처리상태</th>
-												<th>금액</th>
-												<th>성명</th>
+											<tr data-by="by--${pageName}" data-by-output="byOutput--${pageName}"
+												data-main-option="mainOption--${pageName}" data-sub-option="subOption--${pageName}">
+												<th onclick="searchFromGridTitle('CRDN_YMD','단속일자','ymd','');"
+												>단속일시</th>
+												<th onclick="searchFromGridTitle('CRDN_INPT_SE_CD',this.innerText,'codeValue','FIM003');"
+												>자료출처</th>
+												<th onclick="searchFromGridTitle('TEAM_NM',this.innerText,'match','perfect');"
+												>단속조</th>
+												<th onclick="searchFromGridTitle('VHRNO',this.innerText,'match','part');"
+												>차량번호</th>
+												<th onclick="searchFromGridTitle('CRDN_STDG_NM',this.innerText,'match','perfect');"
+												>단속동</th>
+												<th onclick="searchFromGridTitle('CRDN_PLC',this.innerText,'match','part');"
+												>단속장소</th>
+												<th onclick="searchFromGridTitle('CRDN_STTS_CD',this.innerText,'codeValue','FIM010');"
+												>처리상태</th>
+												<th onclick="searchFromGridTitle('FFNLG_AMT',this.innerText,'match','perfect');"
+												>금액</th>
+												<th onclick="searchFromGridTitle('RTPYR_NM',this.innerText,'match','part');"
+												>성명</th>
 												<th class="privacy">주민번호(전체)</th>
 												<th class="privacy-mask">주민번호(마스크)</th>
 											</tr>