From c122d43ca5e0c93ab67c6a8e2244f7eebb34551e Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Tue, 27 Jun 2023 13:50:46 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B2=80=EC=83=89=EB=B2=84=ED=8A=BC=20?=
 =?UTF-8?q?=EC=9C=84=EC=B9=98=20=EC=9A=B0=EC=83=81=EB=8B=A8=EC=9C=BC?=
 =?UTF-8?q?=EB=A1=9C=20=EC=9D=B4=EB=8F=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sql/mapper/fims/crdn/crdn06-mapper.xml    |  13 +-
 .../WEB-INF/jsp/fims/crdn/crdn06010-main.jsp  | 119 +++++++++---------
 .../WEB-INF/jsp/fims/crdn/crdn06030-main.jsp  |  67 +++++-----
 .../WEB-INF/jsp/fims/crdn/crdn06040-main.jsp  |  94 +++++++-------
 4 files changed, 139 insertions(+), 154 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 f68dea46..1c21ba41 100644
--- a/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml
@@ -192,7 +192,7 @@ SELECT C.CRDN_ID               <!-- 단속 ID -->
      , C.DEL_DT
      , C.DEL_RSN
 FROM TB_CRDN C
-LEFT OUTER JOIN TB_CRDN_CVLCPT CC ON (C.LINK_ID = CC.CVLCPT_LINK_ID AND C.CRDN_ID = CC.CRDN_ID)
+LEFT OUTER JOIN TB_CRDN_CVLCPT CC ON (C.CRDN_ID = CC.CRDN_ID)
 WHERE C.DEL_YN = 'N'
 <if test="by != null and by != '' and term != null">
 	<choose>
@@ -235,7 +235,11 @@ SELECT C.CRDN_ID               <!-- 단속 ID -->
      , CONCAT(C.CRDN_YMD,'',C.CRDN_TM) AS CRDN_YMD_TM <!-- 단속 일시 -->
      , C.VHRNO                 <!-- 차량번호 -->
      , C.CRDN_STDG_NM          <!-- 단속 법정동 명 -->
-     <!-- 신고/단속자 -->
+     , IF(CC.CVLCPT_APLCNT_NM != '', CC.CVLCPT_APLCNT_NM,
+	   IF(TI.TEAMER_1 != '', TI.TEAMER_1,
+	   IF(TI.TEAMER_2 != '', TI.TEAMER_2,
+	   IF(TI.TEAMER_3 != '', TI.TEAMER_3,
+	   TI.TEAMER_4)))) AS APLCNT_CRDN_NM <!-- 신고/단속자 -->
      , CC.CVLCPT_APLCNT_NM      <!-- 민원 신청인 명 -->
      , C.TEAM_ID               <!-- 조 ID -->
      , C.VLTN_ID               <!-- 위반 ID -->
@@ -254,7 +258,8 @@ SELECT C.CRDN_ID               <!-- 단속 ID -->
      , C.DEL_DT
      , C.DEL_RSN
 FROM TB_CRDN C
-LEFT OUTER JOIN TB_CRDN_CVLCPT CC ON (C.LINK_ID = CC.CVLCPT_LINK_ID AND C.CRDN_ID = CC.CRDN_ID)
+LEFT OUTER JOIN TB_CRDN_CVLCPT CC ON (C.CRDN_ID = CC.CRDN_ID)
+LEFT OUTER JOIN TB_TEAM_INFO TI ON (C.TEAM_ID = TI.TEAM_ID)
 WHERE C.DEL_YN = 'N'
 <if test="by != null and by != '' and term != null">
 	<choose>
@@ -305,7 +310,7 @@ SELECT C.CRDN_ID               <!-- 단속 ID -->
      , C.DEL_DT
      , C.DEL_RSN
 FROM TB_CRDN C
-LEFT OUTER JOIN TB_CRDN_CVLCPT CC ON (C.LINK_ID = CC.CVLCPT_LINK_ID AND C.CRDN_ID = CC.CRDN_ID)
+LEFT OUTER JOIN TB_CRDN_CVLCPT CC ON (C.CRDN_ID = CC.CRDN_ID)
 WHERE C.DEL_YN = 'N'
 <if test="by != null and by != '' and term != null">
 	<choose>
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp
index b65ddc58..1d4f7a11 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp
@@ -11,74 +11,67 @@
 				    <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-search" id="btnSearch--${pageName}" title="검색">검색</button>
 				        </span>
 				    </div>
 
 				    <form id="frmSearch--${pageName}" name="frmSearch">
 				        <div class="container-search">
