diff --git a/src/main/java/kcc/kccadr/adjReqMgrOff/web/AdjReqMgrOffLineController.java b/src/main/java/kcc/kccadr/adjReqMgrOff/web/AdjReqMgrOffLineController.java index 04e5b68b..749ffeaf 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrOff/web/AdjReqMgrOffLineController.java +++ b/src/main/java/kcc/kccadr/adjReqMgrOff/web/AdjReqMgrOffLineController.java @@ -1,5 +1,7 @@ package kcc.kccadr.adjReqMgrOff.web; +import java.io.OutputStreamWriter; +import java.io.PrintWriter; import java.util.ArrayList; import java.util.Iterator; import java.util.LinkedHashMap; @@ -9,6 +11,7 @@ import java.util.Properties; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -23,6 +26,8 @@ import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.support.RedirectAttributes; +import com.fasterxml.jackson.databind.ObjectMapper; + import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; import kcc.com.cmm.LoginVO; @@ -34,6 +39,7 @@ import kcc.com.cmm.util.StringUtil; import kcc.com.utl.fcc.service.EgovStringUtil; import kcc.kccadr.adjReqMgrOff.service.AdjReqMgrOffLineService; import kcc.kccadr.adjReqMgrOff.service.AdjReqMgrOffLineVO; +import kcc.let.sym.mnu.mpm.service.MenuManageJTreeVO; import kcc.let.utl.fcc.service.EgovCryptoUtil; @Controller @@ -585,14 +591,35 @@ public class AdjReqMgrOffLineController { } /** - * auth : bhkim - * 전자조정신청 목록 화면 - * date : 2021.09.111 + * auth : 이준호 + * 결재선 지정 팝업 + * date : 2022.09.23 */ @RequestMapping("/kccadr/adjReqMgOff/popup/adjReqMgrOffAppReqPop.do") public String adjReqMgrOffAppReqPop(@ModelAttribute("adjReqMgrOffLineVO") AdjReqMgrOffLineVO adjReqMgrOffLineVO, ModelMap model) throws Exception { return "kccadr/adjReqMgrOff/popup/adjReqMgrOffAppReqPop"; } + + @RequestMapping("/kccadr/adjReqMgOff/adjReqMgrOffAppReqPopAjax.do") + public void adjReqMgrOffAppReqPopAjax(@ModelAttribute("menuManageVO") MenuManageJTreeVO menuManageVO, ModelMap model, + HttpServletResponse response , HttpServletRequest request) throws Exception { + ObjectMapper mapper = new ObjectMapper(); + //response.setHeader("Content-Type", "text/html;charset=utf-8"); + PrintWriter out = new PrintWriter(new OutputStreamWriter(response.getOutputStream(), "UTF-8")); + + + List resultList = null ; + + MenuManageJTreeVO menuManageTopVO = new MenuManageJTreeVO(); + menuManageTopVO.setUpperMenuId("#"); + menuManageTopVO.setMenuNo("0"); + menuManageTopVO.setMenuNm("관련인"); + + resultList.add(0, menuManageTopVO); + System.out.println("resultList :: "+resultList); + mapper.writeValue(out, resultList); + out.flush(); + } public void decryptInfomation(List list, AdjReqMgrOffLineVO info){ diff --git a/src/main/java/kcc/let/sym/mnu/mcm/web/EgovMenuCreateManageController.java b/src/main/java/kcc/let/sym/mnu/mcm/web/EgovMenuCreateManageController.java index df957c71..e966c0b3 100644 --- a/src/main/java/kcc/let/sym/mnu/mcm/web/EgovMenuCreateManageController.java +++ b/src/main/java/kcc/let/sym/mnu/mcm/web/EgovMenuCreateManageController.java @@ -296,6 +296,7 @@ public class EgovMenuCreateManageController { menuManageTopVO.setMenuNo("0"); menuManageTopVO.setMenuNm("사용자메뉴"); + if("ROLE_ADMIN".equals(menuManageVO.getAuthorCode())){ menuManageTopVO.setMenuNm("관리자메뉴"); } diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp index 1f7bb027..e8803421 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp @@ -291,7 +291,9 @@ $(document).ready(function(){ commonPopWindowopenForm("/kccadr/adjPgrMgr/apm/popup/adrAdmMemo.do", '820', '500', "entInfoPop", $('#pop')); } - + function fnc_aprvl_pop(param){ + commonPopWindowopenForm("/kccadr/adjReqMgOff/popup/adjReqMgrOffAppReqPop.do", '1000', '700', "entInfoPop", $('#pop')); + } @@ -675,7 +677,8 @@ $(document).ready(function(){ - + + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/popup/adjReqMgrOffAppReqPop.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/popup/adjReqMgrOffAppReqPop.jsp index 59a6c93e..61396f90 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/popup/adjReqMgrOffAppReqPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/popup/adjReqMgrOffAppReqPop.jsp @@ -10,7 +10,776 @@ + + + + +