From 980c56862451db5d965a2b264277cc116a71fda5 Mon Sep 17 00:00:00 2001
From: ham sangki <sangkiham@naver.com>
Date: Fri, 26 Apr 2024 15:34:46 +0900
Subject: [PATCH] 2024.04.26

---
 src/main/java/com/batch/service/JobService.java             |  2 +-
 src/main/resources/application.properties                   | 14 +++++++-------
 src/main/resources/mybatis/secondaryMapper/OracleMapper.xml | 34 +++++++++++-----------------------
 3 files changed, 19 insertions(+), 31 deletions(-)

diff --git a/src/main/java/com/batch/service/JobService.java b/src/main/java/com/batch/service/JobService.java
index c6af035..72f0cbf 100644
--- a/src/main/java/com/batch/service/JobService.java
+++ b/src/main/java/com/batch/service/JobService.java
@@ -513,7 +513,7 @@ public class JobService {
     	ArrayList<String> lcmd = new ArrayList<String>();
     	lcmd.add(sPrgName);
     	lcmd.addAll(lParams);
-    	lcmd.add(jobGroupId);
+    	lcmd.add(sDate);
     	
     	new ProcessExecutor()
 	    	.command(lcmd)
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index d2f4594..21d5a99 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/secondaryMapper/OracleMapper.xml b/src/main/resources/mybatis/secondaryMapper/OracleMapper.xml
index 9cf4580..07aacd4 100644
--- a/src/main/resources/mybatis/secondaryMapper/OracleMapper.xml
+++ b/src/main/resources/mybatis/secondaryMapper/OracleMapper.xml
@@ -7,19 +7,10 @@
 		WITH COMP_INFO AS (
 			SELECT DISTINCT
 			    COMP_CODE AS COMP_CODE
-			    , (
-			    	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
+			    , COMP_KR_NAME AS COMP_NAME
 			    , BOOK_CURRENCY AS COMP_CURRENCY
 			    , COMP_COA AS COMP_COA
-			FROM TBBC_COMPANY_CODE A
+			FROM TBBC_COMPANY_CODE
 			WHERE
 			    #{accnutYm} BETWEEN START_YYMM AND END_YYMM		
 		)		
@@ -37,7 +28,7 @@
 		    A.COMP_ACCT_CODE,
 		    (
 				SELECT DISTINCT
-				    COMP_ACCT_CODE
+				    COMP_ACCT_NAME
 				FROM TBBC_COMP_ACCT_CODE
 				WHERE
 				    FS_TYPE = '1'
@@ -45,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,
@@ -59,13 +50,13 @@
 		    A.CONS_ACCT_CODE,
             (
 	           	SELECT
-	           		CONS_ACCT_NAME_0
-	           	FROM TBBC_ACCT_CODE_NLS
+	           		CONS_ACCT_KR_NAME
+	           	FROM TBBC_ACCT_CODE
 	           	WHERE
 	           		CONS_ACCT_CODE = A.CONS_ACCT_CODE
-	                AND CONS_COA = 'LS_COA'
+	                AND CONS_COA = 'GOV_I_COA'
 	                AND FS_TYPE = '1'
-	                AND #{accnutYm} BETWEEN START_YYMM AND END_YYMM
+	                AND TO_CHAR(SYSDATE, 'YYYYMM') BETWEEN START_YYMM AND END_YYMM
 	                AND ROWNUM = 1                
             ) AS CONS_ACCT_NAME,
 		    A.PROD_CODE,
@@ -84,8 +75,8 @@
 		    A.OWN_BIZ_NO,
 		    A.PARTNER_BIZ_NO,
 		    A.ACCT_DATE,
-		    A.CREATION_DIV_CODE,
-		    A.COST_MAT_KEY
+		    NULL AS CREATION_DIV_CODE,
+		    NULL AS COST_MAT_KEY
 		FROM
 		    TBCR_TRANSACTION_HISTORY A
 		    INNER JOIN COMP_INFO B
@@ -107,10 +98,7 @@
 		FROM TBCR_MATCHING A,
 		    TBCR_MATCHING_DETAIL B
 		WHERE
-		    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
+		    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