From c4afe58153a6bb5961de994066e6898e72aa7b83 Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Fri, 14 Jul 2023 14:29:36 +0900
Subject: [PATCH] =?UTF-8?q?=EB=AF=BC=EC=9B=90=20=EC=A1=B0=ED=9A=8C=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml | 8 ++++++--
 src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml | 2 +-
 src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp  | 2 +-
 src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01030-main.jsp  | 2 +-
 4 files changed, 9 insertions(+), 5 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 1ae77795..4212a945 100644
--- a/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml
@@ -156,7 +156,7 @@ 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 <!-- 민원 처리 담당자 전화번호 -->
      , CC.CVLCPT_RCPT_YMD                             <!-- 민원 접수 일자 -->
      , CC.CVLCPT_PRCS_PRNMNT_DT                       <!-- 민원 처리 예정 일시 -->
      , CONCAT(C.CRDN_YMD,'',C.CRDN_TM) AS CRDN_YMD_TM <!-- 단속 일시 -->
@@ -169,6 +169,7 @@ SELECT C.CRDN_ID                                      <!-- 단속 ID -->
   INNER JOIN TB_CRDN_CVLCPT CC ON (C.CRDN_ID = CC.CRDN_ID)
  WHERE C.DEL_YN = 'N'
    AND C.TASK_SE_CD = #{taskSeCd}
+   AND C.CRDN_STTS_CD = '01'
 <if test="by != null and by != '' and term != null">
 
 </if>
@@ -184,7 +185,7 @@ SELECT C.CRDN_ID                                      <!-- 단속 ID -->
      , (SELECT VLTN_ARTCL FROM TB_VLTN_INFO WHERE VLTN_ID = C.VLTN_ID) ASVLTN_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 <!-- 민원 처리 담당자 전화번호 -->
      , CC.CVLCPT_RCPT_YMD       <!-- 민원 접수 일자 -->
      , CC.CVLCPT_PRCS_PRNMNT_DT <!-- 민원 처리 예정 일시 -->
      , CONCAT(C.CRDN_YMD,'',C.CRDN_TM) AS CRDN_YMD_TM <!-- 단속 일시 -->
@@ -197,6 +198,9 @@ SELECT C.CRDN_ID                                      <!-- 단속 ID -->
   LEFT OUTER JOIN TB_LEVY_EXCL LE ON (C.CRDN_ID = LE.CRDN_ID)
  WHERE C.DEL_YN = 'N'
    AND C.TASK_SE_CD = #{taskSeCd}
+   AND C.CRDN_STTS_CD IN ('21','81','83')
+   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>
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 3b1bfff5..f9e100f7 100644
--- a/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml
@@ -270,7 +270,7 @@ SELECT C.CRDN_ID                                      <!-- 단속 ID -->
 </if>
 <if test="taskSeCd == 'PVS'">
     <if test="schExclTimeout == on">
-    <!-- TODO : 2시간 초과 제외 -->
+    	AND OVTIME_YN = 'N'
     </if>
 </if>
 <if test="by != null and by != '' and term != null">
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 8b504e03..7b54cea2 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
@@ -95,7 +95,7 @@
 											<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>
-				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{담당자전화번호}</td>
+				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{CVLCPT_PRCS_PIC_TELNO}</td>
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{CVLCPT_RCPT_YMD}</td>
 				                    		<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>
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 3951a672..2dcdc8ff 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
@@ -99,7 +99,7 @@
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{ASVLTN_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">{담당자전화번호}</td>
+				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{CVLCPT_PRCS_PIC_TELNO}</td>
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{CVLCPT_RCPT_YMD}</td>
 				                    		<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>