-				            <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">
-												<c:forEach items="${FIM001List}" var="item">
-													<label>
-														<input name="taskSeCd" type="radio" value="${item.code}"
-														class="form-check-input" alt="업무구분"
-														onchange="pageObject['${pageName}'].fnResetAndChangeBiz(this.value);">
-														${item.value}
-													</label> 
-												</c:forEach>
-				                            </span>
-				                        </div>
-				                        <div class="col-12">
-				                            <select id="schDateOpt--${pageName}" name="schDateOpt" class="form-select">
-				                                <option value="crdnYmd">단속일자</option>
-				                                <option value="regDt">등록일자</option>
-				                            </select>
-				                            <span class="form-search-linebox">
-				                                <input type="text" id="schDateFrom--${pageName}" name="schDateFrom" class="form-control form-date" 
-				                                	data-fmt-type="day"   title="시작 날짜 선택" />
-				                                <button type="button" class="bx bx-calendar bg-white"></button>
-				                                ~
-				                                <input type="text" id="schDateTo--${pageName}" name="schDateTo" class="form-control form-date" 
-				                                	data-fmt-type="day" title="종료 날짜 선택">
-				                                <button type="button" class="bx bx-calendar bg-white"></button>
-				                            </span>
-				                        </div>
-				                        <div class="col-12">
-				                            <label class="form-label fw-bold form-search-title">단속구분</label>
-				                            <select id="crdnSeCd--${pageName}" name="crdnSeCd" class="form-select">
-				                            	<option value="">전체</option>
-				                            	<c:forEach items="${FIM002List}" var="item">
-				                            		<option value="${item.code}">${item.value}</option>
-				                            	</c:forEach>
-				                            </select>
-				                        </div>
-				                        <div class="col-12">
-				                            <label class="form-label fw-bold form-search-title">차량번호</label>
-				                            <input type="text" id="vhrno--${pageName}" name="vhrno" class="form-control" />
-				                        </div>
-				                        <div class="col-12">
-				                        	<input type="hidden" id="by--${pageName}" name="by" />
-											<input type="text" id="byOutput--${pageName}" class="form-control" readonly value="동적 검색" />
-											<input type="text" id="term--${pageName}" name="term" class="form-control" />
-				                        	<span class="flr">
-				                                <button type="button" class="btn btn-open-detail btn-sm" 
-				                                	data-bs-toggle="collapse" data-bs-target="#searchDetail--${pageName}">
-				                                    <i class="bx bx-chevron-down"></i>
-				                                    상세조회조건
-				                                </button>
-				                            </span>
-				                        </div>
-				                    </div>
-				                </div>
-				                <div class="col-1 d-flex align-items-center justify-content-center">
-				                    <button type="button" class="btn btn-search btn-square h-px-75" id="btnSearch--${pageName}" title="검색">검색</button>
-				                </div>
-				            </div>
+		                    <div class="row">
+		                        <div class="col-12">
+		                            <label class="form-label fw-bold form-search-title">시스템구분</label>
+		                            <span class="form-search-linebox">
+										<c:forEach items="${FIM001List}" var="item">
+											<label>
+												<input name="taskSeCd" type="radio" value="${item.code}"
+												class="form-check-input" alt="업무구분"
+												onchange="pageObject['${pageName}'].fnResetAndChangeBiz(this.value);">
+												${item.value}
+											</label> 
+										</c:forEach>
+		                            </span>
+		                        </div>
+		                        <div class="col-12">
+		                            <select id="schDateOpt--${pageName}" name="schDateOpt" class="form-select">
+		                                <option value="crdnYmd">단속일자</option>
+		                                <option value="regDt">등록일자</option>
+		                            </select>
+		                            <span class="form-search-linebox">
+		                                <input type="text" id="schDateFrom--${pageName}" name="schDateFrom" class="form-control form-date" 
+		                                	data-fmt-type="day"   title="시작 날짜 선택" />
+		                                <button type="button" class="bx bx-calendar bg-white"></button>
+		                                ~
+		                                <input type="text" id="schDateTo--${pageName}" name="schDateTo" class="form-control form-date" 
+		                                	data-fmt-type="day" title="종료 날짜 선택">
+		                                <button type="button" class="bx bx-calendar bg-white"></button>
+		                            </span>
+		                        </div>
+		                        <div class="col-12">
+		                            <label class="form-label fw-bold form-search-title">단속구분</label>
+		                            <select id="crdnSeCd--${pageName}" name="crdnSeCd" class="form-select">
+		                            	<option value="">전체</option>
+		                            	<c:forEach items="${FIM002List}" var="item">
+		                            		<option value="${item.code}">${item.value}</option>
+		                            	</c:forEach>
+		                            </select>
+		                        </div>
+		                        <div class="col-12">
+		                            <label class="form-label fw-bold form-search-title">차량번호</label>
+		                            <input type="text" id="vhrno--${pageName}" name="vhrno" class="form-control" />
+		                        </div>
+		                        <div class="col-12">
+		                        	<input type="hidden" id="by--${pageName}" name="by" />
+									<input type="text" id="byOutput--${pageName}" class="form-control" readonly value="동적 검색" />
+									<input type="text" id="term--${pageName}" name="term" class="form-control" />
+		                        	<span class="flr">
+		                                <button type="button" class="btn btn-open-detail" 
+		                                	data-bs-toggle="collapse" data-bs-target="#searchDetail--${pageName}">
+		                                    <i class="bx bx-chevron-down"></i>
+		                                    상세조회조건
+		                                </button>
+		                            </span>
+		                        </div>
+		                    </div>
 				        </div>
 				        <div id="searchDetail--${pageName}" class="container-search container-search-detail collapse">
 				            <div class="row">
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp
index f825f06f..f813450b 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp
@@ -11,48 +11,41 @@
 				    <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-search" id="btnSearch--${pageName}" title="검색">검색</button>
 				        </span>
 				    </div>
 
 				    <form id="frmSearch--${pageName}" name="frmSearch">
 				        <div class="container-search">
