grp_ai / matching_ai

Commit dcdf9dd37d3d42ab4b1376e963197fde165c6b6d

Authored by 함상기
1 parent 76e09ec5

.

Showing 3 changed files with 34 additions and 17 deletions   Show diff stats
Inline Side-by-side
src/main/resources/application.properties
  Show/Hide comments   View file @dcdf9dd
... ... @@ -18,14 +18,14 @@ spring.datasource.hikari.primary.username=account
18 18 spring.datasource.hikari.primary.password=daeucna10!
19 19  
20 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 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/primaryMapper/MatchingInnerDelingMapper.xml
  Show/Hide comments   View file @dcdf9dd
... ... @@ -413,7 +413,12 @@
413 413 org_mtch_ky,
414 414 mtch_ty as new_mtch_ty,
415 415 mtch_ky,
416   - DENSE_RANK() over (order by mtch_ty, mtch_ky) AS new_mtch_ky
  416 + DENSE_RANK() over (order by
  417 + mtch_ty
  418 + , mtch_ky
  419 + , case when dta_ty in ('11','21','31','33','35','37','41') then cpr_code else partn_cpr end
  420 + , case when dta_ty in ('11','21','31','33','35','37','41') then partn_cpr else cpr_code end
  421 + ) AS new_mtch_ky
417 422 from batch_tbcr_inner_delng
418 423 where
419 424 sys_se = #{sysSe}
... ...
src/main/resources/mybatis/secondaryMapper/OracleMapper.xml
  Show/Hide comments   View file @dcdf9dd
... ... @@ -7,10 +7,19 @@
7 7 WITH COMP_INFO AS (
8 8 SELECT DISTINCT
9 9 COMP_CODE AS COMP_CODE
10   - , COMP_KR_NAME AS COMP_NAME
  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
11 20 , BOOK_CURRENCY AS COMP_CURRENCY
12 21 , COMP_COA AS COMP_COA
13   - FROM TBBC_COMPANY_CODE
  22 + FROM TBBC_COMPANY_CODE A
14 23 WHERE
15 24 #{accnutYm} BETWEEN START_YYMM AND END_YYMM
16 25 )
... ... @@ -28,7 +37,7 @@
28 37 A.COMP_ACCT_CODE,
29 38 (
30 39 SELECT DISTINCT
31   - COMP_ACCT_NAME
  40 + COMP_ACCT_CODE
32 41 FROM TBBC_COMP_ACCT_CODE
33 42 WHERE
34 43 FS_TYPE = '1'
... ... @@ -36,7 +45,7 @@
36 45 AND COMP_ACCT_CODE = A.COMP_ACCT_CODE
37 46 AND #{accnutYm} BETWEEN START_YYMM AND END_YYMM
38 47 AND ROWNUM = 1
39   - ) AS COMP_ACCT_NAME,
  48 + ) AS COMP_ACCT_NAME,
40 49 A.COMP_PROD_CODE,
41 50 A.RECON_KEY,
42 51 A.TRAN_DATE,
... ... @@ -50,13 +59,13 @@
50 59 A.CONS_ACCT_CODE,
51 60 (
52 61 SELECT
53   - CONS_ACCT_KR_NAME
54   - FROM TBBC_ACCT_CODE
  62 + CONS_ACCT_NAME_0
  63 + FROM TBBC_ACCT_CODE_NLS
55 64 WHERE
56 65 CONS_ACCT_CODE = A.CONS_ACCT_CODE
57   - AND CONS_COA = 'GOV_I_COA'
  66 + AND CONS_COA = 'LS_COA'
58 67 AND FS_TYPE = '1'
59   - AND TO_CHAR(SYSDATE, 'YYYYMM') BETWEEN START_YYMM AND END_YYMM
  68 + AND #{accnutYm} BETWEEN START_YYMM AND END_YYMM
60 69 AND ROWNUM = 1
61 70 ) AS CONS_ACCT_NAME,
62 71 A.PROD_CODE,
... ... @@ -96,7 +105,10 @@
96 105 FROM TBCR_MATCHING A,
97 106 TBCR_MATCHING_DETAIL B
98 107 WHERE
99   - A.MATCH_KEY = B.MATCH_KEY
  108 + A.SESSION_ID = B.SESSION_ID
  109 + AND A.CONS_GROUP = B.CONS_GROUP
  110 + AND A.LEDGER = B.LEDGER
  111 + AND A.MATCH_KEY = B.MATCH_KEY
100 112 AND A.ACCOUNT_PERIOD = B.ACCOUNT_PERIOD
101 113 AND A.CONS_GROUP = #{sysSe}
102 114 AND A.ACCOUNT_PERIOD = #{accnutYm}
... ...