From 588d396a2bdbdaa869904f118a852a8d5488cb3b Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Tue, 20 Feb 2024 10:03:28 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B6=9C=EB=A0=A5=20=EA=B4=80=EB=A0=A8=20?= =?UTF-8?q?=EC=86=8C=EC=8A=A4=20=ED=8C=A8=ED=82=A4=EC=A7=80=EA=B2=BD?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xit/base/file/etc/OutsourcingFileWriter.java | 2 +- .../java/cokr/xit/base/file/hwp/HWPWriter.java | 2 +- .../java/cokr/xit/base/file/pdf/PDFWriter.java | 2 +- .../xit/fims/{sprt => cmmn}/OtptArtclStng.java | 2 +- .../cokr/xit/fims/{sprt => cmmn}/OtptForm.java | 2 +- .../xit/fims/{sprt => cmmn}/OtptStngQuery.java | 4 +--- src/main/java/cokr/xit/fims/cmmn/Print.java | 1 - .../xit/fims/{sprt => cmmn}/PrintOption.java | 2 +- .../fims/{sprt => cmmn}/dao/OtptStngMapper.java | 8 ++++---- .../xit/fims/cmmn/hwp/format/CrdnConfirm.java | 2 +- .../cokr/xit/fims/cmmn/hwp/format/CrdnList.java | 2 +- .../xit/fims/cmmn/hwp/format/CvlcptOrgn.java | 2 +- .../xit/fims/cmmn/hwp/format/DlbrDecsnList.java | 2 +- .../cokr/xit/fims/cmmn/hwp/format/HWPFormat.java | 2 +- .../xit/fims/cmmn/hwp/format/RcvmtConfirm.java | 2 +- .../xit/fims/cmmn/hwp/format/ReportOnClaims.java | 2 +- .../fims/cmmn/hwp/format/RequestForDelivery.java | 2 +- .../cokr/xit/fims/cmmn/hwp/format/SvbtcList.java | 2 +- .../xit/fims/cmmn/pdf/print/format/Advntce.java | 2 +- .../cokr/xit/fims/cmmn/pdf/print/format/Nht.java | 2 +- .../cmmn/pdf/print/format/PDFPrintFormat.java | 2 +- .../service/bean/OtptStngBean.java | 10 +++++----- .../cokr/xit/fims/cvlc/web/Cvlc01Controller.java | 2 +- .../cokr/xit/fims/excl/web/Excl02Controller.java | 2 +- .../cokr/xit/fims/sndb/web/Sndb01Controller.java | 6 +++--- .../bean/IntegrationSearchServiceBean.java | 2 +- .../cokr/xit/fims/sprt/web/Sprt01Controller.java | 10 +++++----- .../cokr/xit/fims/task/web/CmnController.java | 6 +++--- .../cokr/xit/fims/task/web/DpvController.java | 2 +- .../fims/{sprt => cmmn}/otptStng-mapper.xml | 16 ++++++++-------- 30 files changed, 51 insertions(+), 54 deletions(-) rename src/main/java/cokr/xit/fims/{sprt => cmmn}/OtptArtclStng.java (96%) rename src/main/java/cokr/xit/fims/{sprt => cmmn}/OtptForm.java (95%) rename src/main/java/cokr/xit/fims/{sprt => cmmn}/OtptStngQuery.java (90%) rename src/main/java/cokr/xit/fims/{sprt => cmmn}/PrintOption.java (92%) rename src/main/java/cokr/xit/fims/{sprt => cmmn}/dao/OtptStngMapper.java (86%) rename src/main/java/cokr/xit/fims/{sprt => cmmn}/service/bean/OtptStngBean.java (95%) rename src/main/resources/sql/mapper/fims/{sprt => cmmn}/otptStng-mapper.xml (91%) diff --git a/src/main/java/cokr/xit/base/file/etc/OutsourcingFileWriter.java b/src/main/java/cokr/xit/base/file/etc/OutsourcingFileWriter.java index 610f155e..3006a0cc 100644 --- a/src/main/java/cokr/xit/base/file/etc/OutsourcingFileWriter.java +++ b/src/main/java/cokr/xit/base/file/etc/OutsourcingFileWriter.java @@ -18,7 +18,7 @@ import org.egovframe.rte.fdl.string.EgovStringUtil; import cokr.xit.fims.cmmn.CmmnUtil; import cokr.xit.fims.cmmn.Hangul; -import cokr.xit.fims.sprt.PrintOption; +import cokr.xit.fims.cmmn.PrintOption; import cokr.xit.foundation.data.DataObject; import net.lingala.zip4j.ZipFile; diff --git a/src/main/java/cokr/xit/base/file/hwp/HWPWriter.java b/src/main/java/cokr/xit/base/file/hwp/HWPWriter.java index 5a2f6f69..0e873951 100644 --- a/src/main/java/cokr/xit/base/file/hwp/HWPWriter.java +++ b/src/main/java/cokr/xit/base/file/hwp/HWPWriter.java @@ -10,9 +10,9 @@ import java.util.Map; import org.springframework.core.io.ClassPathResource; import cokr.xit.fims.cmmn.Print; +import cokr.xit.fims.cmmn.PrintOption; import cokr.xit.fims.cmmn.hwp.AddUtil; import cokr.xit.fims.cmmn.hwp.format.HWPFormat; -import cokr.xit.fims.sprt.PrintOption; import cokr.xit.foundation.data.DataObject; import kr.dogfoot.hwplib.object.HWPFile; import kr.dogfoot.hwplib.reader.HWPReader; diff --git a/src/main/java/cokr/xit/base/file/pdf/PDFWriter.java b/src/main/java/cokr/xit/base/file/pdf/PDFWriter.java index 862f3a3c..fd2c5c30 100644 --- a/src/main/java/cokr/xit/base/file/pdf/PDFWriter.java +++ b/src/main/java/cokr/xit/base/file/pdf/PDFWriter.java @@ -26,6 +26,7 @@ import org.springframework.core.io.ClassPathResource; import cokr.xit.fims.cmmn.CmmnUtil; import cokr.xit.fims.cmmn.Print; +import cokr.xit.fims.cmmn.PrintOption; import cokr.xit.fims.cmmn.pdf.PDFColors; import cokr.xit.fims.cmmn.pdf.PDFCoordinate; import cokr.xit.fims.cmmn.pdf.Pstn; @@ -34,7 +35,6 @@ import cokr.xit.fims.cmmn.pdf.Size; import cokr.xit.fims.cmmn.pdf.print.DefaultOtptArtclStng; import cokr.xit.fims.cmmn.pdf.print.format.PDFPrintFormat; import cokr.xit.fims.sprt.MediaUtil; -import cokr.xit.fims.sprt.PrintOption; import cokr.xit.foundation.data.DataObject; public class PDFWriter { diff --git a/src/main/java/cokr/xit/fims/sprt/OtptArtclStng.java b/src/main/java/cokr/xit/fims/cmmn/OtptArtclStng.java similarity index 96% rename from src/main/java/cokr/xit/fims/sprt/OtptArtclStng.java rename to src/main/java/cokr/xit/fims/cmmn/OtptArtclStng.java index e4d9dbea..4e6f31d7 100644 --- a/src/main/java/cokr/xit/fims/sprt/OtptArtclStng.java +++ b/src/main/java/cokr/xit/fims/cmmn/OtptArtclStng.java @@ -1,4 +1,4 @@ -package cokr.xit.fims.sprt; +package cokr.xit.fims.cmmn; import cokr.xit.foundation.AbstractEntity; import lombok.Getter; diff --git a/src/main/java/cokr/xit/fims/sprt/OtptForm.java b/src/main/java/cokr/xit/fims/cmmn/OtptForm.java similarity index 95% rename from src/main/java/cokr/xit/fims/sprt/OtptForm.java rename to src/main/java/cokr/xit/fims/cmmn/OtptForm.java index d2079978..6eed04c2 100644 --- a/src/main/java/cokr/xit/fims/sprt/OtptForm.java +++ b/src/main/java/cokr/xit/fims/cmmn/OtptForm.java @@ -1,4 +1,4 @@ -package cokr.xit.fims.sprt; +package cokr.xit.fims.cmmn; import java.util.List; diff --git a/src/main/java/cokr/xit/fims/sprt/OtptStngQuery.java b/src/main/java/cokr/xit/fims/cmmn/OtptStngQuery.java similarity index 90% rename from src/main/java/cokr/xit/fims/sprt/OtptStngQuery.java rename to src/main/java/cokr/xit/fims/cmmn/OtptStngQuery.java index ee0f5c10..ed3273d7 100644 --- a/src/main/java/cokr/xit/fims/sprt/OtptStngQuery.java +++ b/src/main/java/cokr/xit/fims/cmmn/OtptStngQuery.java @@ -1,6 +1,4 @@ -package cokr.xit.fims.sprt; - -import cokr.xit.fims.cmmn.CmmnQuery; +package cokr.xit.fims.cmmn; public class OtptStngQuery extends CmmnQuery { diff --git a/src/main/java/cokr/xit/fims/cmmn/Print.java b/src/main/java/cokr/xit/fims/cmmn/Print.java index d6bf90ee..4af09eab 100644 --- a/src/main/java/cokr/xit/fims/cmmn/Print.java +++ b/src/main/java/cokr/xit/fims/cmmn/Print.java @@ -6,7 +6,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import cokr.xit.fims.sprt.PrintOption; import cokr.xit.foundation.UserInfo; import cokr.xit.foundation.data.DataObject; diff --git a/src/main/java/cokr/xit/fims/sprt/PrintOption.java b/src/main/java/cokr/xit/fims/cmmn/PrintOption.java similarity index 92% rename from src/main/java/cokr/xit/fims/sprt/PrintOption.java rename to src/main/java/cokr/xit/fims/cmmn/PrintOption.java index 80780dfc..13dd2ff1 100644 --- a/src/main/java/cokr/xit/fims/sprt/PrintOption.java +++ b/src/main/java/cokr/xit/fims/cmmn/PrintOption.java @@ -1,4 +1,4 @@ -package cokr.xit.fims.sprt; +package cokr.xit.fims.cmmn; import java.util.Map; diff --git a/src/main/java/cokr/xit/fims/sprt/dao/OtptStngMapper.java b/src/main/java/cokr/xit/fims/cmmn/dao/OtptStngMapper.java similarity index 86% rename from src/main/java/cokr/xit/fims/sprt/dao/OtptStngMapper.java rename to src/main/java/cokr/xit/fims/cmmn/dao/OtptStngMapper.java index 45ea2e73..f9c9e109 100644 --- a/src/main/java/cokr/xit/fims/sprt/dao/OtptStngMapper.java +++ b/src/main/java/cokr/xit/fims/cmmn/dao/OtptStngMapper.java @@ -1,12 +1,12 @@ -package cokr.xit.fims.sprt.dao; +package cokr.xit.fims.cmmn.dao; import java.util.List; import org.egovframe.rte.psl.dataaccess.mapper.Mapper; -import cokr.xit.fims.sprt.OtptArtclStng; -import cokr.xit.fims.sprt.OtptForm; -import cokr.xit.fims.sprt.OtptStngQuery; +import cokr.xit.fims.cmmn.OtptArtclStng; +import cokr.xit.fims.cmmn.OtptForm; +import cokr.xit.fims.cmmn.OtptStngQuery; import cokr.xit.foundation.component.AbstractMapper; import cokr.xit.foundation.data.DataObject; 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 c6931997..d24a2a08 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 @@ -4,10 +4,10 @@ import java.util.List; import cokr.xit.fims.cmmn.CmmnUtil; import cokr.xit.fims.cmmn.Print; +import cokr.xit.fims.cmmn.PrintOption; import cokr.xit.fims.cmmn.hwp.ClickHereEditor; import cokr.xit.fims.cmmn.hwp.InsertingImageCell; import cokr.xit.fims.mngt.FactionUtil; -import cokr.xit.fims.sprt.PrintOption; import cokr.xit.foundation.data.DataObject; import kr.dogfoot.hwplib.object.HWPFile; 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 681a8168..c18c97d0 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,9 +4,9 @@ import java.util.List; import cokr.xit.fims.cmmn.CmmnUtil; import cokr.xit.fims.cmmn.Print; +import cokr.xit.fims.cmmn.PrintOption; import cokr.xit.fims.cmmn.hwp.ClickHereEditor; import cokr.xit.fims.mngt.FactionUtil; -import cokr.xit.fims.sprt.PrintOption; import cokr.xit.foundation.data.DataFormat; import cokr.xit.foundation.data.DataObject; import kr.dogfoot.hwplib.object.HWPFile; 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 39f10d96..433120f9 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 @@ -7,10 +7,10 @@ import org.springframework.core.io.ClassPathResource; import cokr.xit.fims.cmmn.CmmnUtil; import cokr.xit.fims.cmmn.Print; +import cokr.xit.fims.cmmn.PrintOption; import cokr.xit.fims.cmmn.hwp.AddUtil; import cokr.xit.fims.cmmn.hwp.ClickHereEditor; import cokr.xit.fims.cmmn.hwp.InsertingImageCell; -import cokr.xit.fims.sprt.PrintOption; import cokr.xit.foundation.data.DataFormat; import cokr.xit.foundation.data.DataObject; import kr.dogfoot.hwplib.object.HWPFile; 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 727a55cd..546b0292 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,8 +3,8 @@ package cokr.xit.fims.cmmn.hwp.format; import java.util.List; import cokr.xit.fims.cmmn.Print; +import cokr.xit.fims.cmmn.PrintOption; import cokr.xit.fims.cmmn.hwp.ClickHereEditor; -import cokr.xit.fims.sprt.PrintOption; import cokr.xit.foundation.data.DataObject; import kr.dogfoot.hwplib.object.HWPFile; 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 38554d29..9e9137b8 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 @@ -9,7 +9,7 @@ import java.util.List; import org.springframework.core.io.ClassPathResource; import cokr.xit.fims.cmmn.Print; -import cokr.xit.fims.sprt.PrintOption; +import cokr.xit.fims.cmmn.PrintOption; import cokr.xit.foundation.data.DataObject; import kr.dogfoot.hwplib.object.HWPFile; import kr.dogfoot.hwplib.reader.HWPReader; 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 edf9258b..7c8c9f3d 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 @@ -4,9 +4,9 @@ import java.util.List; import cokr.xit.fims.cmmn.CmmnUtil; import cokr.xit.fims.cmmn.Print; +import cokr.xit.fims.cmmn.PrintOption; import cokr.xit.fims.cmmn.hwp.ClickHereEditor; import cokr.xit.fims.mngt.FactionUtil; -import cokr.xit.fims.sprt.PrintOption; import cokr.xit.foundation.data.DataFormat; import cokr.xit.foundation.data.DataObject; import kr.dogfoot.hwplib.object.HWPFile; 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 2300e3be..3b8d1a4e 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 @@ -7,10 +7,10 @@ import org.egovframe.rte.fdl.string.EgovStringUtil; import cokr.xit.fims.cmmn.CmmnUtil; import cokr.xit.fims.cmmn.Print; +import cokr.xit.fims.cmmn.PrintOption; import cokr.xit.fims.cmmn.hwp.ClickHereEditor; import cokr.xit.fims.cmmn.hwp.InsertingImageCell; import cokr.xit.fims.mngt.FactionUtil; -import cokr.xit.fims.sprt.PrintOption; import cokr.xit.foundation.data.DataFormat; import cokr.xit.foundation.data.DataObject; import kr.dogfoot.hwplib.object.HWPFile; 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 542fadd1..c1a1bd79 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 @@ -7,10 +7,10 @@ import org.egovframe.rte.fdl.string.EgovStringUtil; import cokr.xit.fims.cmmn.CmmnUtil; import cokr.xit.fims.cmmn.Print; +import cokr.xit.fims.cmmn.PrintOption; import cokr.xit.fims.cmmn.hwp.ClickHereEditor; import cokr.xit.fims.cmmn.hwp.InsertingImageCell; import cokr.xit.fims.mngt.FactionUtil; -import cokr.xit.fims.sprt.PrintOption; import cokr.xit.foundation.data.DataFormat; import cokr.xit.foundation.data.DataObject; import kr.dogfoot.hwplib.object.HWPFile; 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 d6d9d520..e0b3505b 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 @@ -3,9 +3,9 @@ package cokr.xit.fims.cmmn.hwp.format; import java.util.List; import cokr.xit.fims.cmmn.Print; +import cokr.xit.fims.cmmn.PrintOption; import cokr.xit.fims.cmmn.hwp.ClickHereEditor; import cokr.xit.fims.cmmn.hwp.InsertingImageCell; -import cokr.xit.fims.sprt.PrintOption; import cokr.xit.foundation.data.DataObject; import kr.dogfoot.hwplib.object.HWPFile; diff --git a/src/main/java/cokr/xit/fims/cmmn/pdf/print/format/Advntce.java b/src/main/java/cokr/xit/fims/cmmn/pdf/print/format/Advntce.java index 951f66ad..f13ca08e 100644 --- a/src/main/java/cokr/xit/fims/cmmn/pdf/print/format/Advntce.java +++ b/src/main/java/cokr/xit/fims/cmmn/pdf/print/format/Advntce.java @@ -6,8 +6,8 @@ import java.util.Map; import cokr.xit.fims.cmmn.CmmnUtil; import cokr.xit.fims.cmmn.Print; +import cokr.xit.fims.cmmn.PrintOption; import cokr.xit.fims.mngt.FactionUtil; -import cokr.xit.fims.sprt.PrintOption; import cokr.xit.foundation.data.DataFormat; import cokr.xit.foundation.data.DataObject; diff --git a/src/main/java/cokr/xit/fims/cmmn/pdf/print/format/Nht.java b/src/main/java/cokr/xit/fims/cmmn/pdf/print/format/Nht.java index c4aa2a3e..5e2c16aa 100644 --- a/src/main/java/cokr/xit/fims/cmmn/pdf/print/format/Nht.java +++ b/src/main/java/cokr/xit/fims/cmmn/pdf/print/format/Nht.java @@ -6,8 +6,8 @@ import java.util.Map; import cokr.xit.fims.cmmn.CmmnUtil; import cokr.xit.fims.cmmn.Print; +import cokr.xit.fims.cmmn.PrintOption; import cokr.xit.fims.mngt.FactionUtil; -import cokr.xit.fims.sprt.PrintOption; import cokr.xit.foundation.data.DataFormat; import cokr.xit.foundation.data.DataObject; diff --git a/src/main/java/cokr/xit/fims/cmmn/pdf/print/format/PDFPrintFormat.java b/src/main/java/cokr/xit/fims/cmmn/pdf/print/format/PDFPrintFormat.java index 1130bb75..2fb10ae5 100644 --- a/src/main/java/cokr/xit/fims/cmmn/pdf/print/format/PDFPrintFormat.java +++ b/src/main/java/cokr/xit/fims/cmmn/pdf/print/format/PDFPrintFormat.java @@ -4,8 +4,8 @@ import java.util.ArrayList; import java.util.List; import cokr.xit.fims.cmmn.Print; +import cokr.xit.fims.cmmn.PrintOption; import cokr.xit.fims.cmmn.pdf.print.DefaultOtptArtclStng; -import cokr.xit.fims.sprt.PrintOption; import cokr.xit.foundation.data.DataObject; public abstract class PDFPrintFormat { diff --git a/src/main/java/cokr/xit/fims/sprt/service/bean/OtptStngBean.java b/src/main/java/cokr/xit/fims/cmmn/service/bean/OtptStngBean.java similarity index 95% rename from src/main/java/cokr/xit/fims/sprt/service/bean/OtptStngBean.java rename to src/main/java/cokr/xit/fims/cmmn/service/bean/OtptStngBean.java index 11210247..b5746260 100644 --- a/src/main/java/cokr/xit/fims/sprt/service/bean/OtptStngBean.java +++ b/src/main/java/cokr/xit/fims/cmmn/service/bean/OtptStngBean.java @@ -1,4 +1,4 @@ -package cokr.xit.fims.sprt.service.bean; +package cokr.xit.fims.cmmn.service.bean; import java.util.ArrayList; import java.util.HashMap; @@ -9,14 +9,14 @@ import javax.annotation.Resource; import org.springframework.stereotype.Component; +import cokr.xit.fims.cmmn.OtptArtclStng; +import cokr.xit.fims.cmmn.OtptForm; +import cokr.xit.fims.cmmn.OtptStngQuery; +import cokr.xit.fims.cmmn.dao.OtptStngMapper; import cokr.xit.fims.cmmn.pdf.print.DefaultOtptArtclStng; import cokr.xit.fims.cmmn.pdf.print.format.Advntce; import cokr.xit.fims.cmmn.pdf.print.format.Nht; import cokr.xit.fims.cmmn.pdf.print.format.PDFPrintFormat; -import cokr.xit.fims.sprt.OtptArtclStng; -import cokr.xit.fims.sprt.OtptForm; -import cokr.xit.fims.sprt.OtptStngQuery; -import cokr.xit.fims.sprt.dao.OtptStngMapper; import cokr.xit.foundation.AbstractComponent; import cokr.xit.foundation.data.DataObject; diff --git a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java index c0071eeb..db01cfe4 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java @@ -26,6 +26,7 @@ import cokr.xit.base.user.dao.UserMapper; import cokr.xit.base.web.ApplicationController; import cokr.xit.fims.cmmn.CmmnUtil; import cokr.xit.fims.cmmn.Print; +import cokr.xit.fims.cmmn.PrintOption; import cokr.xit.fims.cmmn.hwp.format.CvlcptOrgn; import cokr.xit.fims.cmmn.service.bean.StngBean; import cokr.xit.fims.crdn.Crdn; @@ -36,7 +37,6 @@ import cokr.xit.fims.cvlc.CrdnCvlcpt; import cokr.xit.fims.cvlc.service.CrdnCvlcptService; import cokr.xit.fims.cvlc.service.bean.CrdnCvlcptMainBean; import cokr.xit.fims.mngt.service.bean.FactionBean; -import cokr.xit.fims.sprt.PrintOption; import cokr.xit.foundation.UserInfo; import cokr.xit.foundation.data.DataObject; diff --git a/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java b/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java index 62e57cdb..a7c1788b 100644 --- a/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java +++ b/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java @@ -24,6 +24,7 @@ import cokr.xit.base.user.ManagedUser; import cokr.xit.base.web.ApplicationController; import cokr.xit.fims.cmmn.CmmnUtil; import cokr.xit.fims.cmmn.Print; +import cokr.xit.fims.cmmn.PrintOption; import cokr.xit.fims.cmmn.hwp.format.DlbrDecsnList; import cokr.xit.fims.cmmn.service.bean.StngBean; import cokr.xit.fims.excl.LevyExclQuery; @@ -31,7 +32,6 @@ import cokr.xit.fims.excl.OpnnSbmsn; import cokr.xit.fims.excl.service.OpnnSbmsnService; import cokr.xit.fims.excl.service.bean.OpnnSbmsnBean; import cokr.xit.fims.mngt.service.bean.FactionBean; -import cokr.xit.fims.sprt.PrintOption; import cokr.xit.foundation.UserInfo; import cokr.xit.foundation.data.DataObject; diff --git a/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java b/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java index 0e2dc017..aa1389e0 100644 --- a/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java +++ b/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java @@ -24,7 +24,10 @@ import cokr.xit.base.user.ManagedUser; import cokr.xit.base.web.ApplicationController; import cokr.xit.fims.cmmn.CmmnQuery; import cokr.xit.fims.cmmn.CmmnUtil; +import cokr.xit.fims.cmmn.OtptStngQuery; import cokr.xit.fims.cmmn.Print; +import cokr.xit.fims.cmmn.PrintOption; +import cokr.xit.fims.cmmn.dao.OtptStngMapper; import cokr.xit.fims.cmmn.pdf.print.format.Advntce; import cokr.xit.fims.cmmn.service.bean.StngBean; import cokr.xit.fims.crdn.Crdn; @@ -38,11 +41,8 @@ import cokr.xit.fims.sndb.service.SndngDtlService; import cokr.xit.fims.sndb.service.SndngService; import cokr.xit.fims.sndb.service.SvbtcService; import cokr.xit.fims.sndb.service.bean.SvbtcBean; -import cokr.xit.fims.sprt.OtptStngQuery; -import cokr.xit.fims.sprt.PrintOption; import cokr.xit.fims.sprt.SprtQuery; import cokr.xit.fims.sprt.dao.IntegrationSearchMapper; -import cokr.xit.fims.sprt.dao.OtptStngMapper; import cokr.xit.fims.sprt.service.IntegrationSearchService; import cokr.xit.fims.sprt.service.bean.MediaBean; import cokr.xit.foundation.UserInfo; diff --git a/src/main/java/cokr/xit/fims/sprt/service/bean/IntegrationSearchServiceBean.java b/src/main/java/cokr/xit/fims/sprt/service/bean/IntegrationSearchServiceBean.java index 3a9ed972..4acffe6b 100644 --- a/src/main/java/cokr/xit/fims/sprt/service/bean/IntegrationSearchServiceBean.java +++ b/src/main/java/cokr/xit/fims/sprt/service/bean/IntegrationSearchServiceBean.java @@ -7,12 +7,12 @@ import javax.annotation.Resource; import org.springframework.stereotype.Service; import cokr.xit.base.file.service.bean.FileBean; +import cokr.xit.fims.cmmn.dao.OtptStngMapper; import cokr.xit.fims.cmmn.service.bean.StngBean; import cokr.xit.fims.crdn.dao.CrdnListMapper; import cokr.xit.fims.mngt.service.bean.FactionBean; import cokr.xit.fims.sprt.SprtQuery; import cokr.xit.fims.sprt.dao.IntegrationSearchMapper; -import cokr.xit.fims.sprt.dao.OtptStngMapper; import cokr.xit.fims.sprt.service.IntegrationSearchService; import cokr.xit.foundation.component.AbstractServiceBean; import cokr.xit.foundation.data.DataObject; diff --git a/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java b/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java index b454daa6..2899a85c 100644 --- a/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java +++ b/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java @@ -30,7 +30,11 @@ import cokr.xit.base.user.ManagedUser; import cokr.xit.base.user.dao.UserMapper; import cokr.xit.base.web.ApplicationController; import cokr.xit.fims.cmmn.CmmnUtil; +import cokr.xit.fims.cmmn.OtptForm; +import cokr.xit.fims.cmmn.OtptStngQuery; import cokr.xit.fims.cmmn.Print; +import cokr.xit.fims.cmmn.PrintOption; +import cokr.xit.fims.cmmn.dao.OtptStngMapper; import cokr.xit.fims.cmmn.hwp.format.CrdnConfirm; import cokr.xit.fims.cmmn.hwp.format.CrdnList; import cokr.xit.fims.cmmn.hwp.format.RcvmtConfirm; @@ -38,6 +42,7 @@ import cokr.xit.fims.cmmn.hwp.format.ReportOnClaims; import cokr.xit.fims.cmmn.hwp.format.RequestForDelivery; import cokr.xit.fims.cmmn.pdf.print.format.Advntce; import cokr.xit.fims.cmmn.pdf.print.format.Nht; +import cokr.xit.fims.cmmn.service.bean.OtptStngBean; import cokr.xit.fims.cmmn.service.bean.StngBean; import cokr.xit.fims.crdn.Crdn; import cokr.xit.fims.crdn.CrdnQuery; @@ -46,15 +51,10 @@ import cokr.xit.fims.crdn.dao.GlobalStngMapper; import cokr.xit.fims.mngt.service.bean.FactionBean; import cokr.xit.fims.mngt.service.bean.TaskBean; import cokr.xit.fims.sprt.Keyword; -import cokr.xit.fims.sprt.OtptForm; -import cokr.xit.fims.sprt.OtptStngQuery; -import cokr.xit.fims.sprt.PrintOption; import cokr.xit.fims.sprt.SprtQuery; import cokr.xit.fims.sprt.dao.IntegrationSearchMapper; -import cokr.xit.fims.sprt.dao.OtptStngMapper; import cokr.xit.fims.sprt.service.IntegrationSearchService; import cokr.xit.fims.sprt.service.bean.MediaBean; -import cokr.xit.fims.sprt.service.bean.OtptStngBean; import cokr.xit.fims.stat.dao.StatMapper; import cokr.xit.foundation.UserInfo; import cokr.xit.foundation.data.DataObject; diff --git a/src/main/java/cokr/xit/fims/task/web/CmnController.java b/src/main/java/cokr/xit/fims/task/web/CmnController.java index cfd40076..46d5613e 100644 --- a/src/main/java/cokr/xit/fims/task/web/CmnController.java +++ b/src/main/java/cokr/xit/fims/task/web/CmnController.java @@ -8,14 +8,14 @@ import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.ModelAndView; import cokr.xit.fims.cmmn.CmmnQuery; +import cokr.xit.fims.cmmn.OtptForm; +import cokr.xit.fims.cmmn.OtptStngQuery; +import cokr.xit.fims.cmmn.PrintOption; import cokr.xit.fims.crdn.Crdn; import cokr.xit.fims.mngt.FineIntegrationDepartment; import cokr.xit.fims.mngt.FineIntegrationSigungu; import cokr.xit.fims.mngt.Task; import cokr.xit.fims.mngt.VltnQuery; -import cokr.xit.fims.sprt.OtptForm; -import cokr.xit.fims.sprt.OtptStngQuery; -import cokr.xit.fims.sprt.PrintOption; import cokr.xit.fims.sprt.SprtQuery; import cokr.xit.fims.stat.StatQuery; diff --git a/src/main/java/cokr/xit/fims/task/web/DpvController.java b/src/main/java/cokr/xit/fims/task/web/DpvController.java index 47f8e13e..6ecbfe34 100644 --- a/src/main/java/cokr/xit/fims/task/web/DpvController.java +++ b/src/main/java/cokr/xit/fims/task/web/DpvController.java @@ -7,6 +7,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.ModelAndView; +import cokr.xit.fims.cmmn.PrintOption; import cokr.xit.fims.crdn.Crdn; import cokr.xit.fims.crdn.CrdnQuery; import cokr.xit.fims.cvlc.CrdnCvlcpt; @@ -32,7 +33,6 @@ import cokr.xit.fims.sndb.SndngDtl; import cokr.xit.fims.sndb.Svbtc; import cokr.xit.fims.sprt.CvlcptDscsn; import cokr.xit.fims.sprt.CvlcptDscsnQuery; -import cokr.xit.fims.sprt.PrintOption; import cokr.xit.fims.sprt.SprtQuery; @Controller diff --git a/src/main/resources/sql/mapper/fims/sprt/otptStng-mapper.xml b/src/main/resources/sql/mapper/fims/cmmn/otptStng-mapper.xml similarity index 91% rename from src/main/resources/sql/mapper/fims/sprt/otptStng-mapper.xml rename to src/main/resources/sql/mapper/fims/cmmn/otptStng-mapper.xml index 8b768402..7d1644ab 100644 --- a/src/main/resources/sql/mapper/fims/sprt/otptStng-mapper.xml +++ b/src/main/resources/sql/mapper/fims/cmmn/otptStng-mapper.xml @@ -1,8 +1,8 @@ - + - /* 출력물 기본 설정 조회(otptStngMapper.selectOtptBscStng) */ SELECT OTPT_BSC_ID , SGG_CD @@ -21,7 +21,7 @@ SELECT OTPT_BSC_ID AND PAPER_SE_CD = #{paperSeCd} - + /* 출력 기본 설정 등록(otptStngMapper.insertBscStng) */ SELECT @@ -63,7 +63,7 @@ INSERT ) - + /* 출력 기본 설정 수정(otptStngMapper.updateBscStng) */ UPDATE TB_OTPT_BSC_STNG SET FOLD_LINE_PSTN_SE_CD = #{foldLinePstnSeCd} @@ -78,7 +78,7 @@ UPDATE TB_OTPT_BSC_STNG AND USE_YN = 'Y' - /* 출력 항목 설정 조회(otptStngMapper.selectOtptArtclStngList) */ SELECT OTPT_FORM_ID , SGG_CD @@ -106,7 +106,7 @@ SELECT OTPT_FORM_ID ORDER BY OTPT_ARTCL_ORDR - + /* 출력 설정 등록(otptStngMapper.insertArtclStng) */ SELECT @@ -160,7 +160,7 @@ INSERT ) - + /* 출력 설정 수정(otptStngMapper.updateArtclStng) */ UPDATE TB_OTPT_FORM_STNG SET OTPT_ARTCL_NM = #{otptArtclNm} @@ -181,7 +181,7 @@ UPDATE TB_OTPT_FORM_STNG AND USE_YN = 'Y' - + /* 출력 설정 삭제(otptStngMapper.deleteArtclStng) */ UPDATE TB_OTPT_FORM_STNG SET USE_YN = 'N'