From b76e1dc44b9e66377fbd86f2b323c745fdb31e91 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Mon, 4 Dec 2023 14:29:54 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B6=9C=EB=A0=A5=EC=84=A4=EC=A0=95=20?= =?UTF-8?q?=ED=85=8C=EC=9D=B4=EB=B8=94=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cokr/xit/fims/cmmn/pdf/PDFPrintUtil.java | 6 ++--- .../java/cokr/xit/fims/sprt/OtptForm.java | 2 +- .../java/cokr/xit/fims/sprt/OtptStng.java | 2 +- .../cokr/xit/fims/sprt/OtptStngQuery.java | 10 ++++----- .../java/cokr/xit/fims/sprt/PrintOption.java | 2 +- .../sprt/service/bean/Sprt01ServiceBean.java | 10 ++++----- .../xit/fims/sprt/web/Sprt01Controller.java | 2 +- .../sql/mapper/fims/sprt/otptStng-mapper.xml | 22 +++++++++---------- .../WEB-INF/jsp/fims/sprt/sprt01140-info.jsp | 2 +- .../WEB-INF/jsp/fims/sprt/sprt01200-main.jsp | 14 ++++++------ 10 files changed, 36 insertions(+), 36 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 6dc5374b..6d9fca3d 100644 --- a/src/main/java/cokr/xit/fims/cmmn/pdf/PDFPrintUtil.java +++ b/src/main/java/cokr/xit/fims/cmmn/pdf/PDFPrintUtil.java @@ -150,7 +150,7 @@ public class PDFPrintUtil extends PrintUtil { } } - public float[] getPstnStng(DefaultOtptStng prototypeStng, DataObject sggStng, String otptPaperSeCd) { + public float[] getPstnStng(DefaultOtptStng prototypeStng, DataObject sggStng, String paperSeCd) { if(!sggStng.string("LEFT_PSTN").equals("") && !sggStng.string("TOP_PSTN").equals("")) { return new float[] { sggStng.number("LEFT_PSTN").floatValue(), @@ -158,8 +158,8 @@ public class PDFPrintUtil extends PrintUtil { }; } else { return new float[] { - prototypeStng.getLeftPstn(otptPaperSeCd), - prototypeStng.getTopPstn(otptPaperSeCd) + prototypeStng.getLeftPstn(paperSeCd), + prototypeStng.getTopPstn(paperSeCd) }; } } diff --git a/src/main/java/cokr/xit/fims/sprt/OtptForm.java b/src/main/java/cokr/xit/fims/sprt/OtptForm.java index e62ad2a1..856f4ebb 100644 --- a/src/main/java/cokr/xit/fims/sprt/OtptForm.java +++ b/src/main/java/cokr/xit/fims/sprt/OtptForm.java @@ -12,7 +12,7 @@ public class OtptForm extends AbstractEntity { private String sggCd; private String taskSeCd; private String sndngSeCd; - private String otptPaperSeCd; + private String paperSeCd; private List otptStngList; private String[] otptFormIDs; } diff --git a/src/main/java/cokr/xit/fims/sprt/OtptStng.java b/src/main/java/cokr/xit/fims/sprt/OtptStng.java index 7cf9d20c..ad7902e5 100644 --- a/src/main/java/cokr/xit/fims/sprt/OtptStng.java +++ b/src/main/java/cokr/xit/fims/sprt/OtptStng.java @@ -21,5 +21,5 @@ public class OtptStng extends AbstractEntity { private String sggCd; private String taskSeCd; private String sndngSeCd; - private String otptPaperSeCd; + private String paperSeCd; } diff --git a/src/main/java/cokr/xit/fims/sprt/OtptStngQuery.java b/src/main/java/cokr/xit/fims/sprt/OtptStngQuery.java index 2bd1ba10..ee0f5c10 100644 --- a/src/main/java/cokr/xit/fims/sprt/OtptStngQuery.java +++ b/src/main/java/cokr/xit/fims/sprt/OtptStngQuery.java @@ -10,7 +10,7 @@ public class OtptStngQuery extends CmmnQuery { private String sndngSeCd; //출력용지구분코드 - private String otptPaperSeCd; + private String paperSeCd; public String getSndngSeCd() { return ifEmpty(sndngSeCd, () -> null); @@ -21,12 +21,12 @@ public class OtptStngQuery extends CmmnQuery { return self(); } - public String getOtptPaperSeCd() { - return ifEmpty(otptPaperSeCd, () -> null); + public String getPaperSeCd() { + return ifEmpty(paperSeCd, () -> null); } - public T setOtptPaperSeCd(String otptPaperSeCd) { - this.otptPaperSeCd = otptPaperSeCd; + public T setPaperSeCd(String paperSeCd) { + this.paperSeCd = paperSeCd; return self(); } diff --git a/src/main/java/cokr/xit/fims/sprt/PrintOption.java b/src/main/java/cokr/xit/fims/sprt/PrintOption.java index 30f9928b..80780dfc 100644 --- a/src/main/java/cokr/xit/fims/sprt/PrintOption.java +++ b/src/main/java/cokr/xit/fims/sprt/PrintOption.java @@ -17,7 +17,7 @@ public class PrintOption { /** * 용지구분 */ - private String otptPaperSeCd; + private String paperSeCd; /** * 업무구분 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 0dca35ed..8fba0db2 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 @@ -304,14 +304,14 @@ public class Sprt01ServiceBean extends AbstractServiceBean implements Sprt01Serv try { - String otptPaperSeCd = printOption.getOtptPaperSeCd(); + String paperSeCd = printOption.getPaperSeCd(); PDFPrintUtil pdfPrintUtil = new PDFPrintUtil(); UserInfo userInfo = currentUser(); factionBean.initUserInfo(userInfo); pdfPrintUtil.setPrintRequestUserInfo(userInfo); // - pdfPrintUtil.setting(otptPaperSeCd); + pdfPrintUtil.setting(paperSeCd); String resultFilePath = pdfPrintUtil.filePathForNewFile(); @@ -324,7 +324,7 @@ public class Sprt01ServiceBean extends AbstractServiceBean implements Sprt01Serv //용지 크기 설정 PDRectangle paper = null; - if(otptPaperSeCd.equals("01")) { + if(paperSeCd.equals("01")) { paper = PDRectangle.A4; } else { paper = PDRectangle.LETTER; @@ -345,7 +345,7 @@ public class Sprt01ServiceBean extends AbstractServiceBean implements Sprt01Serv List prototypeStngList = pdfFormat.getPrototypeStngs(); otptStngQuery.setSndngSeCd(sndngSeCd); - otptStngQuery.setOtptPaperSeCd(otptPaperSeCd); + otptStngQuery.setPaperSeCd(paperSeCd); List otptStng = otptStngMapper.selectOtptStngList(otptStngQuery); @@ -368,7 +368,7 @@ public class Sprt01ServiceBean extends AbstractServiceBean implements Sprt01Serv DefaultOtptStng prototypeStng = prototypeStngList.stream() .filter(item -> item.getOtptNm().equals(otptNm)).toList().get(0); - float[] pstn = pdfPrintUtil.getPstnStng(prototypeStng, otptItemStng, otptPaperSeCd); + float[] pstn = pdfPrintUtil.getPstnStng(prototypeStng, otptItemStng, paperSeCd); float[] size = pdfPrintUtil.getSize(prototypeStng, otptItemStng); boolean forPost = prototypeStng.isForPost(); 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 bd013482..726f7acc 100644 --- a/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java +++ b/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java @@ -469,7 +469,7 @@ public class Sprt01Controller extends ApplicationController { filter(item -> item.getCode().equals(otptStngQuery.getSndngSeCd())).findFirst().get().getValue(); String otptPaperSeNm = FIM078.stream(). - filter(item -> item.getCode().equals(otptStngQuery.getOtptPaperSeCd())).findFirst().get().getValue(); + filter(item -> item.getCode().equals(otptStngQuery.getPaperSeCd())).findFirst().get().getValue(); String otptStngTitle = "["+sggNm+", "+taskSeNm+"]"+" "+sndngSeNm+" "+"("+otptPaperSeNm+")"; mav.addObject("otptStngTitle", otptStngTitle); diff --git a/src/main/resources/sql/mapper/fims/sprt/otptStng-mapper.xml b/src/main/resources/sql/mapper/fims/sprt/otptStng-mapper.xml index c239b082..184d992d 100644 --- a/src/main/resources/sql/mapper/fims/sprt/otptStng-mapper.xml +++ b/src/main/resources/sql/mapper/fims/sprt/otptStng-mapper.xml @@ -8,7 +8,7 @@ SELECT OTPT_FORM_ID , SGG_CD , TASK_SE_CD , SNDNG_SE_CD - , OTPT_PAPER_SE_CD + , PAPER_SE_CD , OTPT_NM , LEFT_PSTN , TOP_PSTN @@ -19,29 +19,29 @@ SELECT OTPT_FORM_ID , FONT_COLOR , FONT_STYLE , TEXT_SORT - FROM TB_OTPT_FORM + FROM TB_OTPT_FORM_STNG WHERE USE_YN = 'Y' AND SGG_CD = #{sggCd} AND TASK_SE_CD = #{taskSeCd} AND SNDNG_SE_CD = #{sndngSeCd} - AND OTPT_PAPER_SE_CD = #{otptPaperSeCd} + AND PAPER_SE_CD = #{paperSeCd} /* 출력 설정 등록(otptStngMapper.insertStng) */ SELECT - CONCAT(DATE_FORMAT(CURRENT_DATE, '%Y'), LPAD(CAST(IFNULL(MAX(SUBSTRING(OTPT_FORM_ID,5)) + 1, 1) AS INT), 16, '0')) + LPAD(CAST(IFNULL(MAX(OTPT_FORM_ID) + 1, 1) AS INT), 10, '0') AS NEW_ID -FROM TB_OTPT_FORM +FROM TB_OTPT_FORM_STNG INSERT - INTO TB_OTPT_FORM ( + INTO TB_OTPT_FORM_STNG ( OTPT_FORM_ID , SGG_CD , TASK_SE_CD , SNDNG_SE_CD - , OTPT_PAPER_SE_CD + , PAPER_SE_CD , OTPT_NM , LEFT_PSTN , TOP_PSTN @@ -60,7 +60,7 @@ INSERT , #{sggCd} , #{taskSeCd} , #{sndngSeCd} - , #{otptPaperSeCd} + , #{paperSeCd} , #{otptNm} , #{leftPstn} , #{topPstn} @@ -79,7 +79,7 @@ INSERT /* 출력 설정 수정(otptStngMapper.updateStng) */ -UPDATE TB_OTPT_FORM +UPDATE TB_OTPT_FORM_STNG SET OTPT_NM = #{otptNm} , LEFT_PSTN = #{leftPstn} , TOP_PSTN = #{topPstn} @@ -97,14 +97,14 @@ UPDATE TB_OTPT_FORM /* 출력 설정 삭제(otptStngMapper.deleteStng) */ -UPDATE TB_OTPT_FORM +UPDATE TB_OTPT_FORM_STNG SET USE_YN = 'N' , MDFCN_DT = , MDFR = #{modifiedBy} WHERE SGG_CD = #{sggCd} AND TASK_SE_CD = #{taskSeCd} AND SNDNG_SE_CD = #{sndngSeCd} - AND OTPT_PAPER_SE_CD = #{otptPaperSeCd} + AND PAPER_SE_CD = #{paperSeCd} AND OTPT_FORM_ID NOT IN (#{OTPT_FORM_ID}) diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01140-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01140-info.jsp index 51e3d68d..c06cff6c 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01140-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01140-info.jsp @@ -134,7 +134,7 @@ $(document).ready(function(){ taskSeCd : taskSeCd }; if(fileType == "pdf" || fileType == "preview"){ - submitParam.otptPaperSeCd = "01"; + submitParam.paperSeCd = "01"; } ajax.post({ diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01200-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01200-main.jsp index 68aaa7e3..08d38f2f 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01200-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01200-main.jsp @@ -21,7 +21,7 @@ 용지 - @@ -97,7 +97,7 @@ - + @@ -246,7 +246,7 @@ $(document).ready(function(){ $("#frmEdit--${pageName}").find("[name='sggCd']").val(query.sggCd); $("#frmEdit--${pageName}").find("[name='taskSeCd']").val(query.taskSeCd); $("#frmEdit--${pageName}").find("[name='sndngSeCd']").val(query.sndngSeCd); - $("#frmEdit--${pageName}").find("[name='otptPaperSeCd']").val(query.otptPaperSeCd); + $("#frmEdit--${pageName}").find("[name='paperSeCd']").val(query.paperSeCd); $("#currentOtpt--${pageName}").text(resp.otptStngTitle); $P.otptStngMap = resp.otptStngMap; @@ -330,7 +330,7 @@ $(document).ready(function(){ $P.fnGetProto = (prototypeList, otptNm, stngItemAttrNm) => { if(stngItemAttrNm == "leftPstn" || stngItemAttrNm == "topPstn"){ - var paperSeCd = $("#frmEdit--${pageName}").find("[name='otptPaperSeCd']").val(); + var paperSeCd = $("#frmEdit--${pageName}").find("[name='paperSeCd']").val(); var paperNm = ""; if(paperSeCd == "01"){ paperNm = "a4"; @@ -384,7 +384,7 @@ $(document).ready(function(){ //행 추가 $P.addRow = (otptNm) => { - var paperSeCd = $("#frmEdit--${pageName}").find("[name='otptPaperSeCd']").val(); + var paperSeCd = $("#frmEdit--${pageName}").find("[name='paperSeCd']").val(); var prototypeList; var tbodyId; @@ -545,7 +545,7 @@ $(document).ready(function(){ sggCd : query.sggCd, taskSeCd : query.taskSeCd, sndngSeCd : query.sndngSeCd, - otptPaperSeCd : query.otptPaperSeCd + paperSeCd : query.paperSeCd }; rowArr.push(row); }); @@ -584,7 +584,7 @@ $(document).ready(function(){ $("#frmSearch--${pageName}").find("[name='sggCd']").val(query.sggCd); $("#frmSearch--${pageName}").find("[name='taskSeCd']").val(query.taskSeCd); $("#frmSearch--${pageName}").find("[name='sndngSeCd']").val(query.sndngSeCd); - $("#frmSearch--${pageName}").find("[name='otptPaperSeCd']").val(query.otptPaperSeCd); + $("#frmSearch--${pageName}").find("[name='paperSeCd']").val(query.paperSeCd); $("#btnLoad--${pageName}").click();