1차고지 후 2차고지 전 자료의 가산금 표시 수정(2014년1월8일이전자료=가산금미표시,2017년6월2일이전자료=가산금5%,그외자료=가산금3%)

src/main/java/cfs/fine/dao/mapper/FineArrears_mapper.xml

@@ -166,8 +166,11 @@
        	 b.work_times work_times,
        	 F.FARE_OFFICE_FULL_NAME AS FARE_OFFICE_ID,
          G.BOOTH_FULL_NAME AS BOOTH_ID,
-         (CASE WHEN M.MOTION_ID IS NOT NULL THEN DBUSER_CFS.FUN_GET_PENALTY_AMT_RENT_REAL (B.PENALTY_MANAGE_YEAR, B.PENALTY_SEQNO, TO_CHAR(SYSDATE,'YYYYMMDD'), '')
-			 	                                    ELSE DBUSER_CFS.FUN_GET_PENALTY_AMT_REAL      (B.PENALTY_MANAGE_YEAR, B.PENALTY_SEQNO, TO_CHAR(SYSDATE,'YYYYMMDD'), '') END) as lavy_amount,
+         (CASE 
+          WHEN M.MOTION_ID IS NOT NULL 
+          THEN FUN_GET_PENALTY_AMT_RENT_REAL(B.PENALTY_MANAGE_YEAR, B.PENALTY_SEQNO, TO_CHAR(SYSDATE,'YYYYMMDD'), '')
+		  ELSE FUN_GET_PENALTY_AMT_REAL     (B.PENALTY_MANAGE_YEAR, B.PENALTY_SEQNO, TO_CHAR(SYSDATE,'YYYYMMDD'), '') 
+		  END) as lavy_amount,
          a.owner, 
          DGUARD.DECRYPT('ENC','COL',a.ENC_RESIDENT_NO)as RESIDENT_NO,
          a.address_name|| a.address_number addressNm,

src/main/java/cfs/fine/dao/mapper/FinePenaltyDisableProcessing_mapper.xml

@@ -138,111 +138,109 @@
 	
 	<!-- 과태료정보 - 과태료 납부(소인)/반송/독촉 불가처리 -  메인 그리드 조회 -->
  	<select id="findPaymentOfPenaltyList_kbn" parameterType="cfs.fine.vo.FinePenaltyDisableProcessingVO" resultMap="findPenaltyList-result">
-    SELECT DISTINCT
-           DECODE(A.MOTION_ID,'91','0','52','0', A.C_LOSS)  AS C_LOSS
-         , SUBSTR(A.PENALTY_MANAGE_YEAR,3,2) 
-           || '-' 
-           || TRIM( TO_CHAR( A.PENALTY_SEQNO,'000000'))     AS YEAR_SEQNO
-         , A.CAR_NO                                         AS AS_COL2
-         , A.OWNER                                          AS AS_COL6
-         , F.CAR_TYPE_NAME                                  AS AS_COL3
-         ,(SELECT MOTION_FULL_NAME 
-             FROM MOTION_CODE_INFO B 
-            WHERE A.MOTION_ID = B.MOTION_ID)                AS MOTION_NM
-         , A.MOTION_ID                                      AS MOTION_ID
-         , A.MOTION_ID                                      AS AS_MOTI
-         , TO_CHAR(
-           to_date(
-           A.YEAR || A.MONTH || A.DAY || A.WORK_TIMES
-           , 'YYYY-MM-DD HH24:MI:SS')
-           , 'YYYY-MM-DD HH24:MI:SS')                       AS AS_COL4
-         , C.FARE_OFFICE_FULL_NAME                          AS AS_COL5
-         , A.PASS_AMOUNT                                    AS AS_PASS_AMT
-         , A.SEQNO                                          AS SEQNO
-         , A.SEIZURE_TYPE                                   AS SEIZURE_TYPE
-         , (CASE 
-            WHEN A.RECEIPT_YN = '1' 
-            THEN 0
-            WHEN E.MOTION_ID IS NOT NULL 
-            THEN FUN_GET_PENALTY_AMT_RENT_REAL(A.PENALTY_MANAGE_YEAR, A.PENALTY_SEQNO, TO_CHAR(SYSDATE,'YYYYMMDD'), '')
-            ELSE FUN_GET_PENALTY_AMT_REAL(A.PENALTY_MANAGE_YEAR, A.PENALTY_SEQNO, TO_CHAR(SYSDATE,'YYYYMMDD'), '') 
-            END) AS_ADDM
-         , (CASE 
-            WHEN (CASE 
-                  WHEN A.RECEIPT_YN = '1' 
-                  THEN 0 
-                  WHEN A.RENT_KBN   = '1' 
-                  THEN FUN_GET_PENALTY_AMT_RENT(A.PENALTY_MANAGE_YEAR, A.PENALTY_SEQNO, TO_CHAR(SYSDATE,'YYYYMMDD'), '')
-                  ELSE FUN_GET_PENALTY_AMT(A.PENALTY_MANAGE_YEAR, A.PENALTY_SEQNO, TO_CHAR(SYSDATE,'YYYYMMDD'), '') 
-                  END) = '0' 
-            THEN '0'
-            ELSE '1' 
-            END) AS COUNT
-         , (CASE 
-            WHEN A.RECEIPT_YN = '1' 
-            THEN '' 
-            ELSE FUN_GET_PENALTY_DAY2(A.PENALTY_MANAGE_YEAR, A.PENALTY_SEQNO) 
-            END) TER_DAY
-         , FUN_GET_CIVIL(A.PENALTY_MANAGE_YEAR, A.PENALTY_SEQNO) AS CIVIL_APPLICATION
-         , C.FARE_OFFICE_FULL_NAME                                OFFICE_NAME
-         , A.FARE_OFFICE_ID                                       FARE_OFFICE_ID
-         , B.CAR_TYPE_ID                                          CAR_TYPE_ID
-         , DGUARD.DECRYPT('ENC','COL',a.ENC_RESIDENT_NO)          AS_COL8
-         , FN_VIRTUALACCOUNT('1',A.PENALTY_MANAGE_YEAR, A.PENALTY_SEQNO) AS ACCOUNT_WO
-         , FN_VIRTUALACCOUNT('2',A.PENALTY_MANAGE_YEAR, A.PENALTY_SEQNO) AS ACCOUNT_SH
-         , FN_VIRTUALACCOUNT('3',A.PENALTY_MANAGE_YEAR, A.PENALTY_SEQNO) AS ACCOUNT_HA
-         , A.YEAR
-         , A.MONTH
-         , A.DAY
-         , A.WORK_TIMES
-         , SEIZURE_ID
-         , A.PENALTY_MANAGE_YEAR
-         , A.PENALTY_SEQNO
-         , (select CODE_FULL_NAME 
-              from SYS_NOTICE_CODE_INFO T 
-             where t.CODE_ID = A.SYS_NOTICE_ID) as SYS_NOTICE_NM
-         , (select mobile_full_name 
-              from mobile_code_info 
-             where mobile_id = A.MOBILE_RESULT_ID) as MOBILE_RESULT_NM
-         , A.MOBILE_SEND_DATE
-      FROM PENALTY_DETAIL_INFO_DAMO    A
-         , DEFAULT_FARE_READ_INFO_DAMO F
-         , PENALTY_HEAD_INFO_DAMO      B
-         , FARE_OFFICE_CODE_INFO       C
-         , CARS_TYPE_CODE_INFO         D
-         , SEND_RENT_INFO              E
-     WHERE A.CAR_NO		         = B.CAR_NO
-       AND (A.ENC_RESIDENT_NO		 = B.ENC_RESIDENT_NO
-            OR	DGUARD.DECRYPT('ENC','COL',A.ENC_RESIDENT_NO)		 = '1111111111111' )
-       AND A.FARE_OFFICE_ID	     = C.FARE_OFFICE_ID
-       AND B.CAR_TYPE_ID		 = D.CARS_TYPE_ID
-       AND A.WORKER_ID  		 = F.WORKER_ID
-       AND A.FARE_OFFICE_ID 	 = F.FARE_OFFICE_ID
-       AND A.BOOTH_ID 			 = F.BOOTH_ID
-       AND A.YEAR		 		 = F.YEAR
-       AND A.MONTH  			 = F.MONTH
-       AND A.DAY				 = F.DAY
-       AND A.WORK_TIMES			 = F.WORK_TIMES
-       AND A.SEQNO				 = F.SEQNO
-       AND A.PENALTY_MANAGE_YEAR = E.PENALTY_MANAGE_YEAR(+)
-       AND A.PENALTY_SEQNO		 = E.PENALTY_SEQNO(+)
-       AND E.MOTION_ID (+)   	 = '21'
-        <if test="kbn == 1">
-       AND A.PENALTY_MANAGE_YEAR = #{penaltyManageYear}
-       AND A.PENALTY_SEQNO       = #{penaltySeqNo}
-        </if>
-        <if test="kbn == 2">
-       AND (A.CAR_NO         LIKE '%' || #{documentId} || '%'
-            OR  A.CAR_NO_AFTER	 LIKE '%' || #{documentId} || '%'
-            OR  A.CAR_NO_AFTER_2 LIKE '%' || #{documentId} || '%'
-            OR  A.CAR_NO_AFTER_3 LIKE '%' || #{documentId} || '%'
-           )			
-        </if>
-        <if test="kbn == 3">
-       AND B.OWNER	LIKE '%' || #{documentId} || '%'
-        </if>
-     ORDER BY A.YEAR, A.MONTH, A.DAY, A.WORK_TIMES
-    </select>
+		SELECT DISTINCT
+			   DECODE(A.MOTION_ID,'91','0','52','0', A.C_LOSS)  C_LOSS
+			 , DECODE(A.RECEIPT_YN, '1','수납완료', '0','미납') AS RECEIPT_KBN
+			 ,(CASE 
+               WHEN (A.NOTICE_ID = '02' AND A.NOTICE_WRONG_ID = '03') 
+               THEN '취소건의'
+               WHEN (A.NOTICE_ID = '99' AND A.NOTICE_WRONG_ID = '01')
+               THEN '고지취소'
+               ELSE ''
+               END) AS NOTICE_KBN
+			 , SUBSTR(A.PENALTY_MANAGE_YEAR,3,2) || '-' || TRIM( TO_CHAR( A.PENALTY_SEQNO,'000000'))    YEAR_SEQNO
+			 , A.CAR_NO                                         AS_COL2
+			 , A.OWNER                                          AS_COL6
+			 , F.CAR_TYPE_NAME                                  AS_COL3
+			 ,(SELECT MOTION_FULL_NAME FROM MOTION_CODE_INFO B WHERE A.MOTION_ID = B.MOTION_ID)    MOTION_NM
+			 , A.MOTION_ID                                      MOTION_ID
+			 , A.MOTION_ID                                      AS_MOTI
+             , TO_CHAR(to_date(A.YEAR || A.MONTH || A.DAY || A.WORK_TIMES , 'YYYY-MM-DD HH24:MI:SS'), 'YYYY-MM-DD HH24:MI:SS')  AS_COL4
+			 , C.FARE_OFFICE_FULL_NAME                          AS_COL5
+			 , A.PASS_AMOUNT                                    AS_PASS_AMT
+			 , A.SEQNO                                          SEQNO
+			 , A.SEIZURE_TYPE
+			 , (A.PASS_AMOUNT + A.FINE_AMOUNT)            AS AI_TOT_AMT
+			 ,(CASE 
+			   WHEN A.RECEIPT_YN = '1' 
+			   THEN 0
+			   WHEN E.MOTION_ID IS NOT NULL 
+			   THEN FUN_GET_PENALTY_AMT_RENT_REAL(A.PENALTY_MANAGE_YEAR, A.PENALTY_SEQNO, TO_CHAR(SYSDATE,'YYYYMMDD'), '')
+			   ELSE FUN_GET_PENALTY_AMT_REAL     (A.PENALTY_MANAGE_YEAR, A.PENALTY_SEQNO, TO_CHAR(SYSDATE,'YYYYMMDD'), '') 
+			   END) AS_ADDM
+             ,(CASE 
+               WHEN (CASE 
+                     WHEN A.RECEIPT_YN = '1' 
+                     THEN 0  
+                     WHEN A.RENT_KBN   = '1' 
+                     THEN FUN_GET_PENALTY_AMT_RENT(A.PENALTY_MANAGE_YEAR, A.PENALTY_SEQNO, TO_CHAR(SYSDATE,'YYYYMMDD'), '')
+                     ELSE FUN_GET_PENALTY_AMT     (A.PENALTY_MANAGE_YEAR, A.PENALTY_SEQNO, TO_CHAR(SYSDATE,'YYYYMMDD'), '') 
+                     END) = '0' 
+               THEN '0'
+               ELSE '1' 
+               END) AS COUNT
+			 ,(CASE 
+			   WHEN A.RECEIPT_YN = '1' 
+			   THEN '' 
+			   WHEN E.MOTION_ID IS NOT NULL 
+			   THEN FUN_GET_PENALTY_DAY2_RENT(A.PENALTY_MANAGE_YEAR, A.PENALTY_SEQNO) 
+			   ELSE FUN_GET_PENALTY_DAY2     (A.PENALTY_MANAGE_YEAR, A.PENALTY_SEQNO) 
+			   END) TER_DAY
+			 , FUN_GET_CIVIL(A.PENALTY_MANAGE_YEAR, A.PENALTY_SEQNO)  CIVIL_APPLICATION
+			 , C.FARE_OFFICE_FULL_NAME                                OFFICE_NAME
+			 , A.FARE_OFFICE_ID                                       FARE_OFFICE_ID
+			 , B.CAR_TYPE_ID                                          CAR_TYPE_ID
+			 , DGUARD.DECRYPT('ENC','COL',a.ENC_RESIDENT_NO)          AS_COL8
+			 , FN_VIRTUALACCOUNT('1',A.PENALTY_MANAGE_YEAR, A.PENALTY_SEQNO) AS ACCOUNT_WO
+			 , FN_VIRTUALACCOUNT('2',A.PENALTY_MANAGE_YEAR, A.PENALTY_SEQNO) AS ACCOUNT_SH
+			 , FN_VIRTUALACCOUNT('3',A.PENALTY_MANAGE_YEAR, A.PENALTY_SEQNO) AS ACCOUNT_HA
+	    	 , A.YEAR
+	    	 , A.MONTH
+	    	 , A.DAY
+	    	 , A.WORK_TIMES
+	    	 , SEIZURE_ID
+	    	 , A.PENALTY_MANAGE_YEAR
+	    	 , A.PENALTY_SEQNO
+	    	 , (select CODE_FULL_NAME from SYS_NOTICE_CODE_INFO T where t.CODE_ID = A.SYS_NOTICE_ID) as SYS_NOTICE_NM
+	    	 , (select mobile_full_name from mobile_code_info where mobile_id = A.MOBILE_RESULT_ID)as MOBILE_RESULT_NM
+	    	 , A.MOBILE_SEND_DATE
+		  FROM PENALTY_DETAIL_INFO_DAMO		A
+		     , DEFAULT_FARE_READ_INFO_DAMO	F
+		     , PENALTY_HEAD_INFO_DAMO		B
+		     , FARE_OFFICE_CODE_INFO	    C
+		     , CARS_TYPE_CODE_INFO		    D
+		     , SEND_RENT_INFO 				E
+		 WHERE A.CAR_NO		         = B.CAR_NO
+		   AND (A.ENC_RESIDENT_NO		 = B.ENC_RESIDENT_NO
+			    OR DGUARD.DECRYPT('ENC','COL',A.ENC_RESIDENT_NO)		 = '1111111111111' )
+		   AND A.FARE_OFFICE_ID	     = C.FARE_OFFICE_ID
+		   AND B.CAR_TYPE_ID		 = D.CARS_TYPE_ID
+		   AND A.WORKER_ID  		 = F.WORKER_ID
+		   AND A.FARE_OFFICE_ID 	 = F.FARE_OFFICE_ID
+		   AND A.BOOTH_ID 			 = F.BOOTH_ID
+		   AND A.YEAR		 		 = F.YEAR
+		   AND A.MONTH  			 = F.MONTH
+		   AND A.DAY				 = F.DAY
+		   AND A.WORK_TIMES			 = F.WORK_TIMES
+		   AND A.SEQNO				 = F.SEQNO
+		   AND A.PENALTY_MANAGE_YEAR = E.PENALTY_MANAGE_YEAR(+)
+		   AND A.PENALTY_SEQNO		 = E.PENALTY_SEQNO(+)
+		   AND E.MOTION_ID (+)   	 = '21'
+		<if test="kbn == 1">
+		   AND A.PENALTY_MANAGE_YEAR = #{penaltyManageYear}
+		   AND A.PENALTY_SEQNO       = #{penaltySeqNo}
+		</if>
+		<if test="kbn == 2">
+		   AND (A.CAR_NO         LIKE '%' || #{documentId} || '%'
+			OR  A.CAR_NO_AFTER	 LIKE '%' || #{documentId} || '%'
+			OR  A.CAR_NO_AFTER_2 LIKE '%' || #{documentId} || '%'
+			OR  A.CAR_NO_AFTER_3 LIKE '%' || #{documentId} || '%')			
+		</if>
+		<if test="kbn == 3">
+		   AND B.OWNER	LIKE '%' || #{documentId} || '%'
+		</if>
+		 ORDER BY A.YEAR, A.MONTH, A.DAY, A.WORK_TIMES
+	</select>
 
 
 	<resultMap id="findPaymentOfPenaltyDetail1-result" type="java.util.Map">
@@ -452,15 +450,15 @@
                                      ,'1','감면') AS RFID_PENALTY_KBN_NAME
          ,(CASE 
            WHEN D.MOTION_ID IS NOT NULL 
-           THEN DBUSER_CFS.FUN_GET_PENALTY_AMT_RENT_REAL(A.PENALTY_MANAGE_YEAR, A.PENALTY_SEQNO, TO_CHAR(SYSDATE,'YYYYMMDD'), '')
-           ELSE DBUSER_CFS.FUN_GET_PENALTY_AMT_REAL     (A.PENALTY_MANAGE_YEAR, A.PENALTY_SEQNO, TO_CHAR(SYSDATE,'YYYYMMDD'), '') 
-           END) AS AS_ADDM  <!-- 고지(수납액) --> 
+           THEN FUN_GET_PENALTY_AMT_RENT_REAL(A.PENALTY_MANAGE_YEAR, A.PENALTY_SEQNO, TO_CHAR(SYSDATE,'YYYYMMDD'), '')
+           ELSE FUN_GET_PENALTY_AMT_REAL     (A.PENALTY_MANAGE_YEAR, A.PENALTY_SEQNO, TO_CHAR(SYSDATE,'YYYYMMDD'), '') 
+           END) AS_ADDM  <!-- 고지(수납액) --> 
          ,(CASE 
            WHEN D.MOTION_ID IS NOT NULL 
            THEN FUN_GET_PENALTY_DAY2_RENT(A.PENALTY_MANAGE_YEAR, A.PENALTY_SEQNO)
            ELSE FUN_GET_PENALTY_DAY2     (A.PENALTY_MANAGE_YEAR, A.PENALTY_SEQNO) 
-           END) AS tt  <!-- 초과일(2차) -->
-         , FUN_GET_PENALTY_DAY(A.PENALTY_MANAGE_YEAR, A.PENALTY_SEQNO, '*','4') AS TERM_DAY
+           END) tt  <!-- 초과일(2차) -->
+         , FUN_GET_PENALTY_DAY(A.PENALTY_MANAGE_YEAR, A.PENALTY_SEQNO, '*','4') TERM_DAY
          , A.CAR_CHANGE_YN
          , A.C_LOSS
          , NVL(NVL(A.CAR_NO_AFTER, A.CAR_NO_AFTER_2), A.CAR_NO_AFTER_3) AS CAR_NO_AFTER <!--대체차량번호 -->

