diff --git a/src/main/java/cokr/xit/fims/cmmn/pdf/DefaultOtptStng.java b/src/main/java/cokr/xit/fims/cmmn/pdf/DefaultOtptStng.java index ead2e342..92c40385 100644 --- a/src/main/java/cokr/xit/fims/cmmn/pdf/DefaultOtptStng.java +++ b/src/main/java/cokr/xit/fims/cmmn/pdf/DefaultOtptStng.java @@ -9,10 +9,10 @@ public class DefaultOtptStng { /** * 기본 출력 요소 생성 */ - public DefaultOtptStng(String componentType, String otptNm, String descrp, String otptBscVl){ + public DefaultOtptStng(String componentType, String otptNm, String dscrp, String otptBscVl){ this.componentType = componentType; this.otptNm=otptNm; - this.descrp=descrp; + this.dscrp=dscrp; this.otptBscVl=otptBscVl; this.widthSz=0; @@ -116,7 +116,7 @@ public class DefaultOtptStng { private String otptBscVl; //기본값 private boolean unique; //출력물 내 유일 요소 여부 private boolean forPost; //우편물 관련 요소 여부 - private String descrp; //출력항목 설명 + private String dscrp; //출력항목 설명 private String otptNm; //출력항목명 private Pstn a4; //A4 위치값 diff --git a/src/main/java/cokr/xit/fims/cmmn/pdf/PDFFormat.java b/src/main/java/cokr/xit/fims/cmmn/pdf/PDFFormat.java index 1cac2136..3302be91 100644 --- a/src/main/java/cokr/xit/fims/cmmn/pdf/PDFFormat.java +++ b/src/main/java/cokr/xit/fims/cmmn/pdf/PDFFormat.java @@ -27,15 +27,15 @@ public abstract class PDFFormat { /** * 텍스트 출력요소를 정의한다. */ - public DefaultOtptStng text(String otptNm, String descrp, String otptBscVl){ - return new DefaultOtptStng("text", otptNm, descrp, otptBscVl); + public DefaultOtptStng text(String otptNm, String dscrp, String otptBscVl){ + return new DefaultOtptStng("text", otptNm, dscrp, otptBscVl); } /** * 이미지 출력요소 정의한다. */ - public DefaultOtptStng image(String otptNm, String descrp, String otptBscVl){ - return new DefaultOtptStng("image", otptNm, descrp, otptBscVl); + public DefaultOtptStng image(String otptNm, String dscrp, String otptBscVl){ + return new DefaultOtptStng("image", otptNm, dscrp, otptBscVl); } /** @@ -81,7 +81,7 @@ public abstract class PDFFormat { .filter(item -> item.getOtptNm().equals(otptNm)).toList().get(0); otptStng.set("UNIQUE_YN", prototypeStng.isUnique() ? "Y" : "N"); - otptStng.set("DESCRP", prototypeStng.getDescrp()); + otptStng.set("DSCRP", prototypeStng.getDscrp()); otptStng.set("COMPONENT_TYPE", prototypeStng.getComponentType()); otptStng.set("POST_YN", prototypeStng.isForPost() ? "Y" : "N"); } 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 5764493d..e00e97b5 100644 --- a/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java +++ b/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java @@ -22,6 +22,7 @@ import cokr.xit.fims.sprt.PrintOption; import cokr.xit.fims.sprt.SprtQuery; import cokr.xit.fims.sprt.service.Sprt01Service; import cokr.xit.fims.sprt.service.bean.OtptStngBean; +import cokr.xit.fims.stat.dao.StatMapper; import cokr.xit.foundation.data.DataObject; /**통합 조회 서비스의 웹 컨트롤러 @@ -72,6 +73,9 @@ public class Sprt01Controller extends ApplicationController { @Resource(name="userMapper") protected UserMapper userMapper; + @Resource(name="statMapper") + protected StatMapper statMapper; + @Resource(name="otptStngBean") protected OtptStngBean otptStngBean; @@ -443,6 +447,31 @@ public class Sprt01Controller extends ApplicationController { mav.addObject("otptStngMap", otptStngMap); + String institute = currentUser().getInstitute(); + String account = currentUser().getAccount(); + ManagedUser currentUser = userMapper.getUser(account, institute); + String deptCd = currentUser.getDeptCode(); + String sggCd = globalStngMapper.selectSggCd(deptCd); + DataObject sgg = statMapper.selectSggByCode(sggCd); + String sggNm = sgg.string("NAME"); + + Map> commonCodes = getCodesOf("FIM054","FIM047","FIM078"); + List FIM047 = commonCodes.get("FIM047"); + List FIM054 = commonCodes.get("FIM054"); + List FIM078 = commonCodes.get("FIM078"); + + String taskSeNm = FIM054.stream(). + filter(item -> item.getCode().equals(otptStngQuery.getTaskSeCd())).findFirst().get().getValue(); + + String sndngSeNm = FIM047.stream(). + filter(item -> item.getCode().equals(otptStngQuery.getSndngSeCd())).findFirst().get().getValue(); + + String otptPaperSeNm = FIM078.stream(). + filter(item -> item.getCode().equals(otptStngQuery.getOtptPaperSeCd())).findFirst().get().getValue(); + + String otptStngTitle = "["+sggNm+", "+taskSeNm+"]"+" "+sndngSeNm+" "+"("+otptPaperSeNm+")"; + mav.addObject("otptStngTitle", otptStngTitle); + return mav; } 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 8b134651..d24333b7 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 @@ -41,8 +41,8 @@
- - + +
@@ -54,8 +54,9 @@ id="tableUnique--${pageName}" aria-describedby="DataTables_Table_0_info"> + 출력항목명 - 텍스트/이미지 + 유형 위치(좌) 위치(상) 사이즈(좌우) @@ -69,89 +70,6 @@ - @@ -160,8 +78,8 @@
- - + +
@@ -173,8 +91,9 @@ id="tableMultiple--${pageName}" aria-describedby="DataTables_Table_0_info"> + 출력항목명 - 텍스트/이미지 + 유형 위치(좌) 위치(상) 사이즈(좌우) @@ -188,89 +107,7 @@ - + @@ -289,7 +126,99 @@ + +