From 76e09ec5f843a93b0f3a528ddb097ea9797951e0 Mon Sep 17 00:00:00 2001
From: ham sangki <sangkiham@naver.com>
Date: Thu, 18 Apr 2024 13:32:18 +0900
Subject: [PATCH] 2024.04.18 수정분

---
 src/main/resources/application.properties                              |  2 +-
 src/main/resources/mybatis/primaryMapper/MatchingInnerDelingMapper.xml |  6 ++++++
 src/main/resources/mybatis/secondaryMapper/OracleMapper.HN             | 10 +++++-----
 src/main/resources/mybatis/secondaryMapper/OracleMapper.LS             | 17 ++++++++---------
 src/main/resources/mybatis/secondaryMapper/OracleMapper.xml            | 10 +++++-----
 5 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 2f8bce0..66666e4 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -46,7 +46,7 @@ decorator.datasource.p6spy.enable-logging=true
 
 logging.level.root=info 
 logging.level.com.batch=info
-logging.level.p6spy=debug
+logging.level.p6spy=off
 
 #Thread Count 설정
 thread.comm.count=10
diff --git a/src/main/resources/mybatis/primaryMapper/MatchingInnerDelingMapper.xml b/src/main/resources/mybatis/primaryMapper/MatchingInnerDelingMapper.xml
index 12260cd..9e3fbb0 100644
--- a/src/main/resources/mybatis/primaryMapper/MatchingInnerDelingMapper.xml
+++ b/src/main/resources/mybatis/primaryMapper/MatchingInnerDelingMapper.xml
@@ -267,8 +267,11 @@
 		            , sn
 		            , dta_ty
 		            , cpr_code
+		            , cpr_nm
 		            , partn_cpr
+		            , partn_cpr_nm
 		            , cpr_acnt_code
+		            , cpr_acnt_nm
 		            , cnnc_acnt_code
 		            , cnnc_acnt_nm
 		            , delng_de
@@ -301,8 +304,11 @@
 		    , seq
 		    , tran_type
 		    , own_comp
+		    , own_comp_name
 		    , tran_comp
+		    , tran_comp_name
 		    , comp_acct_code
+		    , comp_acct_name
 		    , cons_acct_code
 		    , cons_acct_name
 		    , tran_date
diff --git a/src/main/resources/mybatis/secondaryMapper/OracleMapper.HN b/src/main/resources/mybatis/secondaryMapper/OracleMapper.HN
index 00f7f5d..ee64c65 100644
--- a/src/main/resources/mybatis/secondaryMapper/OracleMapper.HN
+++ b/src/main/resources/mybatis/secondaryMapper/OracleMapper.HN
@@ -4,7 +4,7 @@
 	
 	<!-- 작업리스트 -->
 	<select id="getOriginalData" parameterType="map" resultType="map">