-				            <div class="row">
-				                <div class="col-11">
-				                    <div class="row">
-				                        <div class="col-12">
-				                            <select id="schDateOpt--${pageName}" name="schDateOpt" class="form-select">
-				                                <option value="crdnYmd">단속일자</option>
-				                                <option value="regDt">등록일자</option>
-				                            </select>
-				                            <span class="form-search-linebox">
-				                                <input type="text" id="schDateFrom--${pageName}" name="schDateFrom" class="form-control form-date" 
-				                                	data-fmt-type="day"   title="시작 날짜 선택" />
-				                                <button type="button" class="bx bx-calendar bg-white"></button>
-				                                ~
-				                                <input type="text" id="schDateTo--${pageName}" name="schDateTo" class="form-control form-date" 
-				                                	data-fmt-type="day" title="종료 날짜 선택">
-				                                <button type="button" class="bx bx-calendar bg-white"></button>
-				                            </span>
-				                        </div>
-				                        <div class="col-12">
-				                        	<input type="hidden" id="by--${pageName}" name="by" />
-											<input type="text" id="byOutput--${pageName}" class="form-control" readonly value="동적 검색" />
-											<input type="text" id="term--${pageName}" name="term" class="form-control" />
-				                        	<span class="flr">
-				                                <button type="button" class="btn btn-open-detail btn-sm" 
-				                                	data-bs-toggle="collapse" data-bs-target="#searchDetail--${pageName}">
-				                                    <i class="bx bx-chevron-down"></i>
-				                                    상세조회조건
-				                                </button>
-				                            </span>
-				                        </div>
-				                    </div>
-				                </div>
-				                <div class="col-1 d-flex align-items-center justify-content-center">
-				                    <button type="button" class="btn btn-search btn-square h-px-75" id="btnSearch--${pageName}" title="검색">검색</button>
-				                </div>
-				            </div>
+		                    <div class="row">
+		                        <div class="col-12">
+		                            <select id="schDateOpt--${pageName}" name="schDateOpt" class="form-select">
+		                                <option value="crdnYmd">단속일자</option>
+		                                <option value="regDt">등록일자</option>
+		                            </select>
+		                            <span class="form-search-linebox">
+		                                <input type="text" id="schDateFrom--${pageName}" name="schDateFrom" class="form-control form-date" 
+		                                	data-fmt-type="day"   title="시작 날짜 선택" />
+		                                <button type="button" class="bx bx-calendar bg-white"></button>
+		                                ~
+		                                <input type="text" id="schDateTo--${pageName}" name="schDateTo" class="form-control form-date" 
+		                                	data-fmt-type="day" title="종료 날짜 선택">
+		                                <button type="button" class="bx bx-calendar bg-white"></button>
+		                            </span>
+		                        </div>
+		                        <div class="col-12">
+		                        	<input type="hidden" id="by--${pageName}" name="by" />
+									<input type="text" id="byOutput--${pageName}" class="form-control" readonly value="동적 검색" />
+									<input type="text" id="term--${pageName}" name="term" class="form-control" />
+		                        	<span class="flr">
+		                                <button type="button" class="btn btn-open-detail" 
+		                                	data-bs-toggle="collapse" data-bs-target="#searchDetail--${pageName}">
+		                                    <i class="bx bx-chevron-down"></i>
+		                                    상세조회조건
+		                                </button>
+		                            </span>
+		                        </div>
+		                    </div>
 				        </div>
 				        <div id="searchDetail--${pageName}" class="container-search container-search-detail collapse">
 				            <div class="row">
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06040-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06040-main.jsp
index 89b0bedd..745c4408 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06040-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06040-main.jsp
@@ -11,61 +11,55 @@
 				    <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-search" id="btnSearch--${pageName}" title="검색">검색</button>
 				        </span>
 				    </div>
 
 				    <form id="frmSearch--${pageName}" name="frmSearch">
 				        <div class="container-search">