src/main/java/cfs/fine/dao/mapper/FinePenalty_mapper.xml

@@ -1494,73 +1494,71 @@ ORDER BY PENALTY_DATE
 	</resultMap>
 
 	<select id="findPenaltyList05" parameterType="cfs.fine.vo.PenaltyParamVO" resultMap="findPenaltyList05-result">
-		/*findPenaltyList05*/
-		SELECT DISTINCT D.PENALTY_MANAGE_YEAR AS PENALTY_MANAGE_YEAR,
-		D.PENALTY_SEQNO AS PENALTY_SEQNO,
-		D.WORKER_ID AS WORKER_ID,
-		'남산'||TO_NUMBER(D.FARE_OFFICE_ID)||'호터널' AS FARE_OFFICE_NM,
-		'제'||TO_NUMBER(D.BOOTH_ID)||'차로' AS BOOTH,
-		D.FARE_OFFICE_ID,
-		D.BOOTH_ID,
-		D.YEAR AS YEAR,
-		D.MONTH AS MONTH,
-		D.DAY AS DAY,
-		D.WORK_TIMES AS WORK_TIMES,
-		TO_CHAR(TO_DATE(D.YEAR || D.MONTH || D.DAY || D.WORK_TIMES,'YYYYMMDDHH24MISS'), 'YYYY-MM-DD HH24:MI:SS')  AS PENALTY_DATE,
-		D.SEQNO AS SEQNO,
-		D.CAR_NO AS CAR_NO,
-		D.OWNER AS OWNER,
-		D.SEQNO AS SEQNO,
-		DGUARD.DECRYPT('ENC','COL',D.ENC_RESIDENT_NO) AS RESIDENT_NO,
-		TO_CHAR (D.RESIDENT_DATE, 'yyyymmdd') AS RESIDENT_DATE,
-		(SELECT CARS_TYPE_FULL_NAME FROM CARS_TYPE_CODE_INFO WHERE CARS_TYPE_ID = H.CAR_TYPE_ID)  AS CAR_TYPE_NM,
-		H.POST_NO1 || H.POST_NO2 AS POST_NO,
-		H.ADDRESS_NAME || ' ' || H.ADDRESS_NUMBER AS ADDRESS,
-		H.ADDRESS_NAME,
-		H.ADDRESS_NUMBER,
-		substr(DGUARD.DECRYPT('ENC','COL',H.ENC_RESIDENT_NO),1,7) as FRRESIDENT_NO,
-		F.CARS_STOP_PICTURE_FILE,
-		F.X_POSITION,
-		F.Y_POSITION,
-		F.GARO_LEN,
-		F.SERO_LEN,
-		F.CAR_TYPE_NAME,
-		'우리 '||FN_VIRTUALACCOUNT ('1',D.penalty_manage_year,D.penalty_seqno)
-		|| ' 신한 '||FN_VIRTUALACCOUNT ('2',D.penalty_manage_year,D.penalty_seqno) 
-		|| ' 하나 '||FN_VIRTUALACCOUNT ('3',D.penalty_manage_year,D.penalty_seqno) as VIRTUAL_BANK,
-		D.MOTION_ID AS MOTION_ID,
-		to_char(D.NOTICE_DATE,'yyyymmdd') as NOTICE_DATE,
-		SUBSTR (D.PENALTY_MANAGE_YEAR, 3, 2) || '-' || TO_CHAR (D.PENALTY_SEQNO) AS MNGNO,
-		to_char(S.SEND_DATE,'YYYY/MM/DD') as SEND_DATE,
-		to_char(S.DELIVERY_DATE,'YYYY/MM/DD') as DELIVERY_DATE,
-		D.BEFORE_MOTION_ID,
-		D.UPDATER,
-		D.UPDATE_DATE,
-		D.MOTION_ID,
-		(SELECT MOTION_FULL_NAME FROM MOTION_CODE_INFO T WHERE T.MOTION_ID = D.MOTION_ID ) AS MOTION_NM,
-		FUN_GET_PENALTY_AMT_REAL(D.PENALTY_MANAGE_YEAR,D.PENALTY_SEQNO,#{basicDate}, '') AS LAVY_AMOUNT,
-		D.LEVY_MANAGE_YEAR AS LEVY_MNG_YEAR,
-		D.LEVY_SEQNO AS LEVY_MNG_SEQNO,
-		/*D.MOBILE_RESULT_ID,
-		(select mobile_full_name from mobile_code_info where mobile_id = D.MOBILE_RESULT_ID)as MOBILE_RESULT_NM,
-		SUBSTR(NVL(D.MOBILE_SEND_DATE,0),0,8) as MOBILE_SEND_DATE,*/
-		TO_CHAR(SYSDATE,'YYYYMMDD') as TODATES,
-		D.CAR_CHANGE_YN,
-		D.CAR_NO_AFTER,
-		FUN_GET_PENALTY_DAY2(D.PENALTY_MANAGE_YEAR, D.PENALTY_SEQNO) TERM_DAY,
-		'Y' AS CHK,
-		D.SYS_NOTICE_ID,
-		(select CODE_FULL_NAME from SYS_NOTICE_CODE_INFO T where t.CODE_ID = D.SYS_NOTICE_ID) as SYS_NOTICE_NM,
-		D.DELIVRSLTCD,
-		DECODE(D.DELIVRSLTCD,'','초기상태','01','이그린 제작요청','이그린 제작요청') as DELIVRSLTNM,
-		D.NONDELIVREASNCD,
-		DECODE(D.NONDELIVREASNCD,'','',D.NONDELIVREASNCD) as NONDELIVREASNNM,
-		to_char(D.NOTICE_DATE,'yyyymmdd') as NOTICE_DATE,
-		D.EGREEN_SEND_DATE,
-		D.DELIVYMD
-		FROM PENALTY_HEAD_INFO_DAMO H, PENALTY_DETAIL_INFO_DAMO D, SEND_INFO S, DEFAULT_FARE_READ_INFO_DAMO F
-		WHERE   H.CAR_NO = D.CAR_NO
-		AND H.ENC_RESIDENT_NO = D.ENC_RESIDENT_NO
+    /*findPenaltyList05*/
+    SELECT DISTINCT 
+           D.PENALTY_MANAGE_YEAR AS PENALTY_MANAGE_YEAR
+         , D.PENALTY_SEQNO AS PENALTY_SEQNO
+         , D.WORKER_ID AS WORKER_ID
+         , '남산'||TO_NUMBER(D.FARE_OFFICE_ID)||'호터널' AS FARE_OFFICE_NM
+         , '제'||TO_NUMBER(D.BOOTH_ID)||'차로' AS BOOTH
+         , D.FARE_OFFICE_ID
+         , D.BOOTH_ID
+         , D.YEAR AS YEAR
+         , D.MONTH AS MONTH
+         , D.DAY AS DAY
+         , D.WORK_TIMES AS WORK_TIMES
+         , TO_CHAR(TO_DATE(D.YEAR || D.MONTH || D.DAY || D.WORK_TIMES,'YYYYMMDDHH24MISS'), 'YYYY-MM-DD HH24:MI:SS')  AS PENALTY_DATE
+         , D.SEQNO AS SEQNO
+         , D.CAR_NO AS CAR_NO
+         , D.OWNER AS OWNER
+         , D.SEQNO AS SEQNO
+         , DGUARD.DECRYPT('ENC','COL',D.ENC_RESIDENT_NO) AS RESIDENT_NO
+         , TO_CHAR (D.RESIDENT_DATE, 'yyyymmdd') AS RESIDENT_DATE
+         , (SELECT CARS_TYPE_FULL_NAME FROM CARS_TYPE_CODE_INFO WHERE CARS_TYPE_ID = H.CAR_TYPE_ID)  AS CAR_TYPE_NM
+         , H.POST_NO1 || H.POST_NO2 AS POST_NO
+         , H.ADDRESS_NAME || ' ' || H.ADDRESS_NUMBER AS ADDRESS
+         , H.ADDRESS_NAME
+         , H.ADDRESS_NUMBER
+         , substr(DGUARD.DECRYPT('ENC','COL',H.ENC_RESIDENT_NO),1,7) as FRRESIDENT_NO
+         , F.CARS_STOP_PICTURE_FILE
+         , F.X_POSITION
+         , F.Y_POSITION
+         , F.GARO_LEN
+         , F.SERO_LEN
+         , F.CAR_TYPE_NAME
+         , '우리 '||FN_VIRTUALACCOUNT ('1',D.penalty_manage_year,D.penalty_seqno)
+		   || ' 신한 '||FN_VIRTUALACCOUNT ('2',D.penalty_manage_year,D.penalty_seqno) 
+		   || ' 하나 '||FN_VIRTUALACCOUNT ('3',D.penalty_manage_year,D.penalty_seqno) as VIRTUAL_BANK
+         , D.MOTION_ID AS MOTION_ID
+         , to_char(D.NOTICE_DATE,'yyyymmdd') as NOTICE_DATE
+         , SUBSTR (D.PENALTY_MANAGE_YEAR, 3, 2) || '-' || TO_CHAR (D.PENALTY_SEQNO) AS MNGNO
+         , to_char(S.SEND_DATE,'YYYY/MM/DD') as SEND_DATE
+         , to_char(S.DELIVERY_DATE,'YYYY/MM/DD') as DELIVERY_DATE
+         , D.BEFORE_MOTION_ID
+         , D.UPDATER
+         , D.UPDATE_DATE
+         , D.MOTION_ID
+         , (SELECT MOTION_FULL_NAME FROM MOTION_CODE_INFO T WHERE T.MOTION_ID = D.MOTION_ID ) AS MOTION_NM
+         , FUN_GET_PENALTY_AMT_REAL(D.PENALTY_MANAGE_YEAR,D.PENALTY_SEQNO,#{basicDate}, '') AS LAVY_AMOUNT
+         , D.LEVY_MANAGE_YEAR AS LEVY_MNG_YEAR
+         , D.LEVY_SEQNO AS LEVY_MNG_SEQNO
+         , TO_CHAR(SYSDATE,'YYYYMMDD') as TODATES
+         , D.CAR_CHANGE_YN
+         , D.CAR_NO_AFTER
+         , FUN_GET_PENALTY_DAY2(D.PENALTY_MANAGE_YEAR, D.PENALTY_SEQNO) TERM_DAY
+         , 'Y' AS CHK
+         , D.SYS_NOTICE_ID
+         , (select CODE_FULL_NAME from SYS_NOTICE_CODE_INFO T where t.CODE_ID = D.SYS_NOTICE_ID) as SYS_NOTICE_NM
+         , D.DELIVRSLTCD
+         , DECODE(D.DELIVRSLTCD,'','초기상태','01','이그린 제작요청','이그린 제작요청') as DELIVRSLTNM
+         , D.NONDELIVREASNCD
+         , DECODE(D.NONDELIVREASNCD,'','',D.NONDELIVREASNCD) as NONDELIVREASNNM
+         , to_char(D.NOTICE_DATE,'yyyymmdd') as NOTICE_DATE
+         , D.EGREEN_SEND_DATE
+         , D.DELIVYMD
+      FROM PENALTY_HEAD_INFO_DAMO H, PENALTY_DETAIL_INFO_DAMO D, SEND_INFO S, DEFAULT_FARE_READ_INFO_DAMO F
+     WHERE H.CAR_NO = D.CAR_NO
+       AND H.ENC_RESIDENT_NO = D.ENC_RESIDENT_NO
 		AND D.WORKER_ID = F.WORKER_ID
 		AND D.YEAR = F.YEAR
 		AND D.MONTH = F.MONTH
@@ -1576,84 +1574,82 @@ ORDER BY PENALTY_DATE
 		AND D.PASS_DATE BETWEEN #{penaltyDateFrom} AND #{penaltyDateTo}
 		AND D.MOTION_ID IN ('41','42','43','45','46','47','49','71','72')
 		<if test="!@cfs.common.util.MybatisUtil@empty(carNo)">
-			AND (D.CAR_NO LIKE '%' || #{carNo} || '%'
+		AND (D.CAR_NO LIKE '%' || #{carNo} || '%'
 			OR D.CAR_NO_AFTER LIKE '%' || #{carNo} || '%'
 			OR D.CAR_NO_AFTER_2 LIKE '%' || #{carNo} || '%'
 			OR D.CAR_NO_AFTER_3 LIKE '%' || #{carNo} || '%')
 		</if>
 		AND D.RECEIPT_YN = '0'
 		AND (D.NOTICE_WRONG_ID IS NULL OR D.NOTICE_WRONG_ID = '99')
-		ORDER BY PENALTY_DATE
+	 ORDER BY PENALTY_DATE
 	</select>
 
 	<select id="findPenaltyRentList05" parameterType="cfs.fine.vo.PenaltyParamVO" resultMap="findPenaltyList05-result">
-		/*findPenaltyRentList05*/
-		SELECT DISTINCT D.PENALTY_MANAGE_YEAR AS PENALTY_MANAGE_YEAR,
-		D.PENALTY_SEQNO AS PENALTY_SEQNO,
-		D.WORKER_ID AS WORKER_ID,
-		'남산'||TO_NUMBER(D.FARE_OFFICE_ID)||'호터널' AS FARE_OFFICE_NM,
-		'제'||TO_NUMBER(D.BOOTH_ID)||'차로' AS BOOTH,
-		D.FARE_OFFICE_ID,
-		D.BOOTH_ID,
-		D.YEAR AS YEAR,
-		D.MONTH AS MONTH,
-		D.DAY AS DAY,
-		D.WORK_TIMES AS WORK_TIMES,
-		TO_CHAR(TO_DATE(D.YEAR || D.MONTH || D.DAY || D.WORK_TIMES,'YYYYMMDDHH24MISS'), 'YYYY-MM-DD HH24:MI:SS')  AS PENALTY_DATE,
-		D.SEQNO AS SEQNO,
-		D.CAR_NO AS CAR_NO,
-		D.OWNER AS OWNER,
-		D.SEQNO AS SEQNO,
-		DGUARD.DECRYPT('ENC','COL',D.ENC_RESIDENT_NO) AS RESIDENT_NO,
-		TO_CHAR (D.RESIDENT_DATE, 'yyyymmdd') AS RESIDENT_DATE,
-		(SELECT CARS_TYPE_FULL_NAME FROM CARS_TYPE_CODE_INFO WHERE CARS_TYPE_ID = H.CAR_TYPE_ID)  AS CAR_TYPE_NM,
-		H.POST_NO1 || H.POST_NO2 AS POST_NO,
-		H.ADDRESS_NAME || ' ' || H.ADDRESS_NUMBER AS ADDRESS,
-		H.ADDRESS_NAME,
-		H.ADDRESS_NUMBER,
-		substr(DGUARD.DECRYPT('ENC','COL',H.ENC_RESIDENT_NO),1,7) as FRRESIDENT_NO,
-		F.CARS_STOP_PICTURE_FILE,
-		F.X_POSITION,
-		F.Y_POSITION,
-		F.GARO_LEN,
-		F.SERO_LEN,
-		F.CAR_TYPE_NAME,
-		'우리 '||FN_VIRTUALACCOUNT ('1',D.penalty_manage_year,D.penalty_seqno)
-		|| ' 신한 '||FN_VIRTUALACCOUNT ('2',D.penalty_manage_year,D.penalty_seqno) 
-		|| ' 하나 '||FN_VIRTUALACCOUNT ('3',D.penalty_manage_year,D.penalty_seqno) as VIRTUAL_BANK,
-		DD.MOTION_ID AS MOTION_ID,
-		to_char(D.NOTICE_DATE,'yyyymmdd') as NOTICE_DATE,
-		SUBSTR (D.PENALTY_MANAGE_YEAR, 3, 2) || '-' || TO_CHAR (D.PENALTY_SEQNO) AS MNGNO,
-		to_char(S.SEND_DATE,'YYYY/MM/DD') as SEND_DATE,
-		to_char(S.DELIVERY_DATE,'YYYY/MM/DD') as DELIVERY_DATE,
-		D.BEFORE_MOTION_ID,
-		D.UPDATER,
-		D.UPDATE_DATE,
-		DD.MOTION_ID,
-		(SELECT MOTION_FULL_NAME FROM MOTION_CODE_INFO T WHERE T.MOTION_ID = DD.MOTION_ID ) AS MOTION_NM,
-		FUN_GET_PENALTY_AMT_RENT_REAL(D.PENALTY_MANAGE_YEAR,D.PENALTY_SEQNO,#{basicDate}, '') AS LAVY_AMOUNT,
-		D.LEVY_MANAGE_YEAR AS LEVY_MNG_YEAR,
-		D.LEVY_SEQNO AS LEVY_MNG_SEQNO,
-		/*D.MOBILE_RESULT_ID,
-		(select mobile_full_name from mobile_code_info where mobile_id = D.MOBILE_RESULT_ID)as MOBILE_RESULT_NM,
-		SUBSTR(NVL(D.MOBILE_SEND_DATE,0),0,8) as MOBILE_SEND_DATE,*/
-		TO_CHAR(SYSDATE,'YYYYMMDD') as TODATES,
-		D.CAR_CHANGE_YN,
-		D.CAR_NO_AFTER,
-		FUN_GET_PENALTY_DAY2(D.PENALTY_MANAGE_YEAR, D.PENALTY_SEQNO) TERM_DAY,
-		'Y' AS CHK,
-		D.SYS_NOTICE_ID,
-		(select CODE_FULL_NAME from SYS_NOTICE_CODE_INFO T where t.CODE_ID = D.SYS_NOTICE_ID) as SYS_NOTICE_NM,
-		D.DELIVRSLTCD,
-		DECODE(D.DELIVRSLTCD,'','초기상태','01','이그린 제작요청','이그린 제작요청') as DELIVRSLTNM,
-		D.NONDELIVREASNCD,
-		DECODE(D.NONDELIVREASNCD,'','',D.NONDELIVREASNCD) as NONDELIVREASNNM,
-		to_char(D.NOTICE_DATE,'yyyymmdd') as NOTICE_DATE,
-		D.EGREEN_SEND_DATE,
-		D.DELIVYMD
-		FROM PENALTY_HEAD_INFO_DAMO H, PENALTY_DETAIL_INFO_DAMO D, PENALTY_RENT_DETAIL_INFO DD, SEND_INFO S, DEFAULT_FARE_READ_INFO_DAMO F
-		WHERE D.PENALTY_MANAGE_YEAR = DD.PENALTY_MANAGE_YEAR
-		AND D.PENALTY_SEQNO = DD.PENALTY_SEQNO
+    /*findPenaltyRentList05*/
+    SELECT DISTINCT 
+           D.PENALTY_MANAGE_YEAR AS PENALTY_MANAGE_YEAR
+         , D.PENALTY_SEQNO AS PENALTY_SEQNO
+         , D.WORKER_ID AS WORKER_ID
+         , '남산'||TO_NUMBER(D.FARE_OFFICE_ID)||'호터널' AS FARE_OFFICE_NM
+         , '제'||TO_NUMBER(D.BOOTH_ID)||'차로' AS BOOTH
+         , D.FARE_OFFICE_ID
+         , D.BOOTH_ID
+         , D.YEAR AS YEAR
+         , D.MONTH AS MONTH
+         , D.DAY AS DAY
+         , D.WORK_TIMES AS WORK_TIMES
+         , TO_CHAR(TO_DATE(D.YEAR || D.MONTH || D.DAY || D.WORK_TIMES,'YYYYMMDDHH24MISS'), 'YYYY-MM-DD HH24:MI:SS')  AS PENALTY_DATE
+         , D.SEQNO AS SEQNO
+         , D.CAR_NO AS CAR_NO
+         , D.OWNER AS OWNER
+         , D.SEQNO AS SEQNO
+         , DGUARD.DECRYPT('ENC','COL',D.ENC_RESIDENT_NO) AS RESIDENT_NO
+         , TO_CHAR (D.RESIDENT_DATE, 'yyyymmdd') AS RESIDENT_DATE
+         , (SELECT CARS_TYPE_FULL_NAME FROM CARS_TYPE_CODE_INFO WHERE CARS_TYPE_ID = H.CAR_TYPE_ID)  AS CAR_TYPE_NM
+         , H.POST_NO1 || H.POST_NO2 AS POST_NO
+         , H.ADDRESS_NAME || ' ' || H.ADDRESS_NUMBER AS ADDRESS
+         , H.ADDRESS_NAME
+         , H.ADDRESS_NUMBER
+         , substr(DGUARD.DECRYPT('ENC','COL',H.ENC_RESIDENT_NO),1,7) as FRRESIDENT_NO
+         , F.CARS_STOP_PICTURE_FILE
+         , F.X_POSITION
+         , F.Y_POSITION
+         , F.GARO_LEN
+         , F.SERO_LEN
+         , F.CAR_TYPE_NAME
+         , '우리 '||FN_VIRTUALACCOUNT ('1',D.penalty_manage_year,D.penalty_seqno)
+		   || ' 신한 '||FN_VIRTUALACCOUNT ('2',D.penalty_manage_year,D.penalty_seqno) 
+		   || ' 하나 '||FN_VIRTUALACCOUNT ('3',D.penalty_manage_year,D.penalty_seqno) as VIRTUAL_BANK
+         , DD.MOTION_ID AS MOTION_ID
+         , to_char(D.NOTICE_DATE,'yyyymmdd') as NOTICE_DATE
+         , SUBSTR (D.PENALTY_MANAGE_YEAR, 3, 2) || '-' || TO_CHAR (D.PENALTY_SEQNO) AS MNGNO
+         , to_char(S.SEND_DATE,'YYYY/MM/DD') as SEND_DATE
+         , to_char(S.DELIVERY_DATE,'YYYY/MM/DD') as DELIVERY_DATE
+         , D.BEFORE_MOTION_ID
+         , D.UPDATER
+         , D.UPDATE_DATE
+         , DD.MOTION_ID
+         , (SELECT MOTION_FULL_NAME FROM MOTION_CODE_INFO T WHERE T.MOTION_ID = DD.MOTION_ID ) AS MOTION_NM
+         , FUN_GET_PENALTY_AMT_RENT_REAL(D.PENALTY_MANAGE_YEAR,D.PENALTY_SEQNO,#{basicDate}, '') AS LAVY_AMOUNT
+         , D.LEVY_MANAGE_YEAR AS LEVY_MNG_YEAR
+         , D.LEVY_SEQNO AS LEVY_MNG_SEQNO
+         , TO_CHAR(SYSDATE,'YYYYMMDD') as TODATES
+         , D.CAR_CHANGE_YN
+         , D.CAR_NO_AFTER
+         , FUN_GET_PENALTY_DAY2(D.PENALTY_MANAGE_YEAR, D.PENALTY_SEQNO) TERM_DAY
+         , 'Y' AS CHK
+         , D.SYS_NOTICE_ID
+         , (select CODE_FULL_NAME from SYS_NOTICE_CODE_INFO T where t.CODE_ID = D.SYS_NOTICE_ID) as SYS_NOTICE_NM
+         , D.DELIVRSLTCD
+         , DECODE(D.DELIVRSLTCD,'','초기상태','01','이그린 제작요청','이그린 제작요청') as DELIVRSLTNM
+         , D.NONDELIVREASNCD
+         , DECODE(D.NONDELIVREASNCD,'','',D.NONDELIVREASNCD) as NONDELIVREASNNM
+         , to_char(D.NOTICE_DATE,'yyyymmdd') as NOTICE_DATE
+         , D.EGREEN_SEND_DATE
+         , D.DELIVYMD
+      FROM PENALTY_HEAD_INFO_DAMO H, PENALTY_DETAIL_INFO_DAMO D, PENALTY_RENT_DETAIL_INFO DD, SEND_INFO S, DEFAULT_FARE_READ_INFO_DAMO F
+     WHERE D.PENALTY_MANAGE_YEAR = DD.PENALTY_MANAGE_YEAR
+	   AND D.PENALTY_SEQNO = DD.PENALTY_SEQNO
 		AND H.CAR_NO = D.CAR_NO
 		AND H.ENC_RESIDENT_NO = D.ENC_RESIDENT_NO
 		AND D.WORKER_ID = F.WORKER_ID
@@ -1664,35 +1660,20 @@ ORDER BY PENALTY_DATE
 		AND D.BOOTH_ID = F.BOOTH_ID
 		AND D.WORK_TIMES = F.WORK_TIMES
 		AND D.SEQNO = F.SEQNO
-		/*AND F.WORKER_ID = G.WORKER_ID
-		AND F.FARE_OFFICE_ID = G.FARE_OFFICE_ID
-		AND F.BOOTH_ID = G.BOOTH_ID
-		AND F.YEAR = G.YEAR
-		AND F.MONTH = G.MONTH
-		AND F.DAY = G.DAY
-		AND F.WORK_TIMES = G.WORK_TIMES
-		AND F.SEQNO = G.SEQNO
-		AND F.CAR_NO = G.CAR_NO*/
 		AND D.PENALTY_MANAGE_YEAR = S.PENALTY_MANAGE_YEAR(+)
 		AND D.PENALTY_SEQNO = S.PENALTY_SEQNO(+)
 		AND S.MOTION_ID(+) = '41'
 		AND D.RENT_KBN = '1'
-		<!-- /*AND ( ( S.SEND_NO IS NULL AND substr(D.MOTION_ID, 2, 1) = '0' )
-			      or ( S.SEND_NO IS NOT NULL AND substr(D.MOTION_ID, 2, 1) <![CDATA[<>]]> '0' AND
-			           S.SEND_NO = ( SELECT MAX(SEND_NO) FROM SEND_INFO X
-			                           WHERE X.PENALTY_MANAGE_YEAR = S.PENALTY_MANAGE_YEAR
-			                             AND X.PENALTY_SEQNO       = S.PENALTY_SEQNO
-			                             AND X.MOTION_ID           = S.MOTION_ID ) )
-			       )*/-->
 		AND DD.ALTER_DATE BETWEEN to_date(#{penaltyDateFrom}||'000000','yyyymmddHH24MISS') AND to_date(#{penaltyDateTo}||'235959','yyyymmddHH24MISS')
 		AND DD.MOTION_ID IN ('41','43','45','46','47','49','71','72')
 		<if test="!@cfs.common.util.MybatisUtil@empty(carNo)">
-			AND D.CAR_NO LIKE '%' || #{carNo} || '%'
+		AND D.CAR_NO LIKE '%' || #{carNo} || '%'
 		</if>
 		AND D.RECEIPT_YN = '0'
 		AND (D.NOTICE_WRONG_ID IS NULL OR D.NOTICE_WRONG_ID = '99')
-		ORDER BY PENALTY_DATE
+     ORDER BY PENALTY_DATE
 	</select>
+	
 	<!--
  * 과태료정보 - 1차 과태료 관리 - 1차 과태료 이의신청
  *
@@ -2534,138 +2515,138 @@ ORDER BY PENALTY_DATE
  -->
 	<select id="findEtaxFilePenaltyList" parameterType="cfs.fine.vo.PenaltyParamVO" resultMap="findEtaxFilePenaltyList-result">
 	SELECT SUBSTR (A.PENALTY_MANAGE_YEAR, 3, 2) || '-' || TO_CHAR (A.PENALTY_SEQNO) AS MNGNO
-		, TO_CHAR(TO_DATE(A.YEAR || A.MONTH || A.DAY, 'YYYY-MM-DD'),'YYYYMMDD') AS PENALTY_DATE
-		, A.PENALTY_MANAGE_YEAR
-		, A.PENALTY_SEQNO
-		, A.MOTION_ID
-		, TO_CHAR(A.SEND_DATE, 'YYYYMMDD') AS SEND_DATE
-		, TO_CHAR(A.DELIVERY_DATE, 'YYYYMMDD') AS DELIVERY_DATE
-		, DECODE(A.ETAX_YN,'1','생성','미생성') AS ETAX_YN
-		, A.ETAX_DATE AS ETAX_DATE
-		, A.YEAR
-		, A.MONTH
-		, A.DAY
-		, A.WORK_TIMES
-		, A.CAR_NO
-		, A.RESIDENT_NO
-		, A.OWNER
-		, A.LAVY_AMOUNT
-		, A.SEND_NO
-		, A.UPDATE_DATE
-		, FN_VIRTUALACCOUNT('A', A.PENALTY_MANAGE_YEAR, A.PENALTY_SEQNO) AS VIRTUAL_BANK
-	FROM (
-		SELECT A.PENALTY_MANAGE_YEAR
-		, A.PENALTY_SEQNO
-		, B.MOTION_ID
-		, B.SEND_DATE
-		, B.DELIVERY_DATE
-		, B.ETAX_YN
-		, B.ETAX_DATE
-		, A.YEAR
-		, A.MONTH
-		, A.DAY
-		, A.WORK_TIMES
-		, A.CAR_NO
-		, DGUARD.DECRYPT('ENC','COL',a.ENC_RESIDENT_NO) as RESIDENT_NO
-		, A.OWNER
+		 , TO_CHAR(TO_DATE(A.YEAR || A.MONTH || A.DAY, 'YYYY-MM-DD'),'YYYYMMDD') AS PENALTY_DATE
+		 , A.PENALTY_MANAGE_YEAR
+		 , A.PENALTY_SEQNO
+		 , A.MOTION_ID
+		 , TO_CHAR(A.SEND_DATE, 'YYYYMMDD') AS SEND_DATE
+		 , TO_CHAR(A.DELIVERY_DATE, 'YYYYMMDD') AS DELIVERY_DATE
+		 , DECODE(A.ETAX_YN,'1','생성','미생성') AS ETAX_YN
+		 , A.ETAX_DATE AS ETAX_DATE
+		 , A.YEAR
+		 , A.MONTH
+		 , A.DAY
+		 , A.WORK_TIMES
+		 , A.CAR_NO
+		 , A.RESIDENT_NO
+		 , A.OWNER
+		 , A.LAVY_AMOUNT
+		 , A.SEND_NO
+		 , A.UPDATE_DATE
+		 , FN_VIRTUALACCOUNT('A', A.PENALTY_MANAGE_YEAR, A.PENALTY_SEQNO) AS VIRTUAL_BANK
+      FROM (
+		   SELECT A.PENALTY_MANAGE_YEAR
+		        , A.PENALTY_SEQNO
+		        , B.MOTION_ID
+		        , B.SEND_DATE
+		        , B.DELIVERY_DATE
+		        , B.ETAX_YN
+		        , B.ETAX_DATE
+		        , A.YEAR
+		        , A.MONTH
+		        , A.DAY
+		        , A.WORK_TIMES
+		        , A.CAR_NO
+		        , DGUARD.DECRYPT('ENC','COL',a.ENC_RESIDENT_NO) as RESIDENT_NO
+		        , A.OWNER
 		<if test="@cfs.common.util.MybatisUtil@equals(stage,'0')">
-			,FUN_GET_PENALTY_AMT (A.PENALTY_MANAGE_YEAR, A.PENALTY_SEQNO, TO_CHAR (SYSDATE, 'YYYYMMDD'), A.MOTION_ID) AS LAVY_AMOUNT
+			    , FUN_GET_PENALTY_AMT     (A.PENALTY_MANAGE_YEAR, A.PENALTY_SEQNO, TO_CHAR (SYSDATE, 'YYYYMMDD'), A.MOTION_ID) AS LAVY_AMOUNT
 		</if>
 		<if test="@cfs.common.util.MybatisUtil@equals(stage,'1')">
-			,FUN_GET_PENALTY_AMT (A.PENALTY_MANAGE_YEAR, A.PENALTY_SEQNO, TO_CHAR (SYSDATE, 'YYYYMMDD'), A.MOTION_ID) AS LAVY_AMOUNT
+			    , FUN_GET_PENALTY_AMT     (A.PENALTY_MANAGE_YEAR, A.PENALTY_SEQNO, TO_CHAR (SYSDATE, 'YYYYMMDD'), A.MOTION_ID) AS LAVY_AMOUNT
 		</if>
 		<if test="@cfs.common.util.MybatisUtil@equals(stage,'2')">
 			<if test="motionId.equals('095')">
-				,FUN_GET_PENALTY_AMT_REAL (A.PENALTY_MANAGE_YEAR, A.PENALTY_SEQNO, TO_CHAR (SYSDATE, 'YYYYMMDD'), A.MOTION_ID) AS LAVY_AMOUNT
+				, FUN_GET_PENALTY_AMT_REAL(A.PENALTY_MANAGE_YEAR, A.PENALTY_SEQNO, TO_CHAR (SYSDATE, 'YYYYMMDD'), A.MOTION_ID) AS LAVY_AMOUNT
 			</if>
 			<if test="!motionId.equals('095')">
-				,DECODE(A.FINE_AMOUNT,'8000','10300','4000','5150') as LAVY_AMOUNT
+				, DECODE(A.FINE_AMOUNT,'8000','10300','4000','5150') as LAVY_AMOUNT
 			</if>
 		</if>
-		, B.SEND_NO
-		, B.UPDATE_DATE
-		, ROW_NUMBER() OVER (PARTITION BY B.PENALTY_MANAGE_YEAR, B.PENALTY_SEQNO ORDER BY DECODE(A.MOTION_ID, B.MOTION_ID, SYSDATE, B.CREATE_DATE) DESC) RN
-		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
+		        , B.SEND_NO
+		        , B.UPDATE_DATE
+		        , ROW_NUMBER() OVER (PARTITION BY B.PENALTY_MANAGE_YEAR, B.PENALTY_SEQNO ORDER BY DECODE(A.MOTION_ID, B.MOTION_ID, SYSDATE, B.CREATE_DATE) DESC) RN
+		     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
 		<if test="motionId.equals('095')">
-			AND A.MOTION_ID          IN ('41','42','43','45','46','47','71','72')
-			AND B.SEND_DATE = TO_DATE(#{sendDate} ,'YYYYMMDD')
-			AND B.DELIVERY_DATE = TO_DATE(#{deliveryDate} ,'YYYYMMDD')
+			  AND A.MOTION_ID          IN ('41','42','43','45','46','47','71','72')
+			  AND B.SEND_DATE = TO_DATE(#{sendDate} ,'YYYYMMDD')
+			  AND B.DELIVERY_DATE = TO_DATE(#{deliveryDate} ,'YYYYMMDD')
 		</if>
 		<if test="!motionId.equals('095')">
-			AND A.MOTION_ID           = #{motionId}
-			AND B.SEND_DATE = TO_DATE(#{sendDate} ,'YYYYMMDD')
-			AND B.DELIVERY_DATE = TO_DATE(#{deliveryDate} ,'YYYYMMDD')
-			AND B.RETURN_KBN = '1'
+			  AND A.MOTION_ID           = #{motionId}
+			  AND B.SEND_DATE = TO_DATE(#{sendDate} ,'YYYYMMDD')
+			  AND B.DELIVERY_DATE = TO_DATE(#{deliveryDate} ,'YYYYMMDD')
+			  AND B.RETURN_KBN = '1'
 		</if>
 		<if test="!@cfs.common.util.MybatisUtil@empty(etaxYn)">
-			AND B.ETAX_YN = #{etaxYn}
+			  AND B.ETAX_YN = #{etaxYn}
 		</if>
-		AND A.RECEIPT_YN = '0'
-		AND A.RENT_KBN = '0'
-		AND A.PASS_DATE BETWEEN #{penaltyDateFrom} AND #{penaltyDateTo}
+		      AND A.RECEIPT_YN = '0'
+		      AND A.RENT_KBN = '0'
+		      AND A.PASS_DATE BETWEEN #{penaltyDateFrom} AND #{penaltyDateTo}
 		union all
-		SELECT A.PENALTY_MANAGE_YEAR
-		, A.PENALTY_SEQNO
-		, B.MOTION_ID
-		, B.SEND_DATE
-		, B.DELIVERY_DATE
-		, B.ETAX_YN
-		, B.ETAX_DATE
-		, A.YEAR
-		, A.MONTH
-		, A.DAY
-		, A.WORK_TIMES
-		, A.CAR_NO
-		, DGUARD.DECRYPT('ENC','COL',a.ENC_RESIDENT_NO) as RESIDENT_NO
-		, A.OWNER
+           SELECT A.PENALTY_MANAGE_YEAR
+		        , A.PENALTY_SEQNO
+		        , B.MOTION_ID
+		        , B.SEND_DATE
+		        , B.DELIVERY_DATE
+		        , B.ETAX_YN
+		        , B.ETAX_DATE
+		        , A.YEAR
+		        , A.MONTH
+		        , A.DAY
+		        , A.WORK_TIMES
+		        , A.CAR_NO
+		        , DGUARD.DECRYPT('ENC','COL',a.ENC_RESIDENT_NO) as RESIDENT_NO
+		        , A.OWNER
 		<if test="@cfs.common.util.MybatisUtil@equals(stage,'0')">
-			,FUN_GET_PENALTY_AMT (A.PENALTY_MANAGE_YEAR, A.PENALTY_SEQNO, TO_CHAR (SYSDATE, 'YYYYMMDD'), A.MOTION_ID) AS LAVY_AMOUNT
+			    , FUN_GET_PENALTY_AMT          (A.PENALTY_MANAGE_YEAR, A.PENALTY_SEQNO, TO_CHAR (SYSDATE, 'YYYYMMDD'), A.MOTION_ID) AS LAVY_AMOUNT
 		</if>
 		<if test="@cfs.common.util.MybatisUtil@equals(stage,'1')">
-			,FUN_GET_PENALTY_AMT (A.PENALTY_MANAGE_YEAR, A.PENALTY_SEQNO, TO_CHAR (SYSDATE, 'YYYYMMDD'), A.MOTION_ID) AS LAVY_AMOUNT
+			    , FUN_GET_PENALTY_AMT          (A.PENALTY_MANAGE_YEAR, A.PENALTY_SEQNO, TO_CHAR (SYSDATE, 'YYYYMMDD'), A.MOTION_ID) AS LAVY_AMOUNT
 		</if>
 		<if test="@cfs.common.util.MybatisUtil@equals(stage,'2')">
 			<if test="motionId.equals('095')">
-				,FUN_GET_PENALTY_AMT_RENT_REAL (A.PENALTY_MANAGE_YEAR, A.PENALTY_SEQNO, TO_CHAR (SYSDATE, 'YYYYMMDD'), A.MOTION_ID) AS LAVY_AMOUNT
+				, FUN_GET_PENALTY_AMT_RENT_REAL(A.PENALTY_MANAGE_YEAR, A.PENALTY_SEQNO, TO_CHAR (SYSDATE, 'YYYYMMDD'), A.MOTION_ID) AS LAVY_AMOUNT
 			</if>
 			<if test="!motionId.equals('095')">
-				,DECODE(A.FINE_AMOUNT,'8000','10300','4000','5150') as LAVY_AMOUNT
+				, DECODE(A.FINE_AMOUNT,'8000','10300','4000','5150') as LAVY_AMOUNT
 			</if>
 		</if>
-		, B.SEND_NO
-		, B.UPDATE_DATE
-		, ROW_NUMBER() OVER (PARTITION BY B.PENALTY_MANAGE_YEAR, B.PENALTY_SEQNO ORDER BY DECODE(A.MOTION_ID, B.MOTION_ID, SYSDATE, B.CREATE_DATE) DESC) RN
-		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
+		        , B.SEND_NO
+		        , B.UPDATE_DATE
+		        , ROW_NUMBER() OVER (PARTITION BY B.PENALTY_MANAGE_YEAR, B.PENALTY_SEQNO ORDER BY DECODE(A.MOTION_ID, B.MOTION_ID, SYSDATE, B.CREATE_DATE) DESC) RN
+		     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
 		<if test="motionId.equals('095')">
-			AND A.MOTION_ID          IN ('41','43','45','46','47','71','72')
-			AND B.SEND_DATE = TO_DATE(#{sendDate} ,'YYYYMMDD')
-			AND B.DELIVERY_DATE = TO_DATE(#{deliveryDate} ,'YYYYMMDD')
+			  AND A.MOTION_ID          IN ('41','43','45','46','47','71','72')
+			  AND B.SEND_DATE = TO_DATE(#{sendDate} ,'YYYYMMDD')
+			  AND B.DELIVERY_DATE = TO_DATE(#{deliveryDate} ,'YYYYMMDD')
 		</if>
 		<if test="!motionId.equals('095')">
-			AND A.MOTION_ID           = #{motionId}
-			AND B.SEND_DATE = TO_DATE(#{sendDate} ,'YYYYMMDD')
-			AND B.DELIVERY_DATE = TO_DATE(#{deliveryDate} ,'YYYYMMDD')
-			AND B.RETURN_KBN = '1'
+			  AND A.MOTION_ID           = #{motionId}
+			  AND B.SEND_DATE = TO_DATE(#{sendDate} ,'YYYYMMDD')
+			  AND B.DELIVERY_DATE = TO_DATE(#{deliveryDate} ,'YYYYMMDD')
+			  AND B.RETURN_KBN = '1'
 		</if>
 		<if test="!@cfs.common.util.MybatisUtil@empty(etaxYn)">
-			AND B.ETAX_YN = #{etaxYn}
+			  AND B.ETAX_YN = #{etaxYn}
 		</if>
-		AND A.RECEIPT_YN = '0'
-		AND A.RENT_KBN = '1'
-		AND A.PASS_DATE BETWEEN #{penaltyDateFrom} AND #{penaltyDateTo}
-		) A
-		WHERE RN = 1
+		      AND A.RECEIPT_YN = '0'
+		      AND A.RENT_KBN = '1'
+		      AND A.PASS_DATE BETWEEN #{penaltyDateFrom} AND #{penaltyDateTo}
+           ) A
+     WHERE RN = 1
 		<if test="motionId.equals('095')">
-			ORDER BY A.UPDATE_DATE
+	 ORDER BY A.UPDATE_DATE
 		</if>
 		<if test="!motionId.equals('095')">
-			ORDER BY A.PENALTY_MANAGE_YEAR, A.PENALTY_SEQNO DESC
+	 ORDER BY A.PENALTY_MANAGE_YEAR, A.PENALTY_SEQNO DESC
 		</if>
 	</select>
 

src/main/java/cfs/fine/web/FinePenaltyController.java

@@ -1223,10 +1223,10 @@ public class FinePenaltyController {
 	}
 
 	/**
-	 * ETAX 파일생성 조회
+	 * [FN019P02] 이택스파일생성 팝업 > 조회 버튼
 	 *
 	 * @author allsunday
-	 * @task
+	 * @task [FN019P02]
 	 * @param param
 	 * @param request
 	 * @return

src/main/java/cfs/fine/web/FinePenaltyDisableProcessingController.java

@@ -54,6 +54,36 @@ public class FinePenaltyDisableProcessingController {
 			System.out.println("################# : 과태료 납부(소인)/반송/독촉 불가처리 -  메인 그리드 조회 ");
 			
 			statList = (List<FinePenaltyDisableProcessingVO>) finePenaltyDisableProcessingService.findPaymentOfPenaltyList_kbn(finePenaltyDisableProcessingVO);
+			
+			//1차고지 후 2차고지 전 자료의 금액 표시 변경(가산금 적용)
+			if(statList != null && !statList.isEmpty()){
+				for(FinePenaltyDisableProcessingVO statOne : statList){
+					int passDate = Integer.parseInt(statOne.getYear()+statOne.getMonth()+statOne.getDay());
+					
+					String receiptKbn = statOne.getReceiptKbn();
+					String noticeKbn = statOne.getNoticeKbn();
+					if(receiptKbn != null && receiptKbn.equals("미납") && (noticeKbn == null || noticeKbn.equals(""))){
+						String tt = statOne.getExcessDays();
+						if(tt != null && !tt.equals("") && !tt.equals("0")){
+							String aiTotAmt = statOne.getAiTotAmt();
+							String penalty = statOne.getPenalty();
+							if(penalty != null && !penalty.equals("") && !penalty.equals("0") && penalty.equals(aiTotAmt)){
+								if(passDate >= 20140109){
+									int penaltyNum = Integer.parseInt(penalty);
+									int add = 0;
+									if(passDate >= 20170603){
+										add = (int)(penaltyNum*0.03);
+									} else {
+										add = (int)(penaltyNum*0.05);
+									}
+									penaltyNum = penaltyNum + add;
+									statOne.setPenalty(Integer.toString(penaltyNum));
+								}
+							}
+						}
+					}
+				}
+			}
 			result.setData("result", statList);	
 			
 			result.setMsg(Result.STATUS_SUCESS, "정상적으로 조회가 완료되었습니다.");
@@ -91,17 +121,24 @@ public class FinePenaltyDisableProcessingController {
 			if(statList1 != null && !statList1.isEmpty() && statList2 != null && !statList2.isEmpty()){
 				String receiptKbn = statList2.get("receiptKbn");
 				String noticeKbn = statList2.get("noticeKbn");
-				if(receiptKbn.equals("미납") && (noticeKbn == null || noticeKbn.equals(""))){
+				if(receiptKbn != null && receiptKbn.equals("미납") && (noticeKbn == null || noticeKbn.equals(""))){
 					String tt = statList1.get("tt");
 					if(tt != null && !tt.equals("") && !tt.equals("0")){
 						String aiTotAmt = String.valueOf(statList1.get("aiTotAmt"));
 						String penalty = String.valueOf(statList1.get("penalty"));
-						if(penalty.equals(aiTotAmt)){
-							System.out.println("test4");
-							int penaltyNum = Integer.parseInt(penalty);
-							int add = (int)(penaltyNum*0.03);
-							penaltyNum = penaltyNum + add;
-							statList1.put("penalty", Integer.toString(penaltyNum));
+						if(penalty != null && !penalty.equals("") && !penalty.equals("0") && penalty.equals(aiTotAmt)){
+							int passDate = Integer.parseInt(statList1.get("year")+statList1.get("month")+statList1.get("day"));
+							if(passDate >= 20140109){
+								int penaltyNum = Integer.parseInt(penalty);
+								int add = 0;
+								if(passDate >= 20170603){
+									add = (int)(penaltyNum*0.03);
+								} else {
+									add = (int)(penaltyNum*0.05);
+								}
+								penaltyNum = penaltyNum + add;
+								statList1.put("penalty", Integer.toString(penaltyNum));
+							}
 						}
 					}
 				}

src/main/java/cfs/fine/web/FinePenaltyRentController.java

@@ -177,7 +177,7 @@ public class FinePenaltyRentController {
 	}
 	
 	/**
-	 *  이택스파일생성팝업 > 파일생성 버튼
+	 *  [FN019P02] 이택스파일생성 팝업 > 파일생성 버튼
 	 *
 	 * @author allsunday
 	 * @task [FN019P02]

src/main/java/cfs/income/dao/IncomeDao.java

@@ -41,9 +41,7 @@ public interface IncomeDao {
 	List<IncomeDailyCalculateVO> findIncomeDailyCalculateList(IncomeParamsVO incomeParamsVO);
 	
 	
-	/* 일일 수입금 정산현황(센터용) [IC051] */
-	List<IncomeDailyCalculateVO> findIncomeDailyCalculateCenterList(IncomeParamsVO incomeParamsVO);
-	
+
 	/* 일일 수입금 정산현황 [IC051] */
 	IncomeDailyCalculateVO findIncomeDailyCalculateListCnt(IncomeParamsVO incomeParamsVO);
 

src/main/java/cfs/income/dao/mapper/Income_mapper.xml

@@ -972,355 +972,8 @@
 			</if>
 	</select>
 
-	<!-- 일일 수입금 정산현황(센터용) 조회 [IC051] -->
-	<resultMap id="findIncomeDailyCalculateCenterList-resultMap" type="cfs.income.vo.IncomeDailyCalculateVO">
-		<result property="kbn" column="KBN"/>
-		<result property="passStDate" column="PASS_ST_DATE"/>
-		<result property="passEdDate" column="PASS_ED_DATE"/>
-		<result property="totalQ" column="TOTAL_Q"/>
-		<result property="cltSumQ" column="CLT_SUM_Q"/>
-		<result property="cltCashSumQ" column="CLT_CASH_SUM_Q"/>
-		<result property="cltCashNormalQ" column="CLT_CASH_NORMAL_Q"/>
-		<result property="cltCashLightQ" column="CLT_CASH_LIGHT_Q"/>
-		<result property="cltCardSumSumQ" column="CLT_CARD_SUM_SUM_Q"/>
-		<result property="cltCardSumNormalQ" column="CLT_CARD_SUM_NORMAL_Q"/>
-		<result property="cltCardSumLightQ" column="CLT_CARD_SUM_LIGHT_Q"/>
-		<result property="cltCardBeforeSumQ" column="CLT_CARD_BEFORE_SUM_Q"/>
-		<result property="cltCardBeforeNormalQ" column="CLT_CARD_BEFORE_NORMAL_Q"/>
-		<result property="cltCardBeforeLightQ" column="CLT_CARD_BEFORE_LIGHT_Q"/>
-		<result property="cltCardAfterSumQ" column="CLT_CARD_AFTER_SUM_Q"/>
-		<result property="cltCardAfterNormalQ" column="CLT_CARD_AFTER_NORMAL_Q"/>
-		<result property="cltCardAfterLightQ" column="CLT_CARD_AFTER_LIGHT_Q"/>
-		<result property="cltCardRepayQ" column="CLT_CARD_REPAY_Q"/>
-		<result property="cltCouponSumQ" column="CLT_COUPON_SUM_Q"/>
-		<result property="cltCouponNormalQ" column="CLT_COUPON_NORMAL_Q"/>
-		<result property="cltCouponLightQ" column="CLT_COUPON_LIGHT_Q"/>
-		<result property="noncltExemptQ" column="NONCLT_EXEMPT_Q"/>
-		<result property="noncltNonpayQ" column="NONCLT_NONPAY_Q"/>
-		<result property="totalM" column="TOTAL_M"/>
-		<result property="cashM" column="CASH_M"/>
-		<result property="cardSumM" column="CARD_SUM_M"/>
-		<result property="cardBeforeM" column="CARD_BEFORE_M"/>
-		<result property="cardAfterM" column="CARD_AFTER_M"/>
-		<result property="repayM" column="REPAY_M"/>
-		<result property="cashFixAmountSumQ" column="CASH_FIX_AMOUNT_SUM_Q"/>
-		<result property="cashFixAmountNormalQ" column="CASH_FIX_AMOUNT_NORMAL_Q"/>
-		<result property="cashFixAmountLightQ" column="CASH_FIX_AMOUNT_LIGHT_Q"/>
-		<result property="cashFixAmountSumM" column="CASH_FIX_AMOUNT_SUM_M"/>
-		<result property="cashFixAmountNormalM" column="CASH_FIX_AMOUNT_NORMAL_M"/>
-		<result property="cashFixAmountLightM" column="CASH_FIX_AMOUNT_LIGHT_M"/>
-		<result property="preNomlQty" column="PRP_REQ_NORMAL_Q"/>
-		<result property="preLightQty" column="PRP_REQ_RFID_Q"/>
-		<result property="fareOfficeId" column="FARE_OFFICE_iD"/>
-	</resultMap>
-	<select id="findIncomeDailyCalculateCenterList" parameterType="cfs.income.vo.IncomeParamsVO" resultMap="findIncomeDailyCalculateCenterList-resultMap">
-		SELECT
-			<if test='kbn eq "1"'>
-				'일계' AS KBN
-				, #{inEdDate} AS PASS_ST_DATE
-				, #{inEdDate} AS PASS_ED_DATE
-			</if>
-			<if test='kbn eq "2"'>
-				#{inStDate}||' ~ '||#{inEdDate} AS KBN
-				, #{inStDate} AS PASS_ST_DATE
-				, #{inEdDate} AS PASS_ED_DATE
-			</if>
-			, '총계' AS FARE_OFFICE_iD
-			, NVL(SUM(NVL(IN_CASH_QUANTITY,0)        + NVL(OUT_CASH_QUANTITY,0)),0)			AS CLT_CASH_NORMAL_Q
-			, NVL(SUM(NVL(IN_K_CASH_Q,0)     		 + NVL(OUT_K_CASH_Q,0)),0)				AS CLT_CASH_LIGHT_Q
-			, NVL(SUM(NVL(IN_CARD_BEFORE_QUANTITY,0) + NVL(OUT_CARD_BEFORE_QUANTITY,0)),0)	AS CLT_CARD_BEFORE_NORMAL_Q
-			, NVL(SUM(NVL(IN_K_CARD_SUN_Q,0) 		 + NVL(OUT_K_CARD_SUN_Q,0)),0)			AS CLT_CARD_BEFORE_LIGHT_Q
-			, NVL(SUM(NVL(IN_CARD_AFTER_QUANTITY,0)  + NVL(OUT_CARD_AFTER_QUANTITY,0)),0)	AS CLT_CARD_AFTER_NORMAL_Q
-			, NVL(SUM(NVL(IN_K_CARD_WHO_Q,0) 		 + NVL(OUT_K_CARD_WHO_Q,0)),0)			AS CLT_CARD_AFTER_LIGHT_Q
-			, NVL(SUM(NVL(IN_REPAY_CNT,0)    		 + NVL(OUT_REPAY_CNT,0)),0)				AS CLT_CARD_REPAY_Q
-			, NVL(SUM(NVL(IN_COUPON_QUANTITY,0)      + NVL(OUT_COUPON_QUANTITY,0)),0)		AS CLT_COUPON_NORMAL_Q
-			, NVL(SUM(NVL(IN_K_COUPON_Q,0)   		 + NVL(OUT_K_COUPON_Q,0)),0)			AS CLT_COUPON_LIGHT_Q
-			, NVL(SUM(NVL(IN_EXEMPTION_QUANTITY,0)   + NVL(OUT_EXEMPTION_QUANTITY,0)),0)	AS NONCLT_EXEMPT_Q
-			, NVL(SUM(NVL(IN_NONPAYMENT_QUANTITY,0)  + NVL(OUT_NONPAYMENT_QUANTITY,0)),0)	AS NONCLT_NONPAY_Q
-			, NVL(SUM(NVL(IN_CASH_INCOME,0)          + NVL(OUT_CASH_INCOME,0)),0)
-				+ NVL(SUM(NVL(IN_K_CASH_INCOME,0)    + NVL(OUT_K_CASH_INCOME,0)),0)			AS CASH_M
-			, NVL(SUM(NVL(IN_CARD_BEFORE_INCOME,0)   + NVL(OUT_CARD_BEFORE_INCOME,0)),0)
-				+ NVL(SUM(NVL(IN_K_CARD_SUN_INCOME,0)+ NVL(OUT_K_CARD_SUN_INCOME,0)),0)		AS CARD_BEFORE_M
-			, NVL(SUM(NVL(IN_CARD_AFTER_INCOME,0)    + NVL(OUT_CARD_AFTER_INCOME,0)),0)
-				+ NVL(SUM(NVL(IN_K_CARD_WHO_INCOME,0)+ NVL(OUT_K_CARD_WHO_INCOME,0)),0)		AS CARD_AFTER_M
-			, NVL(SUM(NVL(IN_REPAY_AMOUNT,0) 		 + NVL(OUT_REPAY_AMOUNT,0)),0)			AS REPAY_M
-			, NVL(SUM(NVL(IN_COUPON_SALE_QUANTITY,0) + NVL(OUT_COUPON_SALE_QUANTITY,0)),0)	AS CASH_FIX_AMOUNT_NORMAL_Q
-			, NVL(SUM(NVL(IN_K_COUPON_SALE_Q,0)      + NVL(OUT_K_COUPON_SALE_Q,0)),0)		AS CASH_FIX_AMOUNT_LIGHT_Q
-			, NVL(SUM(NVL(IN_COUPON_SALE,0)          + NVL(OUT_COUPON_SALE,0)),0)			AS CASH_FIX_AMOUNT_NORMAL_M
-			, NVL(SUM(NVL(IN_K_COUPON_SALE_INCOME,0) + NVL(OUT_K_COUPON_SALE_INCOME,0)),0)	AS CASH_FIX_AMOUNT_LIGHT_M
-			, SUM(NVL(IN_PRP_Q,0) + NVL(out_PRP_Q,0)) AS PRP_REQ_NORMAL_Q
-			, SUM(NVL(IN_k_PRP_Q,0) + NVL(out_K_PRP_Q,0)) AS PRP_REQ_RFID_Q
-		FROM  DAY_ADJUST_INFO A,
-              (SELECT  TO_CHAR(S_DT + LEVEL - 1, 'YYYY') AS YEAR_99
-		              ,TO_CHAR(S_DT + LEVEL - 1, 'MM')   AS MONTH_99
-		              ,TO_CHAR(S_DT + LEVEL - 1, 'DD')   AS DAY_99
-			<if test='kbn eq "1"'>
-		           FROM  (SELECT  TO_DATE(cast(#{inEdDate} as varchar(8)), 'YYYYMMDD') AS S_DT
-		                         ,TO_DATE(cast(#{inEdDate} as varchar(8)), 'YYYYMMDD') AS E_DT
-			</if>
-			<if test='kbn eq "2"'>
-		           FROM  (SELECT  TO_DATE(cast(#{inStDate} as varchar(8)), 'YYYYMMDD') AS S_DT
-		                         ,TO_DATE(cast(#{inEdDate} as varchar(8)), 'YYYYMMDD') AS E_DT
-			</if>
-		                    FROM  DUAL)
-		        CONNECT  BY LEVEL <![CDATA[<=]]> E_DT - S_DT + 1
-              ) SRC_DAY
-        WHERE A.YEAR  = SRC_DAY.YEAR_99
-          AND A.MONTH = SRC_DAY.MONTH_99
-          AND A.DAY   = SRC_DAY.DAY_99
-		UNION ALL
-		SELECT
-			'누계' AS KBN
-			, SUBSTR(#{inEdDate},1,4)||'0101' AS PASS_ST_DATE
-			, #{inEdDate} AS PASS_ED_DATE
-			, '총계' AS FARE_OFFICE_iD
-			, NVL(SUM(NVL(IN_CASH_QUANTITY,0)        + NVL(OUT_CASH_QUANTITY,0)),0)			AS CLT_CASH_NORMAL_Q
-			, NVL(SUM(NVL(IN_K_CASH_Q,0)     		 + NVL(OUT_K_CASH_Q,0)),0)				AS CLT_CASH_LIGHT_Q
-			, NVL(SUM(NVL(IN_CARD_BEFORE_QUANTITY,0) + NVL(OUT_CARD_BEFORE_QUANTITY,0)),0)	AS CLT_CARD_BEFORE_NORMAL_Q
-			, NVL(SUM(NVL(IN_K_CARD_SUN_Q,0) 		 + NVL(OUT_K_CARD_SUN_Q,0)),0)			AS CLT_CARD_BEFORE_LIGHT_Q
-			, NVL(SUM(NVL(IN_CARD_AFTER_QUANTITY,0)  + NVL(OUT_CARD_AFTER_QUANTITY,0)),0)	AS CLT_CARD_AFTER_NORMAL_Q
-			, NVL(SUM(NVL(IN_K_CARD_WHO_Q,0) 		 + NVL(OUT_K_CARD_WHO_Q,0)),0)			AS CLT_CARD_AFTER_LIGHT_Q
-			, NVL(SUM(NVL(IN_REPAY_CNT,0)    		 + NVL(OUT_REPAY_CNT,0)),0)				AS CLT_CARD_REPAY_Q
-			, NVL(SUM(NVL(IN_COUPON_QUANTITY,0)      + NVL(OUT_COUPON_QUANTITY,0)),0)		AS CLT_COUPON_NORMAL_Q
-			, NVL(SUM(NVL(IN_K_COUPON_Q,0)   		 + NVL(OUT_K_COUPON_Q,0)),0)			AS CLT_COUPON_LIGHT_Q
-			, NVL(SUM(NVL(IN_EXEMPTION_QUANTITY,0)   + NVL(OUT_EXEMPTION_QUANTITY,0)),0)	AS NONCLT_EXEMPT_Q
-			, NVL(SUM(NVL(IN_NONPAYMENT_QUANTITY,0)  + NVL(OUT_NONPAYMENT_QUANTITY,0)),0)	AS NONCLT_NONPAY_Q
-			, NVL(SUM(NVL(IN_CASH_INCOME,0)          + NVL(OUT_CASH_INCOME,0)),0)
-				+ NVL(SUM(NVL(IN_K_CASH_INCOME,0)    + NVL(OUT_K_CASH_INCOME,0)),0)			AS CASH_M
-			, NVL(SUM(NVL(IN_CARD_BEFORE_INCOME,0)   + NVL(OUT_CARD_BEFORE_INCOME,0)),0)
-				+ NVL(SUM(NVL(IN_K_CARD_SUN_INCOME,0)+ NVL(OUT_K_CARD_SUN_INCOME,0)),0)		AS CARD_BEFORE_M
-			, NVL(SUM(NVL(IN_CARD_AFTER_INCOME,0)    + NVL(OUT_CARD_AFTER_INCOME,0)),0)
-				+ NVL(SUM(NVL(IN_K_CARD_WHO_INCOME,0)+ NVL(OUT_K_CARD_WHO_INCOME,0)),0)		AS CARD_AFTER_M
-			, NVL(SUM(NVL(IN_REPAY_AMOUNT,0) 		 + NVL(OUT_REPAY_AMOUNT,0)),0)			AS REPAY_M
-			, NVL(SUM(NVL(IN_COUPON_SALE_QUANTITY,0) + NVL(OUT_COUPON_SALE_QUANTITY,0)),0)	AS CASH_FIX_AMOUNT_NORMAL_Q
-			, NVL(SUM(NVL(IN_K_COUPON_SALE_Q,0)      + NVL(OUT_K_COUPON_SALE_Q,0)),0)		AS CASH_FIX_AMOUNT_LIGHT_Q
-			, NVL(SUM(NVL(IN_COUPON_SALE,0)          + NVL(OUT_COUPON_SALE,0)),0)			AS CASH_FIX_AMOUNT_NORMAL_M
-			, NVL(SUM(NVL(IN_K_COUPON_SALE_INCOME,0) + NVL(OUT_K_COUPON_SALE_INCOME,0)),0)	AS CASH_FIX_AMOUNT_LIGHT_M
-			, SUM(NVL(IN_PRP_Q,0) + NVL(out_PRP_Q,0)) AS PRP_REQ_NORMAL_Q
-			, SUM(NVL(IN_k_PRP_Q,0) + NVL(out_K_PRP_Q,0)) AS PRP_REQ_RFID_Q
-		FROM  DAY_ADJUST_INFO A,
-              (SELECT  TO_CHAR(S_DT + LEVEL - 1, 'YYYY') AS YEAR_99
-		              ,TO_CHAR(S_DT + LEVEL - 1, 'MM')   AS MONTH_99
-		              ,TO_CHAR(S_DT + LEVEL - 1, 'DD')   AS DAY_99
-		              ,TO_CHAR(S_DT + LEVEL - 1, 'YYYYMMDD')             AS DT_99
-		              ,TO_CHAR(S_DT + LEVEL - 1, 'D')                    AS D_99
-		         FROM  (SELECT  TO_DATE(cast(SUBSTR(#{inEdDate},1,4) as varchar(8)) || '0101', 'YYYYMMDD') AS S_DT
-		                       ,TO_DATE(cast(#{inEdDate} as varchar(8)), 'YYYYMMDD') AS E_DT
-		                  FROM  DUAL)
-		       CONNECT  BY LEVEL <![CDATA[<=]]> E_DT - S_DT + 1
-              ) SRC_DAY
-        WHERE A.YEAR  = SRC_DAY.YEAR_99
-          AND A.MONTH = SRC_DAY.MONTH_99
-          AND A.DAY   = SRC_DAY.DAY_99
-          UNION ALL
-          SELECT
-			<if test='kbn eq "1"'>
-				'일계' AS KBN
-				, #{inEdDate} AS PASS_ST_DATE
-				, #{inEdDate} AS PASS_ED_DATE
-			</if>
-			<if test='kbn eq "2"'>
-				#{inStDate}||' ~ '||#{inEdDate} AS KBN
-				, #{inStDate} AS PASS_ST_DATE
-				, #{inEdDate} AS PASS_ED_DATE
-			</if>
-			, '1호' AS FARE_OFFICE_iD
-			, NVL(SUM(NVL(IN_CASH_QUANTITY,0)        + NVL(OUT_CASH_QUANTITY,0)),0)			AS CLT_CASH_NORMAL_Q
-			, NVL(SUM(NVL(IN_K_CASH_Q,0)     		 + NVL(OUT_K_CASH_Q,0)),0)				AS CLT_CASH_LIGHT_Q
-			, NVL(SUM(NVL(IN_CARD_BEFORE_QUANTITY,0) + NVL(OUT_CARD_BEFORE_QUANTITY,0)),0)	AS CLT_CARD_BEFORE_NORMAL_Q
-			, NVL(SUM(NVL(IN_K_CARD_SUN_Q,0) 		 + NVL(OUT_K_CARD_SUN_Q,0)),0)			AS CLT_CARD_BEFORE_LIGHT_Q
-			, NVL(SUM(NVL(IN_CARD_AFTER_QUANTITY,0)  + NVL(OUT_CARD_AFTER_QUANTITY,0)),0)	AS CLT_CARD_AFTER_NORMAL_Q
-			, NVL(SUM(NVL(IN_K_CARD_WHO_Q,0) 		 + NVL(OUT_K_CARD_WHO_Q,0)),0)			AS CLT_CARD_AFTER_LIGHT_Q
-			, NVL(SUM(NVL(IN_REPAY_CNT,0)    		 + NVL(OUT_REPAY_CNT,0)),0)				AS CLT_CARD_REPAY_Q
-			, NVL(SUM(NVL(IN_COUPON_QUANTITY,0)      + NVL(OUT_COUPON_QUANTITY,0)),0)		AS CLT_COUPON_NORMAL_Q
-			, NVL(SUM(NVL(IN_K_COUPON_Q,0)   		 + NVL(OUT_K_COUPON_Q,0)),0)			AS CLT_COUPON_LIGHT_Q
-			, NVL(SUM(NVL(IN_EXEMPTION_QUANTITY,0)   + NVL(OUT_EXEMPTION_QUANTITY,0)),0)	AS NONCLT_EXEMPT_Q
-			, NVL(SUM(NVL(IN_NONPAYMENT_QUANTITY,0)  + NVL(OUT_NONPAYMENT_QUANTITY,0)),0)	AS NONCLT_NONPAY_Q
-			, NVL(SUM(NVL(IN_CASH_INCOME,0)          + NVL(OUT_CASH_INCOME,0)),0)
-				+ NVL(SUM(NVL(IN_K_CASH_INCOME,0)    + NVL(OUT_K_CASH_INCOME,0)),0)			AS CASH_M
-			, NVL(SUM(NVL(IN_CARD_BEFORE_INCOME,0)   + NVL(OUT_CARD_BEFORE_INCOME,0)),0)
-				+ NVL(SUM(NVL(IN_K_CARD_SUN_INCOME,0)+ NVL(OUT_K_CARD_SUN_INCOME,0)),0)		AS CARD_BEFORE_M
-			, NVL(SUM(NVL(IN_CARD_AFTER_INCOME,0)    + NVL(OUT_CARD_AFTER_INCOME,0)),0)
-				+ NVL(SUM(NVL(IN_K_CARD_WHO_INCOME,0)+ NVL(OUT_K_CARD_WHO_INCOME,0)),0)		AS CARD_AFTER_M
-			, NVL(SUM(NVL(IN_REPAY_AMOUNT,0) 		 + NVL(OUT_REPAY_AMOUNT,0)),0)			AS REPAY_M
-			, NVL(SUM(NVL(IN_COUPON_SALE_QUANTITY,0) + NVL(OUT_COUPON_SALE_QUANTITY,0)),0)	AS CASH_FIX_AMOUNT_NORMAL_Q
-			, NVL(SUM(NVL(IN_K_COUPON_SALE_Q,0)      + NVL(OUT_K_COUPON_SALE_Q,0)),0)		AS CASH_FIX_AMOUNT_LIGHT_Q
-			, NVL(SUM(NVL(IN_COUPON_SALE,0)          + NVL(OUT_COUPON_SALE,0)),0)			AS CASH_FIX_AMOUNT_NORMAL_M
-			, NVL(SUM(NVL(IN_K_COUPON_SALE_INCOME,0) + NVL(OUT_K_COUPON_SALE_INCOME,0)),0)	AS CASH_FIX_AMOUNT_LIGHT_M
-			, SUM(NVL(IN_PRP_Q,0) + NVL(out_PRP_Q,0)) AS PRP_REQ_NORMAL_Q
-			, SUM(NVL(IN_k_PRP_Q,0) + NVL(out_K_PRP_Q,0)) AS PRP_REQ_RFID_Q
-		FROM  DAY_ADJUST_INFO A,
-              (SELECT  TO_CHAR(S_DT + LEVEL - 1, 'YYYY') AS YEAR_99
-		              ,TO_CHAR(S_DT + LEVEL - 1, 'MM')   AS MONTH_99
-		              ,TO_CHAR(S_DT + LEVEL - 1, 'DD')   AS DAY_99
-			<if test='kbn eq "1"'>
-		           FROM  (SELECT  TO_DATE(cast(#{inEdDate} as varchar(8)), 'YYYYMMDD') AS S_DT
-		                         ,TO_DATE(cast(#{inEdDate} as varchar(8)), 'YYYYMMDD') AS E_DT
-			</if>
-			<if test='kbn eq "2"'>
-		           FROM  (SELECT  TO_DATE(cast(#{inStDate} as varchar(8)), 'YYYYMMDD') AS S_DT
-		                         ,TO_DATE(cast(#{inEdDate} as varchar(8)), 'YYYYMMDD') AS E_DT
-			</if>
-		                    FROM  DUAL)
-		        CONNECT  BY LEVEL <![CDATA[<=]]> E_DT - S_DT + 1
-              ) SRC_DAY
-        WHERE A.YEAR  = SRC_DAY.YEAR_99
-          AND A.MONTH = SRC_DAY.MONTH_99
-          AND A.DAY   = SRC_DAY.DAY_99
-          AND A.FARE_OFFICE_ID = '01'
-		UNION ALL
-		SELECT
-			'누계' AS KBN
-			, SUBSTR(#{inEdDate},1,4)||'0101' AS PASS_ST_DATE
-			, #{inEdDate} AS PASS_ED_DATE
-			, '1호' AS FARE_OFFICE_iD
-			, NVL(SUM(NVL(IN_CASH_QUANTITY,0)        + NVL(OUT_CASH_QUANTITY,0)),0)			AS CLT_CASH_NORMAL_Q
-			, NVL(SUM(NVL(IN_K_CASH_Q,0)     		 + NVL(OUT_K_CASH_Q,0)),0)				AS CLT_CASH_LIGHT_Q
-			, NVL(SUM(NVL(IN_CARD_BEFORE_QUANTITY,0) + NVL(OUT_CARD_BEFORE_QUANTITY,0)),0)	AS CLT_CARD_BEFORE_NORMAL_Q
-			, NVL(SUM(NVL(IN_K_CARD_SUN_Q,0) 		 + NVL(OUT_K_CARD_SUN_Q,0)),0)			AS CLT_CARD_BEFORE_LIGHT_Q
-			, NVL(SUM(NVL(IN_CARD_AFTER_QUANTITY,0)  + NVL(OUT_CARD_AFTER_QUANTITY,0)),0)	AS CLT_CARD_AFTER_NORMAL_Q
-			, NVL(SUM(NVL(IN_K_CARD_WHO_Q,0) 		 + NVL(OUT_K_CARD_WHO_Q,0)),0)			AS CLT_CARD_AFTER_LIGHT_Q
-			, NVL(SUM(NVL(IN_REPAY_CNT,0)    		 + NVL(OUT_REPAY_CNT,0)),0)				AS CLT_CARD_REPAY_Q
-			, NVL(SUM(NVL(IN_COUPON_QUANTITY,0)      + NVL(OUT_COUPON_QUANTITY,0)),0)		AS CLT_COUPON_NORMAL_Q
-			, NVL(SUM(NVL(IN_K_COUPON_Q,0)   		 + NVL(OUT_K_COUPON_Q,0)),0)			AS CLT_COUPON_LIGHT_Q
-			, NVL(SUM(NVL(IN_EXEMPTION_QUANTITY,0)   + NVL(OUT_EXEMPTION_QUANTITY,0)),0)	AS NONCLT_EXEMPT_Q
-			, NVL(SUM(NVL(IN_NONPAYMENT_QUANTITY,0)  + NVL(OUT_NONPAYMENT_QUANTITY,0)),0)	AS NONCLT_NONPAY_Q
-			, NVL(SUM(NVL(IN_CASH_INCOME,0)          + NVL(OUT_CASH_INCOME,0)),0)
-				+ NVL(SUM(NVL(IN_K_CASH_INCOME,0)    + NVL(OUT_K_CASH_INCOME,0)),0)			AS CASH_M
-			, NVL(SUM(NVL(IN_CARD_BEFORE_INCOME,0)   + NVL(OUT_CARD_BEFORE_INCOME,0)),0)
-				+ NVL(SUM(NVL(IN_K_CARD_SUN_INCOME,0)+ NVL(OUT_K_CARD_SUN_INCOME,0)),0)		AS CARD_BEFORE_M
-			, NVL(SUM(NVL(IN_CARD_AFTER_INCOME,0)    + NVL(OUT_CARD_AFTER_INCOME,0)),0)
-				+ NVL(SUM(NVL(IN_K_CARD_WHO_INCOME,0)+ NVL(OUT_K_CARD_WHO_INCOME,0)),0)		AS CARD_AFTER_M
-			, NVL(SUM(NVL(IN_REPAY_AMOUNT,0) 		 + NVL(OUT_REPAY_AMOUNT,0)),0)			AS REPAY_M
-			, NVL(SUM(NVL(IN_COUPON_SALE_QUANTITY,0) + NVL(OUT_COUPON_SALE_QUANTITY,0)),0)	AS CASH_FIX_AMOUNT_NORMAL_Q
-			, NVL(SUM(NVL(IN_K_COUPON_SALE_Q,0)      + NVL(OUT_K_COUPON_SALE_Q,0)),0)		AS CASH_FIX_AMOUNT_LIGHT_Q
-			, NVL(SUM(NVL(IN_COUPON_SALE,0)          + NVL(OUT_COUPON_SALE,0)),0)			AS CASH_FIX_AMOUNT_NORMAL_M
-			, NVL(SUM(NVL(IN_K_COUPON_SALE_INCOME,0) + NVL(OUT_K_COUPON_SALE_INCOME,0)),0)	AS CASH_FIX_AMOUNT_LIGHT_M
-			, SUM(NVL(IN_PRP_Q,0) + NVL(out_PRP_Q,0)) AS PRP_REQ_NORMAL_Q
-			, SUM(NVL(IN_k_PRP_Q,0) + NVL(out_K_PRP_Q,0)) AS PRP_REQ_RFID_Q
-		FROM  DAY_ADJUST_INFO A,
-              (SELECT  TO_CHAR(S_DT + LEVEL - 1, 'YYYY') AS YEAR_99
-		              ,TO_CHAR(S_DT + LEVEL - 1, 'MM')   AS MONTH_99
-		              ,TO_CHAR(S_DT + LEVEL - 1, 'DD')   AS DAY_99
-		              ,TO_CHAR(S_DT + LEVEL - 1, 'YYYYMMDD')             AS DT_99
-		              ,TO_CHAR(S_DT + LEVEL - 1, 'D')                    AS D_99
-		         FROM  (SELECT  TO_DATE(cast(SUBSTR(#{inEdDate},1,4) as varchar(8)) || '0101', 'YYYYMMDD') AS S_DT
-		                       ,TO_DATE(cast(#{inEdDate} as varchar(8)), 'YYYYMMDD') AS E_DT
-		                  FROM  DUAL)
-		       CONNECT  BY LEVEL <![CDATA[<=]]> E_DT - S_DT + 1
-              ) SRC_DAY
-        WHERE A.YEAR  = SRC_DAY.YEAR_99
-          AND A.MONTH = SRC_DAY.MONTH_99
-          AND A.DAY   = SRC_DAY.DAY_99
-          AND A.FARE_OFFICE_ID = '01'
-          UNION ALL
-          SELECT
-			<if test='kbn eq "1"'>
-				'일계' AS KBN
-				, #{inEdDate} AS PASS_ST_DATE
-				, #{inEdDate} AS PASS_ED_DATE
-			</if>
-			<if test='kbn eq "2"'>
-				#{inStDate}||' ~ '||#{inEdDate} AS KBN
-				, #{inStDate} AS PASS_ST_DATE
-				, #{inEdDate} AS PASS_ED_DATE
-			</if>
-			, '3호' AS FARE_OFFICE_iD
-			, NVL(SUM(NVL(IN_CASH_QUANTITY,0)        + NVL(OUT_CASH_QUANTITY,0)),0)			AS CLT_CASH_NORMAL_Q
-			, NVL(SUM(NVL(IN_K_CASH_Q,0)     		 + NVL(OUT_K_CASH_Q,0)),0)				AS CLT_CASH_LIGHT_Q
-			, NVL(SUM(NVL(IN_CARD_BEFORE_QUANTITY,0) + NVL(OUT_CARD_BEFORE_QUANTITY,0)),0)	AS CLT_CARD_BEFORE_NORMAL_Q
-			, NVL(SUM(NVL(IN_K_CARD_SUN_Q,0) 		 + NVL(OUT_K_CARD_SUN_Q,0)),0)			AS CLT_CARD_BEFORE_LIGHT_Q
-			, NVL(SUM(NVL(IN_CARD_AFTER_QUANTITY,0)  + NVL(OUT_CARD_AFTER_QUANTITY,0)),0)	AS CLT_CARD_AFTER_NORMAL_Q
-			, NVL(SUM(NVL(IN_K_CARD_WHO_Q,0) 		 + NVL(OUT_K_CARD_WHO_Q,0)),0)			AS CLT_CARD_AFTER_LIGHT_Q
-			, NVL(SUM(NVL(IN_REPAY_CNT,0)    		 + NVL(OUT_REPAY_CNT,0)),0)				AS CLT_CARD_REPAY_Q
-			, NVL(SUM(NVL(IN_COUPON_QUANTITY,0)      + NVL(OUT_COUPON_QUANTITY,0)),0)		AS CLT_COUPON_NORMAL_Q
-			, NVL(SUM(NVL(IN_K_COUPON_Q,0)   		 + NVL(OUT_K_COUPON_Q,0)),0)			AS CLT_COUPON_LIGHT_Q
-			, NVL(SUM(NVL(IN_EXEMPTION_QUANTITY,0)   + NVL(OUT_EXEMPTION_QUANTITY,0)),0)	AS NONCLT_EXEMPT_Q
-			, NVL(SUM(NVL(IN_NONPAYMENT_QUANTITY,0)  + NVL(OUT_NONPAYMENT_QUANTITY,0)),0)	AS NONCLT_NONPAY_Q
-			, NVL(SUM(NVL(IN_CASH_INCOME,0)          + NVL(OUT_CASH_INCOME,0)),0)
-				+ NVL(SUM(NVL(IN_K_CASH_INCOME,0)    + NVL(OUT_K_CASH_INCOME,0)),0)			AS CASH_M
-			, NVL(SUM(NVL(IN_CARD_BEFORE_INCOME,0)   + NVL(OUT_CARD_BEFORE_INCOME,0)),0)
-				+ NVL(SUM(NVL(IN_K_CARD_SUN_INCOME,0)+ NVL(OUT_K_CARD_SUN_INCOME,0)),0)		AS CARD_BEFORE_M
-			, NVL(SUM(NVL(IN_CARD_AFTER_INCOME,0)    + NVL(OUT_CARD_AFTER_INCOME,0)),0)
-				+ NVL(SUM(NVL(IN_K_CARD_WHO_INCOME,0)+ NVL(OUT_K_CARD_WHO_INCOME,0)),0)		AS CARD_AFTER_M
-			, NVL(SUM(NVL(IN_REPAY_AMOUNT,0) 		 + NVL(OUT_REPAY_AMOUNT,0)),0)			AS REPAY_M
-			, NVL(SUM(NVL(IN_COUPON_SALE_QUANTITY,0) + NVL(OUT_COUPON_SALE_QUANTITY,0)),0)	AS CASH_FIX_AMOUNT_NORMAL_Q
-			, NVL(SUM(NVL(IN_K_COUPON_SALE_Q,0)      + NVL(OUT_K_COUPON_SALE_Q,0)),0)		AS CASH_FIX_AMOUNT_LIGHT_Q
-			, NVL(SUM(NVL(IN_COUPON_SALE,0)          + NVL(OUT_COUPON_SALE,0)),0)			AS CASH_FIX_AMOUNT_NORMAL_M
-			, NVL(SUM(NVL(IN_K_COUPON_SALE_INCOME,0) + NVL(OUT_K_COUPON_SALE_INCOME,0)),0)	AS CASH_FIX_AMOUNT_LIGHT_M
-			, SUM(NVL(IN_PRP_Q,0) + NVL(out_PRP_Q,0)) AS PRP_REQ_NORMAL_Q
-			, SUM(NVL(IN_k_PRP_Q,0) + NVL(out_K_PRP_Q,0)) AS PRP_REQ_RFID_Q
-		FROM  DAY_ADJUST_INFO A,
-              (SELECT  TO_CHAR(S_DT + LEVEL - 1, 'YYYY') AS YEAR_99
-		              ,TO_CHAR(S_DT + LEVEL - 1, 'MM')   AS MONTH_99
-		              ,TO_CHAR(S_DT + LEVEL - 1, 'DD')   AS DAY_99
-			<if test='kbn eq "1"'>
-		           FROM  (SELECT  TO_DATE(cast(#{inEdDate} as varchar(8)), 'YYYYMMDD') AS S_DT
-		                         ,TO_DATE(cast(#{inEdDate} as varchar(8)), 'YYYYMMDD') AS E_DT
-			</if>
-			<if test='kbn eq "2"'>
-		           FROM  (SELECT  TO_DATE(cast(#{inStDate} as varchar(8)), 'YYYYMMDD') AS S_DT
-		                         ,TO_DATE(cast(#{inEdDate} as varchar(8)), 'YYYYMMDD') AS E_DT
-			</if>
-		                    FROM  DUAL)
-		        CONNECT  BY LEVEL <![CDATA[<=]]> E_DT - S_DT + 1
-              ) SRC_DAY
-        WHERE A.YEAR  = SRC_DAY.YEAR_99
-          AND A.MONTH = SRC_DAY.MONTH_99
-          AND A.DAY   = SRC_DAY.DAY_99
-          AND A.FARE_OFFICE_ID = '03'
-		UNION ALL
-		SELECT
-			'누계' AS KBN
-			, SUBSTR(#{inEdDate},1,4)||'0101' AS PASS_ST_DATE
-			, #{inEdDate} AS PASS_ED_DATE
-			, '3호' AS FARE_OFFICE_iD
-			, NVL(SUM(NVL(IN_CASH_QUANTITY,0)        + NVL(OUT_CASH_QUANTITY,0)),0)			AS CLT_CASH_NORMAL_Q
-			, NVL(SUM(NVL(IN_K_CASH_Q,0)     		 + NVL(OUT_K_CASH_Q,0)),0)				AS CLT_CASH_LIGHT_Q
-			, NVL(SUM(NVL(IN_CARD_BEFORE_QUANTITY,0) + NVL(OUT_CARD_BEFORE_QUANTITY,0)),0)	AS CLT_CARD_BEFORE_NORMAL_Q
-			, NVL(SUM(NVL(IN_K_CARD_SUN_Q,0) 		 + NVL(OUT_K_CARD_SUN_Q,0)),0)			AS CLT_CARD_BEFORE_LIGHT_Q
-			, NVL(SUM(NVL(IN_CARD_AFTER_QUANTITY,0)  + NVL(OUT_CARD_AFTER_QUANTITY,0)),0)	AS CLT_CARD_AFTER_NORMAL_Q
-			, NVL(SUM(NVL(IN_K_CARD_WHO_Q,0) 		 + NVL(OUT_K_CARD_WHO_Q,0)),0)			AS CLT_CARD_AFTER_LIGHT_Q
-			, NVL(SUM(NVL(IN_REPAY_CNT,0)    		 + NVL(OUT_REPAY_CNT,0)),0)				AS CLT_CARD_REPAY_Q
-			, NVL(SUM(NVL(IN_COUPON_QUANTITY,0)      + NVL(OUT_COUPON_QUANTITY,0)),0)		AS CLT_COUPON_NORMAL_Q
-			, NVL(SUM(NVL(IN_K_COUPON_Q,0)   		 + NVL(OUT_K_COUPON_Q,0)),0)			AS CLT_COUPON_LIGHT_Q
-			, NVL(SUM(NVL(IN_EXEMPTION_QUANTITY,0)   + NVL(OUT_EXEMPTION_QUANTITY,0)),0)	AS NONCLT_EXEMPT_Q
-			, NVL(SUM(NVL(IN_NONPAYMENT_QUANTITY,0)  + NVL(OUT_NONPAYMENT_QUANTITY,0)),0)	AS NONCLT_NONPAY_Q
-			, NVL(SUM(NVL(IN_CASH_INCOME,0)          + NVL(OUT_CASH_INCOME,0)),0)
-				+ NVL(SUM(NVL(IN_K_CASH_INCOME,0)    + NVL(OUT_K_CASH_INCOME,0)),0)			AS CASH_M
-			, NVL(SUM(NVL(IN_CARD_BEFORE_INCOME,0)   + NVL(OUT_CARD_BEFORE_INCOME,0)),0)
-				+ NVL(SUM(NVL(IN_K_CARD_SUN_INCOME,0)+ NVL(OUT_K_CARD_SUN_INCOME,0)),0)		AS CARD_BEFORE_M
-			, NVL(SUM(NVL(IN_CARD_AFTER_INCOME,0)    + NVL(OUT_CARD_AFTER_INCOME,0)),0)
-				+ NVL(SUM(NVL(IN_K_CARD_WHO_INCOME,0)+ NVL(OUT_K_CARD_WHO_INCOME,0)),0)		AS CARD_AFTER_M
-			, NVL(SUM(NVL(IN_REPAY_AMOUNT,0) 		 + NVL(OUT_REPAY_AMOUNT,0)),0)			AS REPAY_M
-			, NVL(SUM(NVL(IN_COUPON_SALE_QUANTITY,0) + NVL(OUT_COUPON_SALE_QUANTITY,0)),0)	AS CASH_FIX_AMOUNT_NORMAL_Q
-			, NVL(SUM(NVL(IN_K_COUPON_SALE_Q,0)      + NVL(OUT_K_COUPON_SALE_Q,0)),0)		AS CASH_FIX_AMOUNT_LIGHT_Q
-			, NVL(SUM(NVL(IN_COUPON_SALE,0)          + NVL(OUT_COUPON_SALE,0)),0)			AS CASH_FIX_AMOUNT_NORMAL_M
-			, NVL(SUM(NVL(IN_K_COUPON_SALE_INCOME,0) + NVL(OUT_K_COUPON_SALE_INCOME,0)),0)	AS CASH_FIX_AMOUNT_LIGHT_M
-			, SUM(NVL(IN_PRP_Q,0) + NVL(out_PRP_Q,0)) AS PRP_REQ_NORMAL_Q
-			, SUM(NVL(IN_k_PRP_Q,0) + NVL(out_K_PRP_Q,0)) AS PRP_REQ_RFID_Q
-		FROM  DAY_ADJUST_INFO A,
-              (SELECT  TO_CHAR(S_DT + LEVEL - 1, 'YYYY') AS YEAR_99
-		              ,TO_CHAR(S_DT + LEVEL - 1, 'MM')   AS MONTH_99
-		              ,TO_CHAR(S_DT + LEVEL - 1, 'DD')   AS DAY_99
-		              ,TO_CHAR(S_DT + LEVEL - 1, 'YYYYMMDD')             AS DT_99
-		              ,TO_CHAR(S_DT + LEVEL - 1, 'D')                    AS D_99
-		         FROM  (SELECT  TO_DATE(cast(SUBSTR(#{inEdDate},1,4) as varchar(8)) || '0101', 'YYYYMMDD') AS S_DT
-		                       ,TO_DATE(cast(#{inEdDate} as varchar(8)), 'YYYYMMDD') AS E_DT
-		                  FROM  DUAL)
-		       CONNECT  BY LEVEL <![CDATA[<=]]> E_DT - S_DT + 1
-              ) SRC_DAY
-        WHERE A.YEAR  = SRC_DAY.YEAR_99
-          AND A.MONTH = SRC_DAY.MONTH_99
-          AND A.DAY   = SRC_DAY.DAY_99
-          AND A.FARE_OFFICE_ID = '03'
-          <if test='kbn eq "1"'>
-          ORDER BY KBN DESC, FARE_OFFICE_iD
-          </if>
-          <if test='kbn eq "2"'>
-          ORDER BY KBN, FARE_OFFICE_iD
-          </if>
-	</select>
+	
+	
 	
 	<select id="findIncomeDailyCalculateListCnt" parameterType="cfs.income.vo.IncomeParamsVO" resultType="cfs.income.vo.IncomeDailyCalculateVO">
 	 SELECT COUNT(*) as count

src/main/java/cfs/income/service/IncomeService.java

@@ -34,9 +34,7 @@ public interface IncomeService {
 	/* 일일 수입금 정산현황 [IC002] */
 	List<IncomeDailyCalculateVO> findIncomeDailyCalculateList(IncomeParamsVO incomeParamsVO) throws Exception;
 	
-	/* 일일 수입금 정산현황 [IC051] */
-	List<IncomeDailyCalculateVO> findIncomeDailyCalculateCenterList(IncomeParamsVO incomeParamsVO) throws Exception;
-	
+
 	/* 일일 수입금 정산현황 [IC002] */
 	IncomeDailyCalculateVO findIncomeDailyCalculateListCnt(IncomeParamsVO incomeParamsVO) throws Exception;
 

src/main/java/cfs/income/service/impl/IncomeServiceImpl.java

@@ -68,10 +68,7 @@ public class IncomeServiceImpl implements IncomeService {
 		return incomeDao.findIncomeDailyCalculateList(incomeParamsVO);
 	}
 	
-	@Override
-	public List<IncomeDailyCalculateVO> findIncomeDailyCalculateCenterList(IncomeParamsVO incomeParamsVO) throws Exception {
-		return incomeDao.findIncomeDailyCalculateCenterList(incomeParamsVO);
-	}
+
 	
 	@Override
 	public IncomeDailyCalculateVO findIncomeDailyCalculateListCnt(IncomeParamsVO incomeParamsVO) throws Exception {
@@ -393,7 +390,6 @@ System.out.println("################# : findIncomeDailyClosingStatList_5");
 	public List<IncomeDailyCalculateVO> findIncomeDailyCalculateReportList2(IncomeParamsVO incomeParamsVO) {
 		List<IncomeDailyCalculateVO> result = new ArrayList<IncomeDailyCalculateVO>();
 		try{
-//			IncomeDailyCalculateVO workDate = incomeDao.findIncomeWorkDate(incomeParamsVO);
 			
 			IncomeDailyCalculateVO payDate = incomeDao.findIncomePayDate(incomeParamsVO);
 			incomeParamsVO.setCount(payDate.getCount());
@@ -403,10 +399,7 @@ System.out.println("################# : findIncomeDailyClosingStatList_5");
 			incomeParamsVO.setInEdDate(stanDate.getDates());
 			
 			result = incomeDao.findIncomeDailyCalculateReportList2(incomeParamsVO);
-//			result.get(0).setCount(payDate.getCount());
-//			if(null != workDate && workDate.getCount() != null){
-//				result.get(0).setWorkDate(workDate.getCount());
-//			}
+
 		}catch (Exception e) {
 			e.printStackTrace();
 		}

src/main/java/cfs/income/web/IncomeController.java

@@ -239,7 +239,7 @@ System.out.println("################# : 시작 2");
 	 *
 	 * 혼잡 통행료 총괄 현황 목록을 조회한다.
 	 * @author NOHEART
-	 * @task [IC006] 조회
+	 * @task [IC006M02] 월별,년별 조회
 	 * @param param
 	 * @return
 	 * 수정내역
@@ -268,7 +268,7 @@ System.out.println("################# : 시작 2");
 	 *
 	 * 혼잡 통행료 총괄 현황 목록을 조회한다. 휴일 제외
 	 * @author NOHEART
-	 * @task [IC006M02] 조회
+	 * @task [IC006M02] 일별 조회
 	 * @param param
 	 * @return
 	 * 수정내역

src/main/java/cfs/trsmrcv/dao/mapper/CommSisul_mapper.xml

@@ -63,9 +63,11 @@
             BOOTH_ID,
             TO_NUMBER(BOOTH_ID)||'차로' AS BOOTH_NM,
             CAR_NO,
-            (CASE WHEN B.MOTION_ID IS NOT NULL 
-                    THEN DBUSER_CFS.FUN_GET_PENALTY_AMT_RENT_REAL (A.PENALTY_MANAGE_YEAR,A.PENALTY_SEQNO,TO_CHAR(SYSDATE,'YYYYMMDD'),'') 
-                    ELSE DBUSER_CFS.FUN_GET_PENALTY_AMT_REAL (A.PENALTY_MANAGE_YEAR,A.PENALTY_SEQNO,TO_CHAR(SYSDATE,'YYYYMMDD'),'') END) LEVY_AMOUNT,
+            (CASE 
+             WHEN B.MOTION_ID IS NOT NULL 
+             THEN FUN_GET_PENALTY_AMT_RENT_REAL(A.PENALTY_MANAGE_YEAR,A.PENALTY_SEQNO,TO_CHAR(SYSDATE,'YYYYMMDD'),'') 
+             ELSE FUN_GET_PENALTY_AMT_REAL     (A.PENALTY_MANAGE_YEAR,A.PENALTY_SEQNO,TO_CHAR(SYSDATE,'YYYYMMDD'),'') 
+             END) LEVY_AMOUNT,
             RECEIPT_YN,
             DECODE(RECEIPT_YN, '0', '미납', '수납') AS RECEIPT_RESULT
         FROM
@@ -284,7 +286,7 @@
   	        CASE 
   	        WHEN RS.MOTION_ID IS NOT NULL
 			THEN FUN_GET_PENALTY_AMT_RENT_REAL(P.PENALTY_MANAGE_YEAR,P.PENALTY_SEQNO,TO_CHAR(SYSDATE,'YYYYMMDD'),'') 
-			ELSE FUN_GET_PENALTY_AMT_REAL(P.PENALTY_MANAGE_YEAR,P.PENALTY_SEQNO,TO_CHAR(SYSDATE,'YYYYMMDD'),'') 
+			ELSE FUN_GET_PENALTY_AMT_REAL     (P.PENALTY_MANAGE_YEAR,P.PENALTY_SEQNO,TO_CHAR(SYSDATE,'YYYYMMDD'),'') 
 			END
 			) LEVY_AMOUNT
 	     , (CASE 

src/main/java/cfs/trsmrcv/web/CommSisulController.java

@@ -69,14 +69,24 @@ public class CommSisulController {
 				int deliveryDate = Integer.parseInt(item.get("DELIVERY_DATE").toString());
 				if(deliveryDate < nowYMD){
 					if(item.get("MOTION_ID").toString().startsWith("3")){
+						
 						int levyAmount = Integer.parseInt(item.get("LEVY_AMOUNT").toString());
 						int passAmount = Integer.parseInt(item.get("PASS_AMOUNT").toString());
 						int fineAmount = Integer.parseInt(item.get("FINE_AMOUNT").toString());
 						
+						int passDate = Integer.parseInt(item.get("PASS_DATE").toString());
+						
 						if(levyAmount == (passAmount+fineAmount)){
-							int add = (int)(levyAmount * 0.03);
-							levyAmount = levyAmount + add;
-							item.put("LEVY_AMOUNT", levyAmount);
+							if(passDate >= 20140109){
+								int add = 0;
+								if(passDate >= 20170603){
+									add = (int)(levyAmount * 0.03);
+								} else {
+									add = (int)(levyAmount * 0.05);
+								}
+								levyAmount = levyAmount + add;
+								item.put("LEVY_AMOUNT", levyAmount);
+							}
 						}
 					}
 				}