From e57208b2d402d24004d23c3f08524422a0e7c6d0 Mon Sep 17 00:00:00 2001
From: jjh <jaehyun81@xit.co.kr>
Date: Thu, 4 Jul 2024 17:46:20 +0900
Subject: [PATCH] =?UTF-8?q?1.=20=ED=86=B5=ED=95=A9=EC=A1=B0=ED=9A=8C=20-?=
 =?UTF-8?q?=20=EA=B0=90=EA=B2=BD=EA=B5=AC=EB=B6=84=20=20=EC=B6=94=EA=B0=80?=
 =?UTF-8?q?.=202.=20=EC=83=88=EC=98=AC,=20=EA=B5=AD=EB=AF=BC=EC=8B=A0?=
 =?UTF-8?q?=EB=AC=B8=EA=B3=A0=20=ED=85=8C=EC=9D=B4=EB=B8=94=20=EC=A1=B0?=
 =?UTF-8?q?=EC=9D=B8=20=EC=82=AD=EC=A0=9C.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fims/sprt/integrationSearch-mapper.xml    | 73 +++++++------------
 .../WEB-INF/jsp/fims/sprt/sprt01014-info.jsp  |  4 +
 .../WEB-INF/jsp/fims/sprt/sprt01015-info.jsp  |  7 +-
 3 files changed, 36 insertions(+), 48 deletions(-)

diff --git a/src/main/resources/sql/mapper/fims/sprt/integrationSearch-mapper.xml b/src/main/resources/sql/mapper/fims/sprt/integrationSearch-mapper.xml
index decea6cc..b8c13fd4 100644
--- a/src/main/resources/sql/mapper/fims/sprt/integrationSearch-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/sprt/integrationSearch-mapper.xml
@@ -25,7 +25,6 @@
          , CC.CVLCPT_RCPT_NO            <!-- 민원 접수 번호 -->
          , CC.CVLCPT_RCPT_YMD           <!-- 민원 접수 일자 -->
          , CC.CVLCPT_LIST_NO            <!-- 민원 목록 번호 -->
-         , EI.CEL_NO_V                  <!-- 민원인 휴대폰 번호 -->
          , C.VHRNO                      <!-- 차량번호 -->
          , L.RPM_SZR_VHRNO              <!-- 대체차량번호 -->
          , (GET_CODE_NM('FIM009', CA.FFNLG_CARMDL_CD))  AS FFNLG_CARMDL_NM
@@ -77,6 +76,7 @@
          , L.LEVY_ID                    <!-- 부과 ID -->
          , L.INST_CD                    <!-- 기관 코드 -->
          , L.DEPT_CD                    <!-- 부서 코드 -->
+         , L.SPCL_BIZ_CD                <!-- 특별회계 사업 코드 -->
          , L.FYR                        <!-- 회계 연도 -->
          , L.ACNTG_SE_CD                <!-- 회계 구분 -->
          , L.TXITM_CD                   <!-- 세목 코드 -->
@@ -85,18 +85,16 @@
          , CONCAT(L.FYR, '-', L.LEVY_NO)    AS GOJI_NO
          , L.LEVY_SE_CD                 <!-- 부과 구분 코드 -->
          , (GET_CODE_NM('FIM040', L.LEVY_SE_CD))        AS LEVY_SE_NM
+         , L.RDUCT_SE_CD                <!-- 감경 구분 코드 -->
+         , (GET_CODE_NM('FIM046', L.RDUCT_SE_CD))       AS RDUCT_SE_NM
          , L.LEVY_PCPTAX                <!-- 부과 본세 -->
          , L.LEVY_ADAMT                 <!-- 부과 가산금 -->
-         , L.INSPY_INT                  <!-- 분납 이자 -->
-         , L.PAY_MTHD_SE_CD             <!-- 납부 방법 구분 코드 -->
-         , (GET_CODE_NM('FIM045', L.PAY_MTHD_SE_CD))    AS PAY_MTHD_SE_NM
-         , L.RCVMT_YMD                  <!-- 수납 일자 -->
          , L.RCVMT_PCPTAX               <!-- 수납 본세 -->
          , L.RCVMT_ADAMT                <!-- 수납 가산금 -->
          , L.RDCAMT_PCPTAX              <!-- 감액 본세 -->
          , L.RDCAMT_ADAMT               <!-- 감액 가산금 -->
          , L.SUM_AMT                    <!-- 합계 금액 -->
-         , (L.LEVY_PCPTAX   + L.LEVY_ADAMT)     AS LEVY_AMT     <!-- 부과금액 -->
+         , (L.LEVY_PCPTAX   + L.LEVY_ADAMT)     AS LEVY_AMT     <!-- 부과 금액 -->
          , (L.RCVMT_PCPTAX  + L.RCVMT_ADAMT)    AS RCVMT_AMT    <!-- 수납 금액 -->
          , (L.RDCAMT_PCPTAX + L.RDCAMT_ADAMT)   AS REDUC_AMT    <!-- 감액 금액 -->
          , GET_MINAP_AMT(C.CRDN_ID)             AS MINAP_AMT    <!-- 미납 금액 -->
@@ -105,6 +103,9 @@
          , L.DUDT_YMD                   <!-- 납기 일자 -->
          , L.DUDT_AFTR_YMD              <!-- 납기후 금액 -->
          , L.DUDT_AFTR_AMT              <!-- 납기후 일자 -->
+         , L.RCVMT_YMD                  <!-- 수납 일자 -->
+         , L.PAY_MTHD_SE_CD             <!-- 납부 방법 구분 코드 -->
+         , (GET_CODE_NM('FIM045', L.PAY_MTHD_SE_CD))    AS PAY_MTHD_SE_NM
          , L.EPAYNO                     <!-- 전자납부번호 -->
          , L.BANK_NM                    <!-- 은행명 -->
          , L.VR_ACTNO                   <!-- 가상계좌번호 -->
@@ -112,37 +113,26 @@
          , L.SZR_RMV_YMD                <!-- 압류 해제 일자 -->
          , V.TXITM_NM                   <!-- 세목 명 -->
          , (CASE
-            WHEN (R.RCVMT_ID IS NOT NULL) OR (C.CRDN_STTS_CD IN ('81','82','83','84','85','86','87','88'))
+            WHEN C.CRDN_STTS_CD IN ('81','82','83','84','85','86','87','88')
             THEN 'Y'
             ELSE 'N'
             END) AS RCVMT_ETC_YN        <!-- 수납,기타 여부 -->
          , (CASE
-            WHEN (R.RCVMT_ID IS NOT NULL) OR (C.CRDN_STTS_CD IN ('81','82','83','84','85','86','87','88'))
+            WHEN C.CRDN_STTS_CD IN ('81','82','83','84','85','86','87','88')
             THEN
-                 CASE
-                 WHEN C.CRDN_STTS_CD IN ('88')
-                 THEN '법원이송'
-                 WHEN C.CRDN_STTS_CD IN ('71','72','73','74','75')
-                 THEN '수납'
-                 WHEN C.CRDN_STTS_CD IN ('76','77')
-                 THEN '결손'
-                 ELSE '기타'
+                 CASE WHEN C.CRDN_STTS_CD IN ('88')                     THEN '법원이송'
+                      WHEN C.CRDN_STTS_CD IN ('71','72','73','74','75') THEN '수납'
+                      WHEN C.CRDN_STTS_CD IN ('76','77')                THEN '결손'
+                      ELSE '기타'
                   END
             ELSE
-                 CASE
-                 WHEN C.CRDN_STTS_CD IN ('55')
-                 THEN '압류'
-                 WHEN C.CRDN_STTS_CD IN ('53','54')
-                 THEN '압류예정'
-                 WHEN C.CRDN_STTS_CD IN ('52')
-                 THEN '독촉'
-                 WHEN C.CRDN_STTS_CD IN ('51','61')
-                 THEN '부과'
-                 WHEN C.CRDN_STTS_CD IN ('41','42','43')
-                 THEN '자납부과'
-                 WHEN C.CRDN_STTS_CD IN ('31')
-                 THEN '의견진술접수'
-                 ELSE '단속'
+                 CASE WHEN C.CRDN_STTS_CD IN ('55')             THEN '압류'
+                      WHEN C.CRDN_STTS_CD IN ('53','54')        THEN '압류예정'
+                      WHEN C.CRDN_STTS_CD IN ('52')             THEN '독촉'
+                      WHEN C.CRDN_STTS_CD IN ('51','61')        THEN '부과'
+                      WHEN C.CRDN_STTS_CD IN ('41','42','43')   THEN '자납부과'
+                      WHEN C.CRDN_STTS_CD IN ('31')             THEN '의견진술접수'
+                      ELSE '단속'
                   END
             END) AS TAB_GROUP           <!-- 탭 그룹 -->
          , C.DEL_YN                     <!-- 삭제 여부 -->
@@ -156,17 +146,14 @@
          , C.DLTR                       <!-- 삭제자 -->
          , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = C.DLTR) AS DLTR_NM
          , C.DEL_RSN                    <!-- 삭제 사유 -->
-      FROM TB_CRDN               C                                                                          <!-- 단속 대장 -->
-     INNER JOIN TB_CRDN_ADI      CA  ON (C.CRDN_ID  = CA.CRDN_ID)                                           <!-- 단속 부가 정보 -->
-     INNER JOIN TB_VLTN          V   ON (C.VLTN_ID  = V.VLTN_ID)                                            <!-- 위반 정보 -->
-LEFT OUTER JOIN TB_CRDN_CVLCPT   CC  ON (C.CVLCPT_LINK_YN = 'Y' AND C.LINK_ID = CC.CVLCPT_LINK_ID)          <!-- 단속 민원 대장 -->
-LEFT OUTER JOIN TB_LEVY_EXCL     LE  ON (C.CRDN_ID = LE.CRDN_ID AND LE.DEL_YN = 'N')                        <!-- 부과 제외 대장 -->
-LEFT OUTER JOIN TB_ESB_INTERFACE EI  ON (C.LINK_TBL_NM = 'TB_ESB_INTERFACE' AND C.LINK_ID = EI.INTERFACE_SEQ_N) <!-- 국민신문고 민원 연계 -->
-LEFT OUTER JOIN TB_SA_CVLCPT_DTL SCD ON (C.LINK_TBL_NM = 'TB_SA_CVLCPT_DTL' AND C.LINK_ID = SCD.DTL_ID)         <!-- 새올 민원 연계 -->
-LEFT OUTER JOIN TB_PAYER         P   ON (C.RTPYR_ID = P.RTPYR_ID)                                           <!-- 납부자 대장 -->
-LEFT OUTER JOIN TB_PAYER_ADDR    PA  ON (C.RTPYR_ID = PA.RTPYR_ID AND C.ADDR_SN = PA.ADDR_SN)               <!-- 납부자 주소 대장 -->
-LEFT OUTER JOIN TB_LEVY          L   ON (C.CRDN_ID  = L.CRDN_ID AND L.DEL_YN = 'N')                         <!-- 부과 대장 -->
-LEFT OUTER JOIN TB_RCVMT         R   ON (L.LEVY_ID = R.LEVY_ID AND R.DEL_YN = 'N')                          <!-- 수납 대장 -->
+      FROM TB_CRDN               C                                                                  <!-- 단속 대장 -->
+     INNER JOIN TB_CRDN_ADI      CA  ON (C.CRDN_ID  = CA.CRDN_ID)                                   <!-- 단속 부가 정보 -->
+     INNER JOIN TB_VLTN          V   ON (C.VLTN_ID  = V.VLTN_ID)                                    <!-- 위반 정보 -->
+LEFT OUTER JOIN TB_CRDN_CVLCPT   CC  ON (C.CVLCPT_LINK_YN = 'Y' AND C.LINK_ID = CC.CVLCPT_LINK_ID)  <!-- 단속 민원 대장 -->
+LEFT OUTER JOIN TB_LEVY_EXCL     LE  ON (C.CRDN_ID = LE.CRDN_ID AND LE.DEL_YN = 'N')                <!-- 부과 제외 대장 -->
+LEFT OUTER JOIN TB_PAYER         P   ON (C.RTPYR_ID = P.RTPYR_ID)                                   <!-- 납부자 대장 -->
+LEFT OUTER JOIN TB_PAYER_ADDR    PA  ON (C.RTPYR_ID = PA.RTPYR_ID AND C.ADDR_SN = PA.ADDR_SN)       <!-- 납부자 주소 대장 -->
+LEFT OUTER JOIN TB_LEVY          L   ON (C.CRDN_ID  = L.CRDN_ID AND L.DEL_YN = 'N')                 <!-- 부과 대장 -->
      WHERE C.DEL_YN     =  'N'
 <if test='crdnIds != null'>
        AND C.CRDN_ID    IN (<foreach collection="crdnIds" item="CRDN_ID" separator=",">#{CRDN_ID}</foreach>)
@@ -273,10 +260,6 @@ LEFT OUTER JOIN TB_RCVMT         R   ON (L.LEVY_ID = R.LEVY_ID AND R.DEL_YN = 'N
       <when test="item.name == 'cvlcptListNo'">
        AND CC.CVLCPT_LIST_NO = #{item.value}
       </when>
-      <when test="item.name == 'celNoV'">
-       AND EI.CEL_NO_V = #{item.value}
-      </when>
-
     </choose>
   </foreach>
 </if>
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01014-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01014-info.jsp
index 971552b2..7aaf42ef 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01014-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01014-info.jsp
@@ -114,6 +114,10 @@
 	>견인여부
 	</th>
 	<th class="cmn" style="width: 120px;"
+	onclick="searchFromGridTitle('RDUCT_SE_CD', this.innerText, 'codeValue', 'FIM046');"
+	>감경구분
+	</th>
+	<th class="cmn" style="width: 120px;"
 	onclick="searchFromGridTitle('LEVY_YMD', this.innerText, 'ymd', '');"
 	>부과일자
 	</th>
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01015-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01015-info.jsp
index fc429434..781c0efe 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01015-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01015-info.jsp
@@ -38,9 +38,10 @@
 		<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{OPNN_SBMSN_YN_NM}</td>
 		<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{ADVNTCE_DUDT_YMD}</td>
 		<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{TOWNG_YN_NM}</td>
+		<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{RDUCT_SE_NM}</td>
 		<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{LEVY_YMD}</td>
-		<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DUDT_YMD}</td>
-		<td class="cmn fw-bold text-red text-end" onclick="{onclick}" ondblclick="{ondblclick}">{MINAP_AMT}</td>
+		<td class="cmn fw-bold text-blue text-center"   onclick="{onclick}" ondblclick="{ondblclick}">{DUDT_YMD}</td>
+		<td class="cmn fw-bold text-red  text-end"      onclick="{onclick}" ondblclick="{ondblclick}">{MINAP_AMT}</td>
 		<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DUDT_AFTR_YMD}</td>
 		<td class="cmn text-end"    onclick="{onclick}" ondblclick="{ondblclick}">{DUDT_AFTR_AMT}</td>
 		<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{SZR_YMD}</td>
@@ -64,6 +65,6 @@
 
 <template id="notFound--${pageName}">
 	<tr class="odd">
-		<td valign="top" colspan="48" class="dataTables_empty text-center">정보를 찾지 못했습니다.</td>
+		<td valign="top" colspan="49" class="dataTables_empty text-center">정보를 찾지 못했습니다.</td>
 	</tr>
 </template>
\ No newline at end of file