From 581390d828401b242207f5bc0a3dd555968b7f62 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Fri, 26 Apr 2024 13:23:46 +0900 Subject: [PATCH] =?UTF-8?q?=EC=86=8C=EC=8A=A4=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cokr/xit/fims/cmmn/hwp/format/CrdnConfirm.java | 5 +---- .../java/cokr/xit/fims/cmmn/hwp/format/CrdnList.java | 4 ---- .../java/cokr/xit/fims/cmmn/hwp/format/CvlcptOrgn.java | 9 ++++++--- .../cokr/xit/fims/cmmn/hwp/format/DlbrDecsnList.java | 4 ---- .../java/cokr/xit/fims/cmmn/hwp/format/HWPFormat.java | 3 +++ .../java/cokr/xit/fims/cmmn/hwp/format/RcvmtConfirm.java | 4 ---- .../cokr/xit/fims/cmmn/hwp/format/ReportOnClaims.java | 4 ---- .../xit/fims/cmmn/hwp/format/RequestForDelivery.java | 4 ---- .../java/cokr/xit/fims/cmmn/hwp/format/SvbtcList.java | 4 ---- 9 files changed, 10 insertions(+), 31 deletions(-) diff --git a/src/main/java/cokr/xit/fims/cmmn/hwp/format/CrdnConfirm.java b/src/main/java/cokr/xit/fims/cmmn/hwp/format/CrdnConfirm.java index e140eab1..f89c4260 100644 --- a/src/main/java/cokr/xit/fims/cmmn/hwp/format/CrdnConfirm.java +++ b/src/main/java/cokr/xit/fims/cmmn/hwp/format/CrdnConfirm.java @@ -2,13 +2,11 @@ package cokr.xit.fims.cmmn.hwp.format; import java.util.List; -import cokr.xit.base.docs.hwp.HWPWriter; import cokr.xit.fims.cmmn.Print; import cokr.xit.fims.cmmn.PrintOption; import cokr.xit.fims.mngt.FactionUtil; import cokr.xit.foundation.data.DataFormat; import cokr.xit.foundation.data.DataObject; -import kr.dogfoot.hwplib.object.HWPFile; /** * 단속확인서 @@ -32,8 +30,7 @@ public class CrdnConfirm extends HWPFormat { @Override public void runAsWriter() { - HWPFile hwpFile = HWPWriter.classpath(this.formatFilePath); - this.writer = new HWPWriter(hwpFile); + String printRequestYmd = print.getPrintRequestDt().substring(0, 8); String yyyy = printRequestYmd.substring(0, 4); diff --git a/src/main/java/cokr/xit/fims/cmmn/hwp/format/CrdnList.java b/src/main/java/cokr/xit/fims/cmmn/hwp/format/CrdnList.java index 191fbcac..549df78a 100644 --- a/src/main/java/cokr/xit/fims/cmmn/hwp/format/CrdnList.java +++ b/src/main/java/cokr/xit/fims/cmmn/hwp/format/CrdnList.java @@ -4,13 +4,11 @@ import java.util.ArrayList; import java.util.List; import java.util.stream.IntStream; -import cokr.xit.base.docs.hwp.HWPWriter; import cokr.xit.fims.cmmn.Print; import cokr.xit.fims.cmmn.PrintOption; import cokr.xit.fims.mngt.FactionUtil; import cokr.xit.foundation.data.DataFormat; import cokr.xit.foundation.data.DataObject; -import kr.dogfoot.hwplib.object.HWPFile; /** * 단속내역서 @@ -49,8 +47,6 @@ public class CrdnList extends HWPFormat { @Override public void runAsWriter() { - HWPFile hwpFile = HWPWriter.classpath(this.formatFilePath); - this.writer = new HWPWriter(hwpFile); String globalRtpyrNm = data.get(0).string("RTPYR_NM"); String globalRtpyrNo = data.get(0).string("RTPYR_NO"); diff --git a/src/main/java/cokr/xit/fims/cmmn/hwp/format/CvlcptOrgn.java b/src/main/java/cokr/xit/fims/cmmn/hwp/format/CvlcptOrgn.java index fa736e39..5040f361 100644 --- a/src/main/java/cokr/xit/fims/cmmn/hwp/format/CvlcptOrgn.java +++ b/src/main/java/cokr/xit/fims/cmmn/hwp/format/CvlcptOrgn.java @@ -53,6 +53,9 @@ public class CvlcptOrgn extends HWPFormat { @Override public HashMap makeFile(){ + HWPFile hwpFile = HWPWriter.classpath(this.formatFilePath); + this.writer = new HWPWriter(hwpFile); + runAsWriter(); String tempPath = this.print.pathForNewFile(); writer.write(tempPath); @@ -65,7 +68,10 @@ public class CvlcptOrgn extends HWPFormat { formatFilePath = "template/hwp/cvlcptOrgnl_photo.hwp"; maxRunCount = data2.size()+1; + while(currentRunCount != maxRunCount) { + HWPFile hwpFile_i = HWPWriter.classpath(this.formatFilePath); + this.writer = new HWPWriter(hwpFile_i); runAsWriter(); String tempPath_i = this.print.pathForNewFile(); writer.write(tempPath_i); @@ -84,9 +90,6 @@ public class CvlcptOrgn extends HWPFormat { @Override public void runAsWriter() { - HWPFile hwpFile = HWPWriter.classpath(this.formatFilePath); - this.writer = new HWPWriter(hwpFile); - if(this.formatFilePath.equals("template/hwp/cvlcptOrgnl_text.hwp")) { diff --git a/src/main/java/cokr/xit/fims/cmmn/hwp/format/DlbrDecsnList.java b/src/main/java/cokr/xit/fims/cmmn/hwp/format/DlbrDecsnList.java index 6e010a33..cab58d2f 100644 --- a/src/main/java/cokr/xit/fims/cmmn/hwp/format/DlbrDecsnList.java +++ b/src/main/java/cokr/xit/fims/cmmn/hwp/format/DlbrDecsnList.java @@ -3,11 +3,9 @@ package cokr.xit.fims.cmmn.hwp.format; import java.util.ArrayList; import java.util.List; -import cokr.xit.base.docs.hwp.HWPWriter; import cokr.xit.fims.cmmn.Print; import cokr.xit.fims.cmmn.PrintOption; import cokr.xit.foundation.data.DataObject; -import kr.dogfoot.hwplib.object.HWPFile; public class DlbrDecsnList extends HWPFormat { @@ -41,8 +39,6 @@ public class DlbrDecsnList extends HWPFormat { @Override public void runAsWriter() { - HWPFile hwpFile = HWPWriter.classpath(this.formatFilePath); - this.writer = new HWPWriter(hwpFile); DataObject one = data.get(currentRunCount); diff --git a/src/main/java/cokr/xit/fims/cmmn/hwp/format/HWPFormat.java b/src/main/java/cokr/xit/fims/cmmn/hwp/format/HWPFormat.java index c9f80045..a3e02697 100644 --- a/src/main/java/cokr/xit/fims/cmmn/hwp/format/HWPFormat.java +++ b/src/main/java/cokr/xit/fims/cmmn/hwp/format/HWPFormat.java @@ -37,7 +37,10 @@ public abstract class HWPFormat { } public HashMap makeFile(){ + while(currentRunCount != maxRunCount) { + HWPFile hwpFile = HWPWriter.classpath(this.formatFilePath); + this.writer = new HWPWriter(hwpFile); runAsWriter(); String tempPath = this.print.pathForNewFile(); writer.write(tempPath); diff --git a/src/main/java/cokr/xit/fims/cmmn/hwp/format/RcvmtConfirm.java b/src/main/java/cokr/xit/fims/cmmn/hwp/format/RcvmtConfirm.java index f1ce83d2..c820a226 100644 --- a/src/main/java/cokr/xit/fims/cmmn/hwp/format/RcvmtConfirm.java +++ b/src/main/java/cokr/xit/fims/cmmn/hwp/format/RcvmtConfirm.java @@ -3,13 +3,11 @@ package cokr.xit.fims.cmmn.hwp.format; import java.util.ArrayList; import java.util.List; -import cokr.xit.base.docs.hwp.HWPWriter; import cokr.xit.fims.cmmn.Print; import cokr.xit.fims.cmmn.PrintOption; import cokr.xit.fims.mngt.FactionUtil; import cokr.xit.foundation.data.DataFormat; import cokr.xit.foundation.data.DataObject; -import kr.dogfoot.hwplib.object.HWPFile; /** * 납부확인서 @@ -47,8 +45,6 @@ public class RcvmtConfirm extends HWPFormat { @Override public void runAsWriter() { - HWPFile hwpFile = HWPWriter.classpath(this.formatFilePath); - this.writer = new HWPWriter(hwpFile); String instNm = FactionUtil.getInstituteLeader((String) print.getPrintRequestUserInfo().getInfo().get("instNm"), false); diff --git a/src/main/java/cokr/xit/fims/cmmn/hwp/format/ReportOnClaims.java b/src/main/java/cokr/xit/fims/cmmn/hwp/format/ReportOnClaims.java index 7c852024..e877df51 100644 --- a/src/main/java/cokr/xit/fims/cmmn/hwp/format/ReportOnClaims.java +++ b/src/main/java/cokr/xit/fims/cmmn/hwp/format/ReportOnClaims.java @@ -9,7 +9,6 @@ import java.util.stream.IntStream; import org.egovframe.rte.fdl.string.EgovStringUtil; -import cokr.xit.base.docs.hwp.HWPWriter; import cokr.xit.fims.cmmn.CmmnUtil; import cokr.xit.fims.cmmn.Print; import cokr.xit.fims.cmmn.PrintOption; @@ -17,7 +16,6 @@ import cokr.xit.fims.cmmn.hwp.OffcsCellFinder; import cokr.xit.fims.mngt.FactionUtil; import cokr.xit.foundation.data.DataFormat; import cokr.xit.foundation.data.DataObject; -import kr.dogfoot.hwplib.object.HWPFile; import kr.dogfoot.hwplib.object.bodytext.control.table.Cell; import kr.dogfoot.hwplib.object.bodytext.paragraph.Paragraph; @@ -50,8 +48,6 @@ public class ReportOnClaims extends HWPFormat { @Override public void runAsWriter() { - HWPFile hwpFile = HWPWriter.classpath(this.formatFilePath); - this.writer = new HWPWriter(hwpFile); Map globalVariable = printOption.getGlobalVariable(); diff --git a/src/main/java/cokr/xit/fims/cmmn/hwp/format/RequestForDelivery.java b/src/main/java/cokr/xit/fims/cmmn/hwp/format/RequestForDelivery.java index db51a0e3..1f0dc68b 100644 --- a/src/main/java/cokr/xit/fims/cmmn/hwp/format/RequestForDelivery.java +++ b/src/main/java/cokr/xit/fims/cmmn/hwp/format/RequestForDelivery.java @@ -9,7 +9,6 @@ import java.util.stream.IntStream; import org.egovframe.rte.fdl.string.EgovStringUtil; -import cokr.xit.base.docs.hwp.HWPWriter; import cokr.xit.fims.cmmn.CmmnUtil; import cokr.xit.fims.cmmn.Print; import cokr.xit.fims.cmmn.PrintOption; @@ -17,7 +16,6 @@ import cokr.xit.fims.cmmn.hwp.OffcsCellFinder; import cokr.xit.fims.mngt.FactionUtil; import cokr.xit.foundation.data.DataFormat; import cokr.xit.foundation.data.DataObject; -import kr.dogfoot.hwplib.object.HWPFile; import kr.dogfoot.hwplib.object.bodytext.control.table.Cell; import kr.dogfoot.hwplib.object.bodytext.paragraph.Paragraph; @@ -49,8 +47,6 @@ public class RequestForDelivery extends HWPFormat { @Override public void runAsWriter() { - HWPFile hwpFile = HWPWriter.classpath(this.formatFilePath); - this.writer = new HWPWriter(hwpFile); Map globalVariable = printOption.getGlobalVariable(); diff --git a/src/main/java/cokr/xit/fims/cmmn/hwp/format/SvbtcList.java b/src/main/java/cokr/xit/fims/cmmn/hwp/format/SvbtcList.java index 248b4d18..a476956d 100644 --- a/src/main/java/cokr/xit/fims/cmmn/hwp/format/SvbtcList.java +++ b/src/main/java/cokr/xit/fims/cmmn/hwp/format/SvbtcList.java @@ -8,12 +8,10 @@ import java.util.stream.IntStream; import org.egovframe.rte.fdl.string.EgovStringUtil; -import cokr.xit.base.docs.hwp.HWPWriter; import cokr.xit.fims.cmmn.Print; import cokr.xit.fims.cmmn.PrintOption; import cokr.xit.fims.cmmn.hwp.OffcsCellFinder; import cokr.xit.foundation.data.DataObject; -import kr.dogfoot.hwplib.object.HWPFile; import kr.dogfoot.hwplib.object.bodytext.control.table.Cell; import kr.dogfoot.hwplib.object.bodytext.paragraph.Paragraph; @@ -43,8 +41,6 @@ public class SvbtcList extends HWPFormat { @Override public void runAsWriter() { - HWPFile hwpFile = HWPWriter.classpath(this.formatFilePath); - this.writer = new HWPWriter(hwpFile); String offcsFilePath = EgovStringUtil.null2void(data.get(0).string("OFFCS_FILE_PATH")); if(!offcsFilePath.equals("")) {