From dcdf9dd37d3d42ab4b1376e963197fde165c6b6d Mon Sep 17 00:00:00 2001
From: ham sangki <sangkiham@naver.com>
Date: Thu, 18 Apr 2024 14:26:29 +0900
Subject: [PATCH] .

---
 src/main/resources/application.properties                              | 14 +++++++-------
 src/main/resources/mybatis/primaryMapper/MatchingInnerDelingMapper.xml |  7 ++++++-
 src/main/resources/mybatis/secondaryMapper/OracleMapper.xml            | 30 +++++++++++++++++++++---------
 3 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 66666e4..373b089 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -18,14 +18,14 @@ spring.datasource.hikari.primary.username=account
 spring.datasource.hikari.primary.password=daeucna10!
 
 # secondary
-#spring.datasource.hikari.secondary.driver-class-name=oracle.jdbc.driver.OracleDriver
-#spring.datasource.hikari.secondary.jdbc-url=jdbc:oracle:thin:@vanguardlab.kr:63522/CONFINAS19C
-#spring.datasource.hikari.secondary.username=ai
-#spring.datasource.hikari.secondary.password=ai
 spring.datasource.hikari.secondary.driver-class-name=oracle.jdbc.driver.OracleDriver
-spring.datasource.hikari.secondary.jdbc-url=jdbc:oracle:thin:@daeuserver2.iptime.org:1521/orcl
-spring.datasource.hikari.secondary.username=CONFINAS3
-spring.datasource.hikari.secondary.password=CONFINAS3
+spring.datasource.hikari.secondary.jdbc-url=jdbc:oracle:thin:@vanguardlab.kr:63522/CONFINAS19C
+spring.datasource.hikari.secondary.username=ai
+spring.datasource.hikari.secondary.password=ai
+#spring.datasource.hikari.secondary.driver-class-name=oracle.jdbc.driver.OracleDriver
+#spring.datasource.hikari.secondary.jdbc-url=jdbc:oracle:thin:@daeuserver2.iptime.org:1521/orcl
+#spring.datasource.hikari.secondary.username=CONFINAS3
+#spring.datasource.hikari.secondary.password=CONFINAS3
 
 
 
diff --git a/src/main/resources/mybatis/primaryMapper/MatchingInnerDelingMapper.xml b/src/main/resources/mybatis/primaryMapper/MatchingInnerDelingMapper.xml
index 9e3fbb0..285ae0c 100644
--- a/src/main/resources/mybatis/primaryMapper/MatchingInnerDelingMapper.xml
+++ b/src/main/resources/mybatis/primaryMapper/MatchingInnerDelingMapper.xml
@@ -413,7 +413,12 @@
 					org_mtch_ky,
 					mtch_ty as new_mtch_ty,
 					mtch_ky,
-					DENSE_RANK() over (order by mtch_ty, mtch_ky) AS new_mtch_ky
+					DENSE_RANK() over (order by 
+						mtch_ty
+						, mtch_ky
+						, case when dta_ty in ('11','21','31','33','35','37','41') then cpr_code else partn_cpr end
+						, case when dta_ty in ('11','21','31','33','35','37','41') then partn_cpr else cpr_code end
+					) AS new_mtch_ky
 				from batch_tbcr_inner_delng
 				where
 					sys_se = #{sysSe}
diff --git a/src/main/resources/mybatis/secondaryMapper/OracleMapper.xml b/src/main/resources/mybatis/secondaryMapper/OracleMapper.xml
index ee64c65..905d203 100644
--- a/src/main/resources/mybatis/secondaryMapper/OracleMapper.xml
+++ b/src/main/resources/mybatis/secondaryMapper/OracleMapper.xml
@@ -7,10 +7,19 @@
 		WITH COMP_INFO AS (
 			SELECT DISTINCT
 			    COMP_CODE AS COMP_CODE
-			    , COMP_KR_NAME AS COMP_NAME
+			    , (
+			    	SELECT 
+			    		COMP_NAME_0 
+			    	FROM TBBC_COMPANY_CODE_NLS 
+			    	WHERE 
+			    		SESSION_ID = A.SESSION_ID 
+			    		AND COMP_CODE = A.COMP_CODE
+			    		AND #{accnutYm} BETWEEN START_YYMM AND END_YYMM
+			    		AND ROWNUM = 1
+			      ) AS COMP_NAME
 			    , BOOK_CURRENCY AS COMP_CURRENCY
 			    , COMP_COA AS COMP_COA
-			FROM TBBC_COMPANY_CODE
+			FROM TBBC_COMPANY_CODE A
 			WHERE
 			    #{accnutYm} BETWEEN START_YYMM AND END_YYMM		
 		)		
@@ -28,7 +37,7 @@
 		    A.COMP_ACCT_CODE,
 		    (
 				SELECT DISTINCT
-				    COMP_ACCT_NAME
+				    COMP_ACCT_CODE
 				FROM TBBC_COMP_ACCT_CODE
 				WHERE
 				    FS_TYPE = '1'
@@ -36,7 +45,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,
@@ -50,13 +59,13 @@
 		    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 = 'GOV_I_COA'
+	                AND CONS_COA = 'LS_COA'
 	                AND FS_TYPE = '1'
-	                AND TO_CHAR(SYSDATE, 'YYYYMM') BETWEEN START_YYMM AND END_YYMM
+	                AND #{accnutYm} BETWEEN START_YYMM AND END_YYMM
 	                AND ROWNUM = 1                
             ) AS CONS_ACCT_NAME,
 		    A.PROD_CODE,
@@ -96,7 +105,10 @@
 		FROM TBCR_MATCHING A,
 		    TBCR_MATCHING_DETAIL B
 		WHERE
-		    A.MATCH_KEY = B.MATCH_KEY
+		    A.SESSION_ID = B.SESSION_ID
+		    AND A.CONS_GROUP = B.CONS_GROUP
+		    AND A.LEDGER = B.LEDGER
+		    AND A.MATCH_KEY = B.MATCH_KEY
 		    AND A.ACCOUNT_PERIOD = B.ACCOUNT_PERIOD
 			AND A.CONS_GROUP = #{sysSe}
 			AND A.ACCOUNT_PERIOD = #{accnutYm}
--
libgit2 0.21.4