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(); } 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}