From d4eccdacda6490883effcf453bea39a0453e77e0 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Wed, 28 Feb 2024 09:18:02 +0900 Subject: [PATCH] =?UTF-8?q?=ED=95=9C=EA=B8=80=20=EC=84=9C=EC=8B=9D=20?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EB=8B=A4=EC=9A=B4=EB=A1=9C=EB=93=9C=20?= =?UTF-8?q?=EB=A1=9C=EA=B7=B8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cokr/xit/base/file/hwp/HWPWriter.java | 5 +++++ .../xit/fims/cmmn/hwp/format/CrdnConfirm.java | 4 ++++ .../xit/fims/cmmn/hwp/format/CrdnList.java | 20 +++++++++++++++++++ .../xit/fims/cmmn/hwp/format/CvlcptOrgn.java | 6 ++++++ .../fims/cmmn/hwp/format/DlbrDecsnList.java | 20 +++++++++++++++++++ .../xit/fims/cmmn/hwp/format/HWPFormat.java | 2 ++ .../fims/cmmn/hwp/format/RcvmtConfirm.java | 18 +++++++++++++++++ .../fims/cmmn/hwp/format/ReportOnClaims.java | 12 +++++++++++ .../cmmn/hwp/format/RequestForDelivery.java | 11 ++++++++++ .../xit/fims/cmmn/hwp/format/SvbtcList.java | 13 ++++++++++++ .../xit/fims/cvlc/web/Cvlc01Controller.java | 2 ++ .../xit/fims/excl/web/Excl02Controller.java | 3 ++- .../xit/fims/sndb/web/Sndb01Controller.java | 3 ++- .../xit/fims/sprt/web/Sprt01Controller.java | 16 +++++++++++---- 14 files changed, 129 insertions(+), 6 deletions(-) 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 0e873951..49ac314f 100644 --- a/src/main/java/cokr/xit/base/file/hwp/HWPWriter.java +++ b/src/main/java/cokr/xit/base/file/hwp/HWPWriter.java @@ -24,6 +24,11 @@ public class HWPWriter { public void setFormat(HWPFormat format) { this.format = format; }; + + public HWPFormat getFormat() { + return this.format; + }; + public void setPrint(Print print) { this.print = print; }; 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 d24a2a08..c6c24fee 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 @@ -16,6 +16,10 @@ import kr.dogfoot.hwplib.object.HWPFile; */ public class CrdnConfirm extends HWPFormat { + @Override + public List getDownloadDataNames() { + return List.of("과태료구분","차량번호","단속일시","위반내용","단속장소","단속동","단속조","소유자명","소유자주소"); + } @Override public void setting(Print print) { 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 c18c97d0..93ac8b82 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 @@ -1,5 +1,6 @@ package cokr.xit.fims.cmmn.hwp.format; +import java.util.ArrayList; import java.util.List; import cokr.xit.fims.cmmn.CmmnUtil; @@ -16,6 +17,25 @@ import kr.dogfoot.hwplib.object.HWPFile; */ public class CrdnList extends HWPFormat { + @Override + public List getDownloadDataNames() { + List list = new ArrayList<>(); + list.add("과태료구분"); + list.add("시군구명"); + list.add("단속일시"); + list.add("단속장소"); + list.add("차량번호"); + list.add("대체차량번호"); + list.add("고지번호"); + list.add("부과금액"); + list.add("가상계좌번호"); + list.add("전자납부번호"); + list.add("처리상태"); + list.add("처리일자"); + list.add("납부기한"); + list.add("수납일자"); + return list; + } @Override public void setting(Print print) { 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 433120f9..a168b5c4 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 @@ -19,6 +19,11 @@ import kr.dogfoot.hwplib.reader.HWPReader; public class CvlcptOrgn extends HWPFormat { + @Override + public List getDownloadDataNames() { + return List.of("접수번호","신청자","접수일자","처리기한","민원목록번호","민원내용"); + } + @Override public void setting(Print print) { print.setFormatName("cvlcptOrgn"); @@ -89,4 +94,5 @@ public class CvlcptOrgn extends HWPFormat { } } + } 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 546b0292..fbe98ba1 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 @@ -1,5 +1,6 @@ package cokr.xit.fims.cmmn.hwp.format; +import java.util.ArrayList; import java.util.List; import cokr.xit.fims.cmmn.Print; @@ -10,6 +11,23 @@ import kr.dogfoot.hwplib.object.HWPFile; public class DlbrDecsnList extends HWPFormat { + @Override + public List getDownloadDataNames() { + List list = new ArrayList<>(); + list.add("접수번호"); + list.add("접수일"); + list.add("위반정보"); + list.add("진술자명"); + list.add("진술자생년월일"); + list.add("소유주관계"); + list.add("진술자주소"); + list.add("진술자연락처"); + list.add("차량번호"); + list.add("단속일시"); + list.add("단속장소"); + list.add("의견체출내용"); + return list; + } @Override public void setting(Print print) { @@ -77,4 +95,6 @@ public class DlbrDecsnList extends HWPFormat { baseFileEditor.set("담당자검토의견", dataObject.string("PIC_RVW_OPNN")); } + + } 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 9e9137b8..3373b74d 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 @@ -152,4 +152,6 @@ public abstract class HWPFormat { public abstract void writeSingleDataInfo(HWPFile baseFile, HWPFile attachFile, DataObject dataObject, Print print); + public abstract List getDownloadDataNames(); + } 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 7c8c9f3d..a2078a0a 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 @@ -1,5 +1,6 @@ package cokr.xit.fims.cmmn.hwp.format; +import java.util.ArrayList; import java.util.List; import cokr.xit.fims.cmmn.CmmnUtil; @@ -16,6 +17,23 @@ import kr.dogfoot.hwplib.object.HWPFile; */ public class RcvmtConfirm extends HWPFormat { + @Override + public List getDownloadDataNames() { + List list = new ArrayList<>(); + list.add("위반명"); + list.add("위반차량"); + list.add("대체차량"); + list.add("위반금액"); + list.add("단속일자"); + list.add("단속장소"); + list.add("소유자"); + list.add("주민번호"); + list.add("소유자주소"); + list.add("고지번호"); + list.add("수납일자"); + list.add("수납금액"); + return list; + } @Override public void setting(Print print) { 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 3b8d1a4e..5762476b 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 @@ -1,5 +1,6 @@ package cokr.xit.fims.cmmn.hwp.format; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -20,6 +21,17 @@ import kr.dogfoot.hwplib.object.HWPFile; */ public class ReportOnClaims extends HWPFormat { + @Override + public List getDownloadDataNames() { + List list = new ArrayList<>(); + list.add("과세번호"); + list.add("법정기일"); + list.add("세목"); + list.add("세액"); + list.add("가산금"); + list.add("합계"); + return list; + } @Override public void setting(Print print) { 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 c1a1bd79..e262a3ba 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 @@ -1,5 +1,6 @@ package cokr.xit.fims.cmmn.hwp.format; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -20,6 +21,16 @@ import kr.dogfoot.hwplib.object.HWPFile; */ public class RequestForDelivery extends HWPFormat { + @Override + public List getDownloadDataNames() { + List list = new ArrayList<>(); + list.add("징수과목"); + list.add("고지번호"); + list.add("과태료계"); + list.add("법정기일"); + return list; + } + @Override public void setting(Print print) { print.setFormatName("requestForDelivery"); 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 e0b3505b..eb644c0b 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 @@ -1,5 +1,6 @@ package cokr.xit.fims.cmmn.hwp.format; +import java.util.ArrayList; import java.util.List; import cokr.xit.fims.cmmn.Print; @@ -11,6 +12,18 @@ import kr.dogfoot.hwplib.object.HWPFile; public class SvbtcList extends HWPFormat { + @Override + public List getDownloadDataNames() { + List list = new ArrayList<>(); + list.add("수령인명"); + list.add("수령인주소"); + list.add("차량번호"); + list.add("위반일자"); + list.add("위반장소"); + list.add("반송일자"); + list.add("반송사유"); + return list; + } @Override public void setting(Print print) { 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 be78b681..56d5d0f8 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java @@ -258,6 +258,8 @@ public class Cvlc01Controller extends ApplicationController { Map result = hwpWriter.makeFileFromHwpFormat("info", printOption, dataObjectList); mav.addAllObjects(result); + mav.addObject("downloadData", dataObjectList); + mav.addObject("dataNames", hwpWriter.getFormat().getDownloadDataNames()); return mav; } 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 a7c1788b..dbea5fde 100644 --- a/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java +++ b/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java @@ -365,7 +365,8 @@ public class Excl02Controller extends ApplicationController { ModelAndView mav = new ModelAndView("downloadView"); mav.addAllObjects(result); - + mav.addObject("downloadData", dataObjectList); + mav.addObject("dataNames", hwpWriter.getFormat().getDownloadDataNames()); return mav; } 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 aa1389e0..ef4110ff 100644 --- a/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java +++ b/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java @@ -1513,7 +1513,8 @@ public class Sndb01Controller extends ApplicationController { ModelAndView mav = new ModelAndView("jsonView"); mav.addAllObjects(result); - + mav.addObject("downloadData", dataObjectList); + mav.addObject("dataNames", hwpWriter.getFormat().getDownloadDataNames()); return mav; } 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 3a8a3fe4..88e75fb2 100644 --- a/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java +++ b/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java @@ -442,7 +442,7 @@ public class Sprt01Controller extends ApplicationController { CrdnQuery query = new CrdnQuery(); query.setCrdnIds(crdnIds); - List DataObjectList = crdnListMapper.selectCrackdownList(query); + List dataObjectList = crdnListMapper.selectCrackdownList(query); HWPWriter hwpWriter = new HWPWriter(); UserInfo userInfo = currentUser(); factionBean.initUserInfo(userInfo); @@ -454,10 +454,12 @@ public class Sprt01Controller extends ApplicationController { DataObject deptStngInfo = stngBean.getStng("dept"); hwpWriter.setFormat(new CrdnList()); - Map result = hwpWriter.makeFileFromHwpFormat("list", printOption, DataObjectList); + Map result = hwpWriter.makeFileFromHwpFormat("list", printOption, dataObjectList); ModelAndView mav = new ModelAndView("downloadView"); mav.addAllObjects(result); + mav.addObject("downloadData", dataObjectList); + mav.addObject("dataNames", hwpWriter.getFormat().getDownloadDataNames()); return mav; } @@ -507,6 +509,8 @@ public class Sprt01Controller extends ApplicationController { ModelAndView mav = new ModelAndView("downloadView"); mav.addAllObjects(result); + mav.addObject("downloadData", dataObjectList); + mav.addObject("dataNames", hwpWriter.getFormat().getDownloadDataNames()); return mav; } @@ -564,6 +568,8 @@ public class Sprt01Controller extends ApplicationController { hwpWriter.setFormat(new RequestForDelivery()); Map result = hwpWriter.makeFileFromHwpFormat("list", printOption, dataObjectList); mav.addAllObjects(result); + mav.addObject("downloadData", dataObjectList); + mav.addObject("dataNames", hwpWriter.getFormat().getDownloadDataNames()); return mav; } @@ -612,7 +618,8 @@ public class Sprt01Controller extends ApplicationController { Map result = hwpWriter.makeFileFromHwpFormat("list", printOption, dataObjectList); mav.addAllObjects(result); - + mav.addObject("downloadData", dataObjectList); + mav.addObject("dataNames", hwpWriter.getFormat().getDownloadDataNames()); return mav; } @@ -642,7 +649,8 @@ public class Sprt01Controller extends ApplicationController { hwpWriter.setFormat(new RcvmtConfirm()); Map result = hwpWriter.makeFileFromHwpFormat("info", printOption, dataObjectList); mav.addAllObjects(result); - + mav.addObject("downloadData", dataObjectList); + mav.addObject("dataNames", hwpWriter.getFormat().getDownloadDataNames()); return mav; }