-				            <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">
-												<c:forEach items="${FIM001List}" var="item">
-													<label>
-														<input name="taskSeCd" type="radio" value="${item.code}"
-														class="form-check-input" alt="업무구분"
-														onchange="pageObject['${pageName}'].fnResetAndChangeBiz(this.value);">
-														${item.value}
-													</label> 
-												</c:forEach>
-				                            </span>
-				                        </div>
-				                        <div class="col-12">
-				                            <select id="schDateOpt--${pageName}" name="schDateOpt" class="form-select">
-				                                <option value="crdnYmd">단속일자</option>
-				                                <option value="regDt">등록일자</option>
-				                            </select>
-				                            <span class="form-search-linebox">
-				                                <input type="text" id="schDateFrom--${pageName}" name="schDateFrom" class="form-control form-date" 
-				                                	data-fmt-type="day"   title="시작 날짜 선택" />
-				                                <button type="button" class="bx bx-calendar bg-white"></button>
-				                                ~
-				                                <input type="text" id="schDateTo--${pageName}" name="schDateTo" class="form-control form-date" 
-				                                	data-fmt-type="day" title="종료 날짜 선택">
-				                                <button type="button" class="bx bx-calendar bg-white"></button>
-				                            </span>
-				                        </div>
-				                        <div class="col-12">
-				                        	<input type="hidden" id="by--${pageName}" name="by" />
-											<input type="text" id="byOutput--${pageName}" class="form-control" readonly value="동적 검색" />
-											<input type="text" id="term--${pageName}" name="term" class="form-control" />
-				                        	<span class="flr">
-				                                <button type="button" class="btn btn-open-detail btn-sm" 
-				                                	data-bs-toggle="collapse" data-bs-target="#searchDetail--${pageName}">
-				                                    <i class="bx bx-chevron-down"></i>
-				                                    상세조회조건
-				                                </button>
-				                            </span>
-				                        </div>
-				                    </div>
-				                </div>
-				                <div class="col-1 d-flex align-items-center justify-content-center">
-				                    <button type="button" class="btn btn-search btn-square h-px-75" id="btnSearch--${pageName}" title="검색">검색</button>
-				                </div>
-				            </div>
+		                    <div class="row">
+		                        <div class="col-12">
+		                            <label class="form-label fw-bold form-search-title">시스템구분</label>
+		                            <span class="form-search-linebox">
+										<c:forEach items="${FIM001List}" var="item">
+											<label>
+												<input name="taskSeCd" type="radio" value="${item.code}"
+												class="form-check-input" alt="업무구분"
+												onchange="pageObject['${pageName}'].fnResetAndChangeBiz(this.value);">
+												${item.value}
+											</label> 
+										</c:forEach>
+		                            </span>
+		                        </div>
+		                        <div class="col-12">
+		                            <select id="schDateOpt--${pageName}" name="schDateOpt" class="form-select">
+		                                <option value="crdnYmd">단속일자</option>
+		                                <option value="regDt">등록일자</option>
+		                            </select>
+		                            <span class="form-search-linebox">
+		                                <input type="text" id="schDateFrom--${pageName}" name="schDateFrom" class="form-control form-date" 
+		                                	data-fmt-type="day"   title="시작 날짜 선택" />
+		                                <button type="button" class="bx bx-calendar bg-white"></button>
+		                                ~
+		                                <input type="text" id="schDateTo--${pageName}" name="schDateTo" class="form-control form-date" 
+		                                	data-fmt-type="day" title="종료 날짜 선택">
+		                                <button type="button" class="bx bx-calendar bg-white"></button>
+		                            </span>
+		                        </div>
+		                        <div class="col-12">
+		                        	<input type="hidden" id="by--${pageName}" name="by" />
+									<input type="text" id="byOutput--${pageName}" class="form-control" readonly value="동적 검색" />
+									<input type="text" id="term--${pageName}" name="term" class="form-control" />
+		                        	<span class="flr">
+		                                <button type="button" class="btn btn-open-detail" 
+		                                	data-bs-toggle="collapse" data-bs-target="#searchDetail--${pageName}">
+		                                    <i class="bx bx-chevron-down"></i>
+		                                    상세조회조건
+		                                </button>
+		                            </span>
+		                        </div>
+		                    </div>
+
 				        </div>
 				        <div id="searchDetail--${pageName}" class="container-search container-search-detail collapse">
 				            <div class="row">