From a99930a864e95a23f3aeb4b4815742800d34c36f Mon Sep 17 00:00:00 2001
From: ham sangki <sangkiham@naver.com>
Date: Thu, 18 Apr 2024 12:44:56 +0900
Subject: [PATCH] 2024.04.18

---
 src/main/resources/mybatis/primaryMapper/MatchingInnerDelingMapper.xml |  6 ++++++
 src/main/resources/mybatis/secondaryMapper/OracleMapper.HN             | 49 +++++++++++++++++++++++++++++++++++++++----------
 src/main/resources/mybatis/secondaryMapper/OracleMapper.LS             | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
 src/main/resources/mybatis/secondaryMapper/OracleMapper.xml            | 49 +++++++++++++++++++++++++++++++++++++++----------
 src/main/resources/schema.sql                                          | 23 +++++++++++++++++++++++
 5 files changed, 158 insertions(+), 28 deletions(-)

diff --git a/src/main/resources/mybatis/primaryMapper/MatchingInnerDelingMapper.xml b/src/main/resources/mybatis/primaryMapper/MatchingInnerDelingMapper.xml
index f746967..12260cd 100644
--- a/src/main/resources/mybatis/primaryMapper/MatchingInnerDelingMapper.xml
+++ b/src/main/resources/mybatis/primaryMapper/MatchingInnerDelingMapper.xml
@@ -167,8 +167,11 @@
 		    seq,
 		    tran_type,
 		    own_comp,
+		    own_comp_name,
 		    tran_comp,
+		    tran_comp_name,
 		    comp_acct_code,
+		    comp_acct_name,
 		    comp_prod_code,
 		    recon_key,
 		    tran_date,
@@ -209,8 +212,11 @@
 		    #{item.SEQ},
 		    #{item.TRAN_TYPE},
 		    #{item.OWN_COMP},
+		    #{item.OWN_COMP_NAME},
 		    #{item.TRAN_COMP},
+		    #{item.TRAN_COMP_NAME},
 		    #{item.COMP_ACCT_CODE},
+		    #{item.COMP_ACCT_NAME},
 		    #{item.COMP_PROD_CODE},
 		    #{item.RECON_KEY},
 		    #{item.TRAN_DATE},
diff --git a/src/main/resources/mybatis/secondaryMapper/OracleMapper.HN b/src/main/resources/mybatis/secondaryMapper/OracleMapper.HN
index 3b7bc58..00f7f5d 100644
--- a/src/main/resources/mybatis/secondaryMapper/OracleMapper.HN
+++ b/src/main/resources/mybatis/secondaryMapper/OracleMapper.HN
@@ -4,6 +4,16 @@
 	
 	<!-- 작업리스트 -->
 	<select id="getOriginalData" parameterType="map" resultType="map">
+		WITH COMP_INFO IS (
+			SELECT DISTINCT
+			    COMP_CODE AS COMP_CODE
+			    , COMP_KR_NAME AS COMP_NAME
+			    , BOOK_CURRENCY AS COMP_CURRENCY
+			    , COMP_COA AS COMP_COA
+			FROM TBBC_COMPANY_CODE
+			WHERE
+			    #{accnutYm} BETWEEN START_YYMM AND END_YYMM		
+		)		
 		SELECT
 		    A.SESSION_ID,
 		    A.CONS_GROUP,
@@ -12,8 +22,21 @@
 		    A.SEQ,
 		    A.TRAN_TYPE,
 		    A.OWN_COMP,
+		    B.COMP_NAME AS OWN_COMP_NAME
 		    A.TRAN_COMP,
+		    C.COMP_NAME AS TRAN_COMP_NAME
 		    A.COMP_ACCT_CODE,
+		    (
+				SELECT DISTINCT
+				    COMP_ACCT_NAME
+				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
 		    A.COMP_PROD_CODE,
 		    A.RECON_KEY,
 		    A.TRAN_DATE,
@@ -26,15 +49,15 @@
 		    A.REMARK,
 		    A.CONS_ACCT_CODE,
             (
-           	SELECT
-           		CONS_ACCT_KR_NAME
-           	FROM TBBC_ACCT_CODE
-           	WHERE
-           		CONS_ACCT_CODE = A.CONS_ACCT_CODE
-                AND CONS_COA = 'GOV_I_COA'
-                AND FS_TYPE = '1'
-                AND TO_CHAR(SYSDATE, 'YYYYMM') BETWEEN START_YYMM AND END_YYMM
-                AND ROWNUM = 1                
+	           	SELECT
+	           		CONS_ACCT_KR_NAME
+	           	FROM TBBC_ACCT_CODE
+	           	WHERE
+	           		CONS_ACCT_CODE = A.CONS_ACCT_CODE
+	                AND CONS_COA = 'GOV_I_COA'
+	                AND FS_TYPE = '1'
+	                AND TO_CHAR(SYSDATE, 'YYYYMM') BETWEEN START_YYMM AND END_YYMM
+	                AND ROWNUM = 1                
             ) AS CONS_ACCT_NAME,
 		    A.PROD_CODE,
 		    A.ADJUST_TYPE,
@@ -53,7 +76,13 @@
 		    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
+		    INNER JOIN COMP_INFO C
+		    ON 
+		    	C.COMP_CODE = A.TRAN_COMP
 		WHERE	
 			A.CONS_GROUP = #{sysSe}
 			AND A.ACCOUNT_PERIOD = #{accnutYm}
diff --git a/src/main/resources/mybatis/secondaryMapper/OracleMapper.LS b/src/main/resources/mybatis/secondaryMapper/OracleMapper.LS
index 901b4a1..559f60f 100644
--- a/src/main/resources/mybatis/secondaryMapper/OracleMapper.LS
+++ b/src/main/resources/mybatis/secondaryMapper/OracleMapper.LS
@@ -4,6 +4,26 @@
 	
 	<!-- 작업리스트 -->
 	<select id="getOriginalData" parameterType="map" resultType="map">
+		WITH COMP_INFO IS (
+			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
+			    , 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		
+		)		
 		SELECT
 		    A.SESSION_ID,
 		    A.CONS_GROUP,
@@ -12,8 +32,21 @@
 		    A.SEQ,
 		    A.TRAN_TYPE,
 		    A.OWN_COMP,
+		    B.COMP_NAME AS OWN_COMP_NAME
 		    A.TRAN_COMP,
+		    C.COMP_NAME AS TRAN_COMP_NAME
 		    A.COMP_ACCT_CODE,
+		    (
+				SELECT DISTINCT
+				    COMP_ACCT_CODE
+				FROM 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		    
 		    A.COMP_PROD_CODE,
 		    A.RECON_KEY,
 		    A.TRAN_DATE,
@@ -25,7 +58,17 @@
 		    A.DOCUMENT_NO,
 		    A.REMARK,
 		    A.CONS_ACCT_CODE,
-            B.CONS_ACCT_NAME_0 AS CONS_ACCT_NAME,
+            (
+	           	SELECT
+	           		CONS_ACCT_KR_NAME
+	           	FROM TBBC_ACCT_CODE
+	           	WHERE
+	           		CONS_ACCT_CODE = A.CONS_ACCT_CODE
+	                AND CONS_COA = 'LS_COA'
+	                AND FS_TYPE = '1'
+	                AND #{accnutYm} BETWEEN START_YYMM AND END_YYMM
+	                AND ROWNUM = 1                
+            ) AS CONS_ACCT_NAME,
 		    A.PROD_CODE,
 		    A.ADJUST_TYPE,
 		    A.ADJUST_REMARK,
@@ -43,13 +86,13 @@
 		    A.PARTNER_BIZ_NO,
 		    A.ACCT_DATE
 		FROM
-		    TBCR_TRANSACTION_HISTORY A
-            LEFT OUTER JOIN TBBC_ACCT_CODE_NLS B
-            ON
-                B.CONS_ACCT_CODE = A.CONS_ACCT_CODE
-                AND B.CONS_COA = 'LS_COA'
-                AND B.FS_TYPE = '1'
-                AND TO_CHAR(SYSDATE, 'YYYYMM') BETWEEN B.START_YYMM AND B.END_YYMM
+		    TBCR_TRANSACTION_HISTORY A,
+		    INNER JOIN COMP_INFO B
+		    ON 
+		    	B.COMP_CODE = A.OWN_COMP
+		    INNER JOIN COMP_INFO C
+		    ON 
+		    	C.COMP_CODE = A.TRAN_COMP
 		WHERE	
 			A.CONS_GROUP = #{sysSe}
 			AND A.ACCOUNT_PERIOD = #{accnutYm}
diff --git a/src/main/resources/mybatis/secondaryMapper/OracleMapper.xml b/src/main/resources/mybatis/secondaryMapper/OracleMapper.xml
index 3b7bc58..00f7f5d 100644
--- a/src/main/resources/mybatis/secondaryMapper/OracleMapper.xml
+++ b/src/main/resources/mybatis/secondaryMapper/OracleMapper.xml
@@ -4,6 +4,16 @@
 	
 	<!-- 작업리스트 -->
 	<select id="getOriginalData" parameterType="map" resultType="map">
+		WITH COMP_INFO IS (
+			SELECT DISTINCT
+			    COMP_CODE AS COMP_CODE
+			    , COMP_KR_NAME AS COMP_NAME
+			    , BOOK_CURRENCY AS COMP_CURRENCY
+			    , COMP_COA AS COMP_COA
+			FROM TBBC_COMPANY_CODE
+			WHERE
+			    #{accnutYm} BETWEEN START_YYMM AND END_YYMM		
+		)		
 		SELECT
 		    A.SESSION_ID,
 		    A.CONS_GROUP,
@@ -12,8 +22,21 @@
 		    A.SEQ,
 		    A.TRAN_TYPE,
 		    A.OWN_COMP,
+		    B.COMP_NAME AS OWN_COMP_NAME
 		    A.TRAN_COMP,
+		    C.COMP_NAME AS TRAN_COMP_NAME
 		    A.COMP_ACCT_CODE,
+		    (
+				SELECT DISTINCT
+				    COMP_ACCT_NAME
+				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
 		    A.COMP_PROD_CODE,
 		    A.RECON_KEY,
 		    A.TRAN_DATE,
@@ -26,15 +49,15 @@
 		    A.REMARK,
 		    A.CONS_ACCT_CODE,
             (
-           	SELECT
-           		CONS_ACCT_KR_NAME
-           	FROM TBBC_ACCT_CODE
-           	WHERE
-           		CONS_ACCT_CODE = A.CONS_ACCT_CODE
-                AND CONS_COA = 'GOV_I_COA'
-                AND FS_TYPE = '1'
-                AND TO_CHAR(SYSDATE, 'YYYYMM') BETWEEN START_YYMM AND END_YYMM
-                AND ROWNUM = 1                
+	           	SELECT
+	           		CONS_ACCT_KR_NAME
+	           	FROM TBBC_ACCT_CODE
+	           	WHERE
+	           		CONS_ACCT_CODE = A.CONS_ACCT_CODE
+	                AND CONS_COA = 'GOV_I_COA'
+	                AND FS_TYPE = '1'
+	                AND TO_CHAR(SYSDATE, 'YYYYMM') BETWEEN START_YYMM AND END_YYMM
+	                AND ROWNUM = 1                
             ) AS CONS_ACCT_NAME,
 		    A.PROD_CODE,
 		    A.ADJUST_TYPE,
@@ -53,7 +76,13 @@
 		    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
+		    INNER JOIN COMP_INFO C
+		    ON 
+		    	C.COMP_CODE = A.TRAN_COMP
 		WHERE	
 			A.CONS_GROUP = #{sysSe}
 			AND A.ACCOUNT_PERIOD = #{accnutYm}
diff --git a/src/main/resources/schema.sql b/src/main/resources/schema.sql
index 15785a4..398cb37 100644
--- a/src/main/resources/schema.sql
+++ b/src/main/resources/schema.sql
@@ -4,9 +4,16 @@ CREATE TABLE IF NOT EXISTS batch_tbcr_inner_delng
     accnut_ym character varying(6) NOT NULL,
     sn bigint NOT NULL DEFAULT 0,
     dta_ty character varying(3),
+
     cpr_code character varying(10),
+    cpr_nm character varying(100),
+
     partn_cpr character varying(10),
+    partn_cpr_nm character varying(100),
+
     cpr_acnt_code character varying(20),
+    cpr_acnt_nm character varying(100),
+
     cnnc_acnt_code character varying(20),
     cnnc_acnt_nm character varying(100),
     delng_de character varying(8),
@@ -54,12 +61,21 @@ COMMENT ON COLUMN batch_tbcr_inner_delng.dta_ty
 COMMENT ON COLUMN batch_tbcr_inner_delng.cpr_code
     IS '자기법인';
 
+COMMENT ON COLUMN batch_tbcr_inner_delng.cpr_nm
+    IS '자기법인명';
+
 COMMENT ON COLUMN batch_tbcr_inner_delng.partn_cpr
     IS '상대법인';
 
+COMMENT ON COLUMN batch_tbcr_inner_delng.partn_cpr_nm
+    IS '상대법인명';
+
 COMMENT ON COLUMN batch_tbcr_inner_delng.cpr_acnt_code
     IS '법인계정코드';
 
+COMMENT ON COLUMN batch_tbcr_inner_delng.cpr_acnt_nm
+    IS '법인계정명';
+
 COMMENT ON COLUMN batch_tbcr_inner_delng.cnnc_acnt_code
     IS '연결계정코드';
 
@@ -157,9 +173,16 @@ CREATE TABLE IF NOT EXISTS tbcr_transaction_history
     account_period character varying(6) NOT NULL,
     seq numeric NOT NULL,
     tran_type character varying(3),
+    
     own_comp character varying(10),
+    own_comp_name character varying(100),
+    
     tran_comp character varying(10),
+    tran_comp_name character varying(100),
+
     comp_acct_code character varying(20),
+    comp_acct_name character varying(100),
+
     comp_prod_code character varying(20),
     recon_key character varying(100),
     tran_date character varying(8),
--
libgit2 0.21.4