From 64f8acab4cd523c2dcb12e86bd1b9261a898570c Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Tue, 5 Dec 2023 09:37:43 +0900
Subject: [PATCH] =?UTF-8?q?=EC=8B=9C=EA=B5=B0=EA=B5=AC=20=EB=A1=9C?=
 =?UTF-8?q?=EA=B3=A0=20=EC=B6=9C=EB=A0=A5=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/cokr/xit/fims/cmmn/pdf/PDFPrintUtil.java    | 5 ++++-
 src/main/java/cokr/xit/fims/cmmn/pdf/format/Advntce.java  | 2 +-
 .../xit/fims/sprt/service/bean/Sprt01ServiceBean.java     | 1 +
 src/main/resources/sql/mapper/fims/cmmn/stng-mapper.xml   | 8 ++++++--
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/main/java/cokr/xit/fims/cmmn/pdf/PDFPrintUtil.java b/src/main/java/cokr/xit/fims/cmmn/pdf/PDFPrintUtil.java
index 6d9fca3d..88247344 100644
--- a/src/main/java/cokr/xit/fims/cmmn/pdf/PDFPrintUtil.java
+++ b/src/main/java/cokr/xit/fims/cmmn/pdf/PDFPrintUtil.java
@@ -114,7 +114,10 @@ public class PDFPrintUtil extends PrintUtil {
 			float[] SIZEmm) {
 
 		float[] xyAbsolute = this.toPDFCoordinate(XYmm).absolute();
-		float[] size = this.toPDFCoordinate(SIZEmm).offset();
+
+		float[] size = new float[] {
+			mmToPt(SIZEmm[0]),mmToPt(SIZEmm[1])
+		};
 		try {
 			if(!imagePath.equals("")) {
 				PDImageXObject image = PDImageXObject.createFromFile(imagePath, doc);
diff --git a/src/main/java/cokr/xit/fims/cmmn/pdf/format/Advntce.java b/src/main/java/cokr/xit/fims/cmmn/pdf/format/Advntce.java
index b7978458..819cd218 100644
--- a/src/main/java/cokr/xit/fims/cmmn/pdf/format/Advntce.java
+++ b/src/main/java/cokr/xit/fims/cmmn/pdf/format/Advntce.java
@@ -256,7 +256,7 @@ public class Advntce extends PDFFormat {
 			result = dataObject.string("RTPYR_NM");
 		}
 		case "postSenderLogo" -> {
-			result = dataObject.string("");
+			result = printOption.getGlobalVariable().get("logoFilePath");
 		}
 		case "postSenderInst" -> {
 			result = (String)pdfPrintUtil.getPrintRequestUserInfo().getInfo().get("instNm");
diff --git a/src/main/java/cokr/xit/fims/sprt/service/bean/Sprt01ServiceBean.java b/src/main/java/cokr/xit/fims/sprt/service/bean/Sprt01ServiceBean.java
index 814b98b0..4efa70c5 100644
--- a/src/main/java/cokr/xit/fims/sprt/service/bean/Sprt01ServiceBean.java
+++ b/src/main/java/cokr/xit/fims/sprt/service/bean/Sprt01ServiceBean.java
@@ -295,6 +295,7 @@ public class Sprt01ServiceBean extends AbstractServiceBean implements Sprt01Serv
 			globalVariable = new HashMap<String, String>();
 		}
 		globalVariable.put("offcsFilePath", sggStngInfo.string("OFFCS_FILE_PATH"));
+		globalVariable.put("logoFilePath", sggStngInfo.string("LOGO_FILE_PATH"));
 		globalVariable.put("instAddr", sggStngInfo.string("INST_ADDR"));
 		globalVariable.put("instDaddr", sggStngInfo.string("INST_DADDR"));
 		globalVariable.put("instZip", sggStngInfo.string("INST_ZIP"));
diff --git a/src/main/resources/sql/mapper/fims/cmmn/stng-mapper.xml b/src/main/resources/sql/mapper/fims/cmmn/stng-mapper.xml
index c5a22035..ef785c22 100644
--- a/src/main/resources/sql/mapper/fims/cmmn/stng-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/cmmn/stng-mapper.xml
@@ -32,8 +32,12 @@ SELECT SGG_CD
      , INST_ADDR
      , INST_DADDR
      , INST_ZIP
-     , OFFCS_FILE_PATH <!-- 직인 파일 경로 -->
-     , OFFCS_FILE_NM   <!-- 직인 파일 명 -->
+     , LOGO_FILE_PATH   <!-- 로고 파일 경로 -->
+     , LOGO_FILE_NM     <!-- 로고 파일 명 -->
+     , SYMBOL_FILE_PATH <!-- 심볼 파일 경로 -->
+     , SYMBOL_FILE_NM   <!-- 심볼 파일 명 -->
+     , OFFCS_FILE_PATH  <!-- 직인 파일 경로 -->
+     , OFFCS_FILE_NM    <!-- 직인 파일 명 -->
   FROM TB_SGG_INFO
  WHERE SGG_CD = #{sggCd}
 </select>