-		WITH COMP_INFO IS (
+		WITH COMP_INFO AS (
 			SELECT DISTINCT
 			    COMP_CODE AS COMP_CODE
 			    , COMP_KR_NAME AS COMP_NAME
@@ -22,9 +22,9 @@
 		    A.SEQ,
 		    A.TRAN_TYPE,
 		    A.OWN_COMP,
-		    B.COMP_NAME AS OWN_COMP_NAME
+		    B.COMP_NAME AS OWN_COMP_NAME,
 		    A.TRAN_COMP,
-		    C.COMP_NAME AS TRAN_COMP_NAME
+		    C.COMP_NAME AS TRAN_COMP_NAME,
 		    A.COMP_ACCT_CODE,
 		    (
 				SELECT DISTINCT
@@ -36,7 +36,7 @@
 				    AND COMP_ACCT_CODE = A.COMP_ACCT_CODE
 				    AND #{accnutYm} BETWEEN START_YYMM AND END_YYMM		  
 	                AND ROWNUM = 1                
-		    ) AS COMP_ACCT_NAME
+		    ) AS COMP_ACCT_NAME,
 		    A.COMP_PROD_CODE,
 		    A.RECON_KEY,
 		    A.TRAN_DATE,
@@ -76,7 +76,7 @@
 		    A.PARTNER_BIZ_NO,
 		    A.ACCT_DATE
 		FROM
-		    TBCR_TRANSACTION_HISTORY A,
+		    TBCR_TRANSACTION_HISTORY A
 		    INNER JOIN COMP_INFO B
 		    ON 
 		    	B.COMP_CODE = A.OWN_COMP
diff --git a/src/main/resources/mybatis/secondaryMapper/OracleMapper.LS b/src/main/resources/mybatis/secondaryMapper/OracleMapper.LS
index 559f60f..905d203 100644
--- a/src/main/resources/mybatis/secondaryMapper/OracleMapper.LS
+++ b/src/main/resources/mybatis/secondaryMapper/OracleMapper.LS
@@ -4,7 +4,7 @@
 	
 	<!-- 작업리스트 -->
 	<select id="getOriginalData" parameterType="map" resultType="map">
-		WITH COMP_INFO IS (
+		WITH COMP_INFO AS (
 			SELECT DISTINCT
 			    COMP_CODE AS COMP_CODE
 			    , (
@@ -19,7 +19,6 @@
 			      ) AS COMP_NAME
 			    , BOOK_CURRENCY AS COMP_CURRENCY
 			    , COMP_COA AS COMP_COA
-			    , CONS_COA AS CONS_COA
 			FROM TBBC_COMPANY_CODE A
 			WHERE
 			    #{accnutYm} BETWEEN START_YYMM AND END_YYMM		
@@ -32,21 +31,21 @@
 		    A.SEQ,
 		    A.TRAN_TYPE,
 		    A.OWN_COMP,
-		    B.COMP_NAME AS OWN_COMP_NAME
+		    B.COMP_NAME AS OWN_COMP_NAME,
 		    A.TRAN_COMP,
-		    C.COMP_NAME AS TRAN_COMP_NAME
+		    C.COMP_NAME AS TRAN_COMP_NAME,
 		    A.COMP_ACCT_CODE,
 		    (
 				SELECT DISTINCT
 				    COMP_ACCT_CODE
-				FROM COMP_ACCT_CODE
+				FROM TBBC_COMP_ACCT_CODE
 				WHERE
 				    FS_TYPE = '1'
 				    AND COMP_COA = B.COMP_COA
 				    AND COMP_ACCT_CODE = A.COMP_ACCT_CODE
 				    AND #{accnutYm} BETWEEN START_YYMM AND END_YYMM		  
 	                AND ROWNUM = 1                
-		    ) AS COMP_ACCT_NAME		    
+		    ) AS COMP_ACCT_NAME,		    
 		    A.COMP_PROD_CODE,
 		    A.RECON_KEY,
 		    A.TRAN_DATE,
@@ -60,8 +59,8 @@
 		    A.CONS_ACCT_CODE,
             (
 	           	SELECT
-	           		CONS_ACCT_KR_NAME
-	           	FROM TBBC_ACCT_CODE
+	           		CONS_ACCT_NAME_0
+	           	FROM TBBC_ACCT_CODE_NLS
 	           	WHERE
 	           		CONS_ACCT_CODE = A.CONS_ACCT_CODE
 	                AND CONS_COA = 'LS_COA'
@@ -86,7 +85,7 @@
 		    A.PARTNER_BIZ_NO,
 		    A.ACCT_DATE
 		FROM
-		    TBCR_TRANSACTION_HISTORY A,
+		    TBCR_TRANSACTION_HISTORY A
 		    INNER JOIN COMP_INFO B
 		    ON 
 		    	B.COMP_CODE = A.OWN_COMP
diff --git a/src/main/resources/mybatis/secondaryMapper/OracleMapper.xml b/src/main/resources/mybatis/secondaryMapper/OracleMapper.xml
index 00f7f5d..ee64c65 100644
--- a/src/main/resources/mybatis/secondaryMapper/OracleMapper.xml
+++ b/src/main/resources/mybatis/secondaryMapper/OracleMapper.xml
@@ -4,7 +4,7 @@
 	
 	<!-- 작업리스트 -->
 	<select id="getOriginalData" parameterType="map" resultType="map">
-		WITH COMP_INFO IS (
+		WITH COMP_INFO AS (
 			SELECT DISTINCT
 			    COMP_CODE AS COMP_CODE
 			    , COMP_KR_NAME AS COMP_NAME
@@ -22,9 +22,9 @@
 		    A.SEQ,
 		    A.TRAN_TYPE,
 		    A.OWN_COMP,
-		    B.COMP_NAME AS OWN_COMP_NAME
+		    B.COMP_NAME AS OWN_COMP_NAME,
 		    A.TRAN_COMP,
-		    C.COMP_NAME AS TRAN_COMP_NAME
+		    C.COMP_NAME AS TRAN_COMP_NAME,
 		    A.COMP_ACCT_CODE,
 		    (
 				SELECT DISTINCT
@@ -36,7 +36,7 @@
 				    AND COMP_ACCT_CODE = A.COMP_ACCT_CODE
 				    AND #{accnutYm} BETWEEN START_YYMM AND END_YYMM		  
 	                AND ROWNUM = 1                
-		    ) AS COMP_ACCT_NAME
+		    ) AS COMP_ACCT_NAME,
 		    A.COMP_PROD_CODE,
 		    A.RECON_KEY,
 		    A.TRAN_DATE,
@@ -76,7 +76,7 @@
 		    A.PARTNER_BIZ_NO,
 		    A.ACCT_DATE
 		FROM
-		    TBCR_TRANSACTION_HISTORY A,
+		    TBCR_TRANSACTION_HISTORY A
 		    INNER JOIN COMP_INFO B
 		    ON 
 		    	B.COMP_CODE = A.OWN_COMP
--
libgit2 0.21.4