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 0967a668..b7978458 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 @@ -76,7 +76,9 @@ public class Advntce extends PDFFormat { text("otptDD","출력일",""), text("offcsText","관인명",""), - image("offcs","관인이미지","").size(20, 20) + image("offcs","관인이미지","").size(20, 20), + + text("undefined","(미정)","미정항목") ); } @@ -224,6 +226,9 @@ public class Advntce extends PDFFormat { result = printOption.getGlobalVariable().get("offcsFilePath"); } + case "undefined" -> { + result = defaultValue; + } } return result; @@ -274,6 +279,7 @@ public class Advntce extends PDFFormat { case "postSenderFax" -> { result = printOption.getGlobalVariable().get("deptFxno"); } + } return result; } diff --git a/src/main/java/cokr/xit/fims/sprt/OtptStng.java b/src/main/java/cokr/xit/fims/sprt/OtptStng.java index 2f0812dc..2e2e8c39 100644 --- a/src/main/java/cokr/xit/fims/sprt/OtptStng.java +++ b/src/main/java/cokr/xit/fims/sprt/OtptStng.java @@ -18,6 +18,7 @@ public class OtptStng extends AbstractEntity { private String fontSz; //글자크기 private String fontColor; //글자색 private String fontStyle; //글자스타일 + private String otptArtclOrdr; //출력항목순서 private String sggCd; private String taskSeCd; private String sndngSeCd; 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 5bb81c3d..de137f5f 100644 --- a/src/main/resources/sql/mapper/fims/sprt/otptStng-mapper.xml +++ b/src/main/resources/sql/mapper/fims/sprt/otptStng-mapper.xml @@ -52,6 +52,7 @@ INSERT , FONT_SZ , FONT_COLOR , FONT_STYLE + , OTPT_ARTCL_ORDR , USE_YN , REG_DT , RGTR @@ -71,6 +72,7 @@ INSERT , #{fontSz} , #{fontColor} , #{fontStyle} + , #{otptArtclOrdr} , 'Y' , , #{createdBy} @@ -80,19 +82,21 @@ INSERT /* 출력 설정 수정(otptStngMapper.updateStng) */ UPDATE TB_OTPT_FORM_STNG - SET OTPT_ARTCL_NM = #{otptArtclNm} - , LEFT_PSTN = #{leftPstn} - , TOP_PSTN = #{topPstn} - , WIDTH_SZ = #{widthSz} - , HEIGHT_SZ = #{heightSz} - , TEXT_SORT = #{textSort} - , FONT_NM = #{fontNm} - , FONT_SZ = #{fontSz} - , FONT_COLOR = #{fontColor} - , FONT_STYLE = #{fontStyle} - , MDFCN_DT = - , MDFR = #{modifiedBy} + SET OTPT_ARTCL_NM = #{otptArtclNm} + , LEFT_PSTN = #{leftPstn} + , TOP_PSTN = #{topPstn} + , WIDTH_SZ = #{widthSz} + , HEIGHT_SZ = #{heightSz} + , TEXT_SORT = #{textSort} + , FONT_NM = #{fontNm} + , FONT_SZ = #{fontSz} + , FONT_COLOR = #{fontColor} + , FONT_STYLE = #{fontStyle} + , OTPT_ARTCL_ORDR = #{otptArtclOrdr} + , MDFCN_DT = + , MDFR = #{modifiedBy} WHERE OTPT_FORM_ID = #{otptFormId} + AND USE_YN = 'Y' @@ -101,10 +105,11 @@ 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} + WHERE SGG_CD = #{sggCd} + AND TASK_SE_CD = #{taskSeCd} + AND SNDNG_SE_CD = #{sndngSeCd} AND PAPER_SE_CD = #{paperSeCd} + AND USE_YN = 'Y' AND OTPT_FORM_ID NOT IN (#{OTPT_FORM_ID}) 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 a37a23b4..379c4fc6 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 @@ -54,7 +54,7 @@