grp_ai / matching_ai

Commit 980c56862451db5d965a2b264277cc116a71fda5

Authored by 함상기
1 parent 82994579

2024.04.26

Showing 3 changed files with 19 additions and 31 deletions   Show diff stats
Inline Side-by-side
src/main/java/com/batch/service/JobService.java
  Show/Hide comments   View file @980c568
@@ -513,7 +513,7 @@ public class JobService { @@ -513,7 +513,7 @@ public class JobService {
513 ArrayList<String> lcmd = new ArrayList<String>(); 513 ArrayList<String> lcmd = new ArrayList<String>();
514 lcmd.add(sPrgName); 514 lcmd.add(sPrgName);
515 lcmd.addAll(lParams); 515 lcmd.addAll(lParams);
516 - lcmd.add(jobGroupId); 516 + lcmd.add(sDate);
517 517
518 new ProcessExecutor() 518 new ProcessExecutor()
519 .command(lcmd) 519 .command(lcmd)
src/main/resources/application.properties
  Show/Hide comments   View file @980c568
@@ -18,14 +18,14 @@ spring.datasource.hikari.primary.username=account @@ -18,14 +18,14 @@ spring.datasource.hikari.primary.username=account
18 spring.datasource.hikari.primary.password=daeucna10! 18 spring.datasource.hikari.primary.password=daeucna10!
19 19
20 # secondary 20 # secondary
21 -spring.datasource.hikari.secondary.driver-class-name=oracle.jdbc.driver.OracleDriver  
22 -spring.datasource.hikari.secondary.jdbc-url=jdbc:oracle:thin:@vanguardlab.kr:63522/CONFINAS19C  
23 -spring.datasource.hikari.secondary.username=ai  
24 -spring.datasource.hikari.secondary.password=ai  
25 #spring.datasource.hikari.secondary.driver-class-name=oracle.jdbc.driver.OracleDriver 21 #spring.datasource.hikari.secondary.driver-class-name=oracle.jdbc.driver.OracleDriver
26 -#spring.datasource.hikari.secondary.jdbc-url=jdbc:oracle:thin:@daeuserver2.iptime.org:1521/orcl  
27 -#spring.datasource.hikari.secondary.username=CONFINAS3  
28 -#spring.datasource.hikari.secondary.password=CONFINAS3 22 +#spring.datasource.hikari.secondary.jdbc-url=jdbc:oracle:thin:@vanguardlab.kr:63522/CONFINAS19C
  23 +#spring.datasource.hikari.secondary.username=ai
  24 +#spring.datasource.hikari.secondary.password=ai
  25 +spring.datasource.hikari.secondary.driver-class-name=oracle.jdbc.driver.OracleDriver
  26 +spring.datasource.hikari.secondary.jdbc-url=jdbc:oracle:thin:@daeuserver2.iptime.org:1521/orcl
  27 +spring.datasource.hikari.secondary.username=CONFINAS3
  28 +spring.datasource.hikari.secondary.password=CONFINAS3
29 29
30 30
31 31
src/main/resources/mybatis/secondaryMapper/OracleMapper.xml
  Show/Hide comments   View file @980c568
@@ -7,19 +7,10 @@ @@ -7,19 +7,10 @@
7 WITH COMP_INFO AS ( 7 WITH COMP_INFO AS (
8 SELECT DISTINCT 8 SELECT DISTINCT
9 COMP_CODE AS COMP_CODE 9 COMP_CODE AS COMP_CODE
10 - , (  
11 - SELECT  
12 - COMP_NAME_0  
13 - FROM TBBC_COMPANY_CODE_NLS  
14 - WHERE  
15 - SESSION_ID = A.SESSION_ID  
16 - AND COMP_CODE = A.COMP_CODE  
17 - AND #{accnutYm} BETWEEN START_YYMM AND END_YYMM  
18 - AND ROWNUM = 1  
19 - ) AS COMP_NAME 10 + , COMP_KR_NAME AS COMP_NAME
20 , BOOK_CURRENCY AS COMP_CURRENCY 11 , BOOK_CURRENCY AS COMP_CURRENCY
21 , COMP_COA AS COMP_COA 12 , COMP_COA AS COMP_COA
22 - FROM TBBC_COMPANY_CODE A 13 + FROM TBBC_COMPANY_CODE
23 WHERE 14 WHERE
24 #{accnutYm} BETWEEN START_YYMM AND END_YYMM 15 #{accnutYm} BETWEEN START_YYMM AND END_YYMM
25 ) 16 )
@@ -37,7 +28,7 @@ @@ -37,7 +28,7 @@
37 A.COMP_ACCT_CODE, 28 A.COMP_ACCT_CODE,
38 ( 29 (
39 SELECT DISTINCT 30 SELECT DISTINCT
40 - COMP_ACCT_CODE 31 + COMP_ACCT_NAME
41 FROM TBBC_COMP_ACCT_CODE 32 FROM TBBC_COMP_ACCT_CODE
42 WHERE 33 WHERE
43 FS_TYPE = '1' 34 FS_TYPE = '1'
@@ -45,7 +36,7 @@ @@ -45,7 +36,7 @@
45 AND COMP_ACCT_CODE = A.COMP_ACCT_CODE 36 AND COMP_ACCT_CODE = A.COMP_ACCT_CODE
46 AND #{accnutYm} BETWEEN START_YYMM AND END_YYMM 37 AND #{accnutYm} BETWEEN START_YYMM AND END_YYMM
47 AND ROWNUM = 1 38 AND ROWNUM = 1
48 - ) AS COMP_ACCT_NAME, 39 + ) AS COMP_ACCT_NAME,
49 A.COMP_PROD_CODE, 40 A.COMP_PROD_CODE,
50 A.RECON_KEY, 41 A.RECON_KEY,
51 A.TRAN_DATE, 42 A.TRAN_DATE,
@@ -59,13 +50,13 @@ @@ -59,13 +50,13 @@
59 A.CONS_ACCT_CODE, 50 A.CONS_ACCT_CODE,
60 ( 51 (
61 SELECT 52 SELECT
62 - CONS_ACCT_NAME_0  
63 - FROM TBBC_ACCT_CODE_NLS 53 + CONS_ACCT_KR_NAME
  54 + FROM TBBC_ACCT_CODE
64 WHERE 55 WHERE
65 CONS_ACCT_CODE = A.CONS_ACCT_CODE 56 CONS_ACCT_CODE = A.CONS_ACCT_CODE
66 - AND CONS_COA = 'LS_COA' 57 + AND CONS_COA = 'GOV_I_COA'
67 AND FS_TYPE = '1' 58 AND FS_TYPE = '1'
68 - AND #{accnutYm} BETWEEN START_YYMM AND END_YYMM 59 + AND TO_CHAR(SYSDATE, 'YYYYMM') BETWEEN START_YYMM AND END_YYMM
69 AND ROWNUM = 1 60 AND ROWNUM = 1
70 ) AS CONS_ACCT_NAME, 61 ) AS CONS_ACCT_NAME,
71 A.PROD_CODE, 62 A.PROD_CODE,
@@ -84,8 +75,8 @@ @@ -84,8 +75,8 @@
84 A.OWN_BIZ_NO, 75 A.OWN_BIZ_NO,
85 A.PARTNER_BIZ_NO, 76 A.PARTNER_BIZ_NO,
86 A.ACCT_DATE, 77 A.ACCT_DATE,
87 - A.CREATION_DIV_CODE,  
88 - A.COST_MAT_KEY 78 + NULL AS CREATION_DIV_CODE,
  79 + NULL AS COST_MAT_KEY
89 FROM 80 FROM
90 TBCR_TRANSACTION_HISTORY A 81 TBCR_TRANSACTION_HISTORY A
91 INNER JOIN COMP_INFO B 82 INNER JOIN COMP_INFO B
@@ -107,10 +98,7 @@ @@ -107,10 +98,7 @@
107 FROM TBCR_MATCHING A, 98 FROM TBCR_MATCHING A,
108 TBCR_MATCHING_DETAIL B 99 TBCR_MATCHING_DETAIL B
109 WHERE 100 WHERE
110 - A.SESSION_ID = B.SESSION_ID  
111 - AND A.CONS_GROUP = B.CONS_GROUP  
112 - AND A.LEDGER = B.LEDGER  
113 - AND A.MATCH_KEY = B.MATCH_KEY 101 + A.MATCH_KEY = B.MATCH_KEY
114 AND A.ACCOUNT_PERIOD = B.ACCOUNT_PERIOD 102 AND A.ACCOUNT_PERIOD = B.ACCOUNT_PERIOD
115 AND A.CONS_GROUP = #{sysSe} 103 AND A.CONS_GROUP = #{sysSe}
116 AND A.ACCOUNT_PERIOD = #{accnutYm} 104 AND A.ACCOUNT_PERIOD = #{accnutYm}