From 32e5c4f34e5ce9d1154dc5f623bb87e0cdb7a2cf Mon Sep 17 00:00:00 2001
From: leebj <leebj91@xit.co.kr>
Date: Thu, 4 Dec 2025 10:52:47 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B6=80=EA=B3=BC=20=EA=B3=A0=EC=A7=80=20?=
 =?UTF-8?q?=EC=8B=A4=EC=A0=81=20=ED=99=94=EB=A9=B4=20=EB=B3=B5=EC=9B=90(?=
 =?UTF-8?q?=EB=8B=B4=EB=8B=B9=EC=9E=90=20=EC=9A=94=EC=B2=AD=EC=9C=BC?=
 =?UTF-8?q?=EB=A1=9C=20=EB=B3=B5=EC=9B=90)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/ui/cfs/fine/FN053M01.xml           |   2 +-
 .../cfs/fine/dao/mapper/FinePm_mapper.xml     | 264 ++++++++----------
 2 files changed, 121 insertions(+), 145 deletions(-)

diff --git a/WebContent/ui/cfs/fine/FN053M01.xml b/WebContent/ui/cfs/fine/FN053M01.xml
index e05cb5c..b6d148a 100644
--- a/WebContent/ui/cfs/fine/FN053M01.xml
+++ b/WebContent/ui/cfs/fine/FN053M01.xml
@@ -239,7 +239,7 @@ scwin.btn_prt_onclick = function(e) {
 							</xf:item>
 							<xf:item>
 								<xf:label><![CDATA[압류촉탁]]></xf:label>
-								<xf:value><![CDATA[7]]></xf:value>
+								<xf:value><![CDATA[5]]></xf:value>
 							</xf:item>
 						</xf:choices>
 					</xf:select1>
diff --git a/src/main/java/cfs/fine/dao/mapper/FinePm_mapper.xml b/src/main/java/cfs/fine/dao/mapper/FinePm_mapper.xml
index 39bf327..e2e9bda 100644
--- a/src/main/java/cfs/fine/dao/mapper/FinePm_mapper.xml
+++ b/src/main/java/cfs/fine/dao/mapper/FinePm_mapper.xml
@@ -18,60 +18,61 @@
 	</resultMap>
 	<!-- 부과고지 및 납부실적 조회 [FN053M01] -->
 	<select id="findFinePmList" parameterType="cfs.fine.vo.FinePmVO" resultMap="findFinePmList-resultMap">
-    SELECT Z.YEAR
-         , (Z.YEAR || '/' || Z.MONTH) AS MONTH
-         , Z.MOTION_ID
-         , Z.MOTION_ID2
-         , Z.GOJI_CNT
-         , Z.GOJI_AMT
-         , Z.NABU_CNT
-         , Z.NABU_AMT
-         , DECODE(R, 1, Z.GAM_CNT, 0) AS GAM_CNT
-         , DECODE(R, 1, Z.GAM_AMT, 0) AS GAM_AMT
-         , Z.DOB_CNT
-         , Z.DOB_AMT
-      FROM ( SELECT Y.YEAR
-                  , Y.MONTH
-                  , Y.MOTION_ID
-                  , DECODE(Y.MOTION_ID, '1', '차적조회'
-                                      , '2', '사전통지'
-                                      , '3', '1차고지'
-                                      , '4', '2차고지'
-                                      , '5', '민원처리'
-                                      , '7', '압류촉탁'
-                                      , '9', '수납완료') AS MOTION_ID2
-                  , SUM(Y.GOJI_CNT) AS GOJI_CNT
-                  , SUM(Y.GOJI_AMT) AS GOJI_AMT
-                  , SUM(Y.NABU_CNT) AS NABU_CNT
-                  , SUM(Y.NABU_AMT) AS NABU_AMT
-                  , RANK( ) OVER (PARTITION BY Y.YEAR, Y.MONTH ORDER BY Y.MOTION_ID) AS R
+    SELECT YEAR
+         , (YEAR || '/' || MONTH) AS MONTH
+         , MOTION_ID
+         , MOTION_ID2
+         , GOJI_CNT
+         , GOJI_AMT
+         , NABU_CNT
+         , NABU_AMT
+         , DOB_CNT
+         , DOB_AMT
+         , R
+         , decode(R, 1, GAM_CNT, 0) GAM_CNT
+         , decode(R, 1, GAM_AMT, 0) GAM_AMT
+      FROM ( SELECT YEAR
+                  , MONTH
+                  , MOTION_ID
+                  , DECODE(MOTION_ID, '1', '차적조회'
+                                    , '2', '사전통지'
+                                    , '3', '1차고지'
+                                    , '4', '2차고지'
+                                    , '5', '민원처리'
+                                    , '7', '압류촉탁'
+                                    , '9', '수납완료') MOTION_ID2
+                  , SUM(GOJI_CNT) GOJI_CNT
+                  , SUM(GOJI_AMT) GOJI_AMT
+                  , SUM(NABU_CNT) NABU_CNT
+                  , SUM(NABU_AMT) NABU_AMT
+                  , SUM(DOB_CNT) DOB_CNT
+                  , SUM(DOB_AMT) DOB_AMT
+                  , RANK( ) OVER (PARTITION BY YEAR, MONTH ORDER BY MOTION_ID) R
                   , ( SELECT COUNT(*)
                         FROM PENALTY_DETAIL_INFO_DAMO T
-                       WHERE T.NOTICE_ID = '99'
-                         AND T.NOTICE_WRONG_ID = '01'
-                         AND T.YEAR = Y.YEAR
-                         AND T.MONTH = Y.MONTH 
+                       WHERE A.YEAR = T.YEAR
+                         AND A.MONTH = T.MONTH 
+                         AND NOTICE_ID = '99'
+                         AND NOTICE_WRONG_ID = '01'
                        <if test= "fareOfficeId!=null and !fareOfficeId.equals('')" >
-                         AND T.FARE_OFFICE_ID IN (#{fareOfficeId}) 
+                         AND FARE_OFFICE_ID IN (#{fareOfficeId}) 
                        </if>
                     ) GAM_CNT
-                  , ( SELECT NVL(SUM(NVL(T.FINE_AMOUNT, 0)),0) 
+                  , ( SELECT NVL(SUM(NVL(T.FINE_AMOUNT, 0) + NVL(T.PASS_AMOUNT, 0) ), 0)
                         FROM PENALTY_DETAIL_INFO_DAMO T
-                       WHERE T.NOTICE_ID = '99'
-                         AND T.NOTICE_WRONG_ID = '01'
-                         AND T.YEAR = Y.YEAR
-                         AND T.MONTH = Y.MONTH
+                       WHERE A.YEAR = T.YEAR
+                         AND A.MONTH = T.MONTH 
+                         AND NOTICE_ID = '99'
+                         AND NOTICE_WRONG_ID = '01'
                        <if test= "fareOfficeId!=null and !fareOfficeId.equals('')" >
-                         AND T.FARE_OFFICE_ID IN (#{fareOfficeId}) 
+                         AND FARE_OFFICE_ID IN (#{fareOfficeId}) 
                        </if>
                     ) GAM_AMT
-                  , SUM(Y.DOB_CNT) AS DOB_CNT
-                  , SUM(Y.DOB_AMT) AS DOB_AMT
-               FROM ( SELECT X1.YEAR                          AS YEAR
-                           , X1.MONTH                         AS MONTH
-                           , X1.MOTION_ID                     AS MOTION_ID
+               FROM ( SELECT YEAR
+                           , MONTH
+                           , MOTION_ID
                            , COUNT(*)                         AS GOJI_CNT
-                           , SUM(X1.AMT)                      AS GOJI_AMT
+                           , NVL(SUM(NVL(LAVY_AMOUNT, 0)), 0) AS GOJI_AMT
                            , 0                                AS NABU_CNT
                            , 0                                AS NABU_AMT
                            , 0                                AS GAM_CNT
@@ -82,19 +83,22 @@
                                     , A.MONTH
                                     , A.PENALTY_MANAGE_YEAR
                                     , A.PENALTY_SEQNO
-                                    , A.PASS_DATE
-                                    , SUBSTR(B.MOTION_ID, 1, 1)                  AS MOTION_ID
-                                    , FUN_GET_PEN_AMT(SUBSTR(B.MOTION_ID, 1, 1)
-                                                    , A.PASS_DATE
-                                                    , NVL(A.FINE_AMOUNT, 0)
-                                                    , NVL(A.PASS_AMOUNT, 0))     AS AMT
+                                    , NVL(A.FINE_AMOUNT, 0) + NVL(A.PASS_AMOUNT, 0) LAVY_AMOUNT
+                                    , SUBSTR(B.MOTION_ID, 1, 1) MOTION_ID
                                  FROM PENALTY_DETAIL_INFO_DAMO A
                                     , SEND_INFO B
                                 WHERE A.PENALTY_MANAGE_YEAR = B.PENALTY_MANAGE_YEAR
                                   AND A.PENALTY_SEQNO = B.PENALTY_SEQNO 
-                                  AND B.MOTION_ID IN ('21','23','25'
+                                  AND B.MOTION_ID NOT IN ('71','72')
+                                  AND B.MOTION_ID IN ('11','13'
+                                                     ,'21','23','25'
                                                      ,'31','33','35','37'
-                                                     ,'41','43','45','47','49')
+                                                     ,'41','43','45','47','49'
+                                                     ,'51'
+                                                     ,'61'
+                                                     ,'71','77'
+                                                     ,'81'
+                                                     ,'91')
                                   AND A.PASS_DATE BETWEEN #{inStDate}||'01' AND #{inEdDate}||'31' 
                                <if test= "fareOfficeId!=null and !fareOfficeId.equals('')" >
                                   AND A.FARE_OFFICE_ID IN (#{fareOfficeId}) 
@@ -105,23 +109,19 @@
                              GROUP BY A.YEAR
                                     , A.MONTH
                                     , A.PENALTY_MANAGE_YEAR
-                                    , A.PENALTY_SEQNO
-                                    , A.PASS_DATE
                                     , SUBSTR(B.MOTION_ID, 1, 1)
-                                    , NVL(A.FINE_AMOUNT, 0)
-                                    , NVL(A.PASS_AMOUNT, 0)
-                             ) X1
-                    GROUP BY X1.YEAR
-                           , X1.MONTH
-                           , X1.MOTION_ID
-                           
+                                    , A.PENALTY_SEQNO
+                                    , NVL(A.FINE_AMOUNT, 0) + NVL(A.PASS_AMOUNT, 0)
+                             )
+                    GROUP BY YEAR
+                           , MONTH
+                           , MOTION_ID
                     UNION ALL
-                    
-                      SELECT X2.YEAR                          AS YEAR
-                           , X2.MONTH                         AS MONTH
-                           , '7'                              AS MOTION_ID
+                      SELECT YEAR
+                           , MONTH
+                           , '7' AS MOTION_ID
                            , COUNT(*)                         AS GOJI_CNT
-                           , SUM(X2.AMT)                      AS GOJI_AMT
+                           , NVL(SUM(NVL(LAVY_AMOUNT, 0)), 0) AS GOJI_AMT
                            , 0                                AS NABU_CNT
                            , 0                                AS NABU_AMT
                            , 0                                AS GAM_CNT
@@ -132,11 +132,7 @@
                                     , A.MONTH
                                     , A.PENALTY_MANAGE_YEAR
                                     , A.PENALTY_SEQNO
-                                    , A.PASS_DATE
-                                    , FUN_GET_PEN_AMT('7'
-                                                    , A.PASS_DATE
-                                                    , NVL(A.FINE_AMOUNT, 0)
-                                                    , NVL(A.PASS_AMOUNT, 0))     AS AMT
+                                    , NVL(A.FINE_AMOUNT,0) + NVL(A.PASS_AMOUNT,0) LAVY_AMOUNT
                                  FROM PENALTY_DETAIL_INFO_DAMO A
                                     , SEIZURE_INFO B
                                 WHERE A.SEIZURE_MANAGE_YEAR = B.SEIZURE_MANAGE_YEAR
@@ -152,44 +148,40 @@
                                     , A.MONTH
                                     , A.PENALTY_MANAGE_YEAR
                                     , A.PENALTY_SEQNO
-                                    , A.PASS_DATE
-                                    , NVL(A.FINE_AMOUNT, 0)
-                                    , NVL(A.PASS_AMOUNT, 0) 
-                             ) X2
-                    GROUP BY X2.YEAR
-                           , X2.MONTH
-                           
+                                    , NVL(A.FINE_AMOUNT, 0) + NVL(A.PASS_AMOUNT, 0) 
+                             )
+                    GROUP BY YEAR
+                           , MONTH
                     UNION ALL
-                    
-                      SELECT X3.YEAR                          AS YEAR
-                           , X3.MONTH                         AS MONTH
-                           , X3.MOTION_ID                     AS MOTION_ID
+                      SELECT YEAR
+                           , MONTH
+                           , MOTION_ID
                            , 0                                AS GOJI_CNT
                            , 0                                AS GOJI_AMT
                            , COUNT(*)                         AS NABU_CNT
-                           , SUM(X3.AMT)                      AS NABU_AMT
+                           , NVL(SUM(NVL(LAVY_AMOUNT, 0)), 0) AS NABU_AMT
                            , 0                                AS GAM_CNT
                            , 0                                AS GAM_AMT
                            , 0                                AS DOB_CNT
                            , 0                                AS DOB_AMT
                         FROM ( SELECT A.YEAR
                                     , A.MONTH
+                                    , SUBSTR(B.RECEIPT_ID, 1, 1) MOTION_ID
                                     , A.PENALTY_MANAGE_YEAR
                                     , A.PENALTY_SEQNO
-                                    , A.PASS_DATE
-                                    , SUBSTR(B.RECEIPT_ID, 1, 1) AS MOTION_ID
-                                    , FUN_GET_PEN_AMT(SUBSTR(B.RECEIPT_ID, 1, 1)
-                                                    , A.PASS_DATE
-                                                    , NVL(A.FINE_AMOUNT, 0)
-                                                    , NVL(A.PASS_AMOUNT, 0))      AS AMT
+                                    , NVL(A.FINE_AMOUNT, 0) + NVL(A.PASS_AMOUNT, 0) LAVY_AMOUNT
                                  FROM PENALTY_DETAIL_INFO_DAMO A
                                     , RECEIPT_INFO B
                                 WHERE A.PENALTY_MANAGE_YEAR = B.PENALTY_MANAGE_YEAR
                                   AND A.PENALTY_SEQNO = B.PENALTY_SEQNO 
-                                  AND B.RECEIPT_ID IN ('21','23','25'
+                                  AND B.RECEIPT_ID IN ('11','13'
+                                                      ,'21','23','25'
                                                       ,'31','33','35','37'
                                                       ,'41','43','45','47','49'
-                                                      ,'71')
+                                                      ,'51'
+                                                      ,'61'
+                                                      ,'71','77'
+                                                      ,'81')
                                   AND A.PASS_DATE BETWEEN #{inStDate}||'01' AND #{inEdDate}||'31'
                                <if test= "fareOfficeId!=null and !fareOfficeId.equals('')" >
                                   AND A.FARE_OFFICE_ID IN (#{fareOfficeId}) 
@@ -197,70 +189,54 @@
                                <if test= "!motionId.equals('all')" >
                                   AND SUBSTR(B.RECEIPT_ID, 1, 1) IN (#{motionId}) 
                                </if>
-                             GROUP BY A.YEAR
-                                    , A.MONTH
-                                    , A.PENALTY_MANAGE_YEAR
-                                    , A.PENALTY_SEQNO
-                                    , A.PASS_DATE
-                                    , B.RECEIPT_ID
-                                    , NVL(A.FINE_AMOUNT, 0)
-                                    , NVL(A.PASS_AMOUNT, 0) 
-                             ) X3
-                    GROUP BY X3.YEAR
-                           , X3.MONTH
-                           , X3.MOTION_ID
-                           
+                             )
+                    GROUP BY YEAR
+                           , MONTH
+                           , MOTION_ID
                     UNION ALL
-
-                      SELECT X4.YEAR         AS YEAR
-                           , X4.MONTH        AS MONTH
-                           , X4.MOTION_ID    AS MOTION_ID
-                           , 0               AS GOJI_CNT
-                           , 0               AS GOJI_AMT
-                           , 0               AS NABU_CNT
-                           , 0               AS NABU_AMT
-                           , 0               AS GAM_CNT
-                           , 0               AS GAM_AMT
-                           , COUNT(*)        AS DOB_CNT
-                           , SUM(X4.AMT)     AS DOB_AMT
+                      SELECT YEAR
+                           , MONTH
+                           , MOTION_ID
+                           , 0            AS GOJI_CNT
+                           , 0            AS GOJI_AMT
+                           , 0            AS NABU_CNT
+                           , 0            AS NABU_AMT
+                           , 0            AS GAM_CNT
+                           , 0            AS GAM_AMT
+                           , SUM(DOB_CNT) AS DOB_CNT
+                           , SUM(DOB_AMT) AS DOB_AMT
                         FROM ( SELECT A.YEAR
                                     , A.MONTH
                                     , A.PENALTY_MANAGE_YEAR
                                     , A.PENALTY_SEQNO
-                                    , A.PASS_DATE
-                                    , SUBSTR(A.MOTION_ID, 1, 1)                     AS MOTION_ID
-                                    , FUN_GET_PEN_AMT(SUBSTR(A.MOTION_ID, 1, 1)
-                                                    , A.PASS_DATE
-                                                    , NVL(A.FINE_AMOUNT, 0)
-                                                    , NVL(A.PASS_AMOUNT, 0))        AS AMT
+                                    , SUBSTR(A.BEFORE_MOTION_ID, 1, 1) MOTION_ID
+                                    , NVL(A.FINE_AMOUNT, 0) + NVL(A.PASS_AMOUNT, 0) DOB_AMT
+                                    , 1 DOB_CNT
                                  FROM PENALTY_DETAIL_INFO_DAMO A
-                                WHERE A.PASS_DATE BETWEEN #{inStDate}||'01' AND #{inEdDate}||'31'
-                                  AND A.MOTION_ID NOT IN('11','12','13','91','92') 
-                                  AND A.C_LOSS = '1'
-                             <if test= "fareOfficeId!=null and !fareOfficeId.equals('')" >
+                                WHERE A.C_LOSS = '1'
+                                  AND A.MOTION_ID NOT IN ('11','12','13')
+                                  AND A.PASS_DATE BETWEEN #{inStDate}||'01' AND #{inEdDate}||'31'
+                                <if test= "fareOfficeId!=null and !fareOfficeId.equals('')" >
                                   AND A.FARE_OFFICE_ID IN(#{fareOfficeId}) 
-                             </if>
-                             <if test= "!motionId.equals('all')" >
-                                  AND SUBSTR(A.MOTION_ID, 1, 1) IN(#{motionId}) 
-                             </if>
+                                </if>
+                                <if test= "!motionId.equals('all')" >
+                                  AND SUBSTR(a.MOTION_ID, 1, 1) IN (#{motionId}) 
+                                </if>
                              GROUP BY A.YEAR
                                     , A.MONTH
                                     , A.PENALTY_MANAGE_YEAR
                                     , A.PENALTY_SEQNO
-                                    , A.PASS_DATE
-                                    , SUBSTR(A.MOTION_ID,1,1)
-                                    , NVL(A.FINE_AMOUNT,0)
-                                    , NVL(A.PASS_AMOUNT,0) 
-                             ) X4
-                    GROUP BY X4.YEAR
-                           , X4.MOTION_ID
-                           , X4.MONTH 
-                           
-                    ) Y
-           GROUP BY Y.YEAR
-                  , Y.MONTH
-                  , Y.MOTION_ID
-           ) Z
+                                    , SUBSTR(A.BEFORE_MOTION_ID, 1, 1)
+                                    , NVL(A.FINE_AMOUNT, 0) + NVL(A.PASS_AMOUNT, 0)
+                             )
+                    GROUP BY YEAR
+                           , MOTION_ID
+                           , MONTH
+                    ) A
+           GROUP BY YEAR
+                  , MONTH
+                  , MOTION_ID
+           ) A
   ORDER BY 1
          , 2
          , 3