From 763a986dcc38aecc32a968187164a7ff8805de7a Mon Sep 17 00:00:00 2001 From: JIWOO Date: Mon, 23 Sep 2024 15:05:12 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=EC=9E=90=20=ED=97=A4=EB=8D=94=EC=97=90=20=EC=86=8C?= =?UTF-8?q?=EC=86=8D=20=EB=B3=80=EA=B2=BD=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kcc/let/main/web/EgovMainController.java | 17 +++- .../java/seed/com/gtm/dao/MemberLogDao.java | 11 +++ .../seed/com/gtm/dao/MemberLogDaoImpl.java | 21 +++++ .../com/gtm/join/MemberLogController.java | 78 +++++++++++++++++ .../seed/com/gtm/join/MemberLogService.java | 24 ++++++ .../webapp/WEB-INF/jsp/layout/adminLayout.jsp | 3 +- .../WEB-INF/jsp/main/inc/EgovIncTopnav.jsp | 86 ++++++++++++++++++- 7 files changed, 233 insertions(+), 7 deletions(-) create mode 100644 src/main/java/seed/com/gtm/dao/MemberLogDao.java create mode 100644 src/main/java/seed/com/gtm/dao/MemberLogDaoImpl.java create mode 100644 src/main/java/seed/com/gtm/join/MemberLogController.java create mode 100644 src/main/java/seed/com/gtm/join/MemberLogService.java diff --git a/src/main/java/kcc/let/main/web/EgovMainController.java b/src/main/java/kcc/let/main/web/EgovMainController.java index bff551a6..7e08aa34 100644 --- a/src/main/java/kcc/let/main/web/EgovMainController.java +++ b/src/main/java/kcc/let/main/web/EgovMainController.java @@ -57,10 +57,9 @@ import kcc.let.sym.mnu.mpm.service.EgovMenuManageService; import kcc.let.sym.mnu.mpm.service.MenuManageVO; import kcc.let.sym.site.service.EgovSiteIpService; import kcc.let.sym.site.service.EgovSiteManagerService; -import kcc.let.sym.site.service.SiteManagerVO; import kcc.let.uss.olp.qmc.service.EgovQustnrManageService; import kcc.let.uss.umt.service.EgovUserManageService; -import kcc.let.uss.umt.service.UserManageVO; +import seed.com.gtm.join.MemberJoinService; /** * 템플릿 메인 페이지 컨트롤러 클래스(Sample 소스) @@ -128,6 +127,9 @@ public class EgovMainController { @Resource(name = "meunCreateManageService") private EgovMenuCreateManageService menuCreateManageService; + @Resource(name = "memberJoinService") + private MemberJoinService memberJoinService; + /** * 메인 페이지에서 각 업무 화면으로 연계하는 기능을 제공한다. @@ -233,6 +235,17 @@ public class EgovMainController { model.addAttribute("sessionTime", "60"); // model.addAttribute("authority", user.getAuthority()); + + //변경가능 소속 + String enableDept = (String) session.getAttribute("enableDept"); + String memberDept = (String) session.getAttribute("memberDept"); + String memberId = (String) session.getAttribute("memberId"); + enableDept += "," + memberDept; + commandMap.put("enableDept", enableDept.replace("null,", "")); + commandMap.put("memberId", memberId); + model.addAttribute("memDept", memberDept); + model.addAttribute("enaDept", memberJoinService.deptList(commandMap)); + return "main/inc/EgovIncTopnav"; // 내부업무의 상단메뉴 화면 } diff --git a/src/main/java/seed/com/gtm/dao/MemberLogDao.java b/src/main/java/seed/com/gtm/dao/MemberLogDao.java new file mode 100644 index 00000000..9a6dc90c --- /dev/null +++ b/src/main/java/seed/com/gtm/dao/MemberLogDao.java @@ -0,0 +1,11 @@ +package seed.com.gtm.dao; + +import java.util.Map; + +import seed.com.gtm.join.LogsVO; + +public interface MemberLogDao { + + public LogsVO logsInfo(Map map); + +} diff --git a/src/main/java/seed/com/gtm/dao/MemberLogDaoImpl.java b/src/main/java/seed/com/gtm/dao/MemberLogDaoImpl.java new file mode 100644 index 00000000..1f8392e4 --- /dev/null +++ b/src/main/java/seed/com/gtm/dao/MemberLogDaoImpl.java @@ -0,0 +1,21 @@ +package seed.com.gtm.dao; + +import java.util.Map; + +import org.apache.ibatis.session.SqlSession; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Repository; + +import seed.com.gtm.join.LogsVO; + +@Repository("memberLogDao") +public class MemberLogDaoImpl implements MemberLogDao{ + + @Autowired SqlSession sqlSession; + + @Override + public LogsVO logsInfo(Map map) { + + return sqlSession.selectOne("join.logsInfo", map); + } +} diff --git a/src/main/java/seed/com/gtm/join/MemberLogController.java b/src/main/java/seed/com/gtm/join/MemberLogController.java new file mode 100644 index 00000000..5642effb --- /dev/null +++ b/src/main/java/seed/com/gtm/join/MemberLogController.java @@ -0,0 +1,78 @@ +package seed.com.gtm.join; + +import java.io.IOException; +import java.sql.SQLException; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.servlet.ModelAndView; + +import egovframework.rte.psl.dataaccess.util.EgovMap; +import seed.com.gtm.util.JSONView; +import seed.com.gtm.util.JSPUtil; + +@Controller +public class MemberLogController { + + @Autowired + MemberLogService memberLogService; + + @Autowired + private MemberJoinService memberJoinService; + + @RequestMapping("/gtm/case/join/jsp/PagelogInfo.do") + public ModelAndView loginInfo(ModelMap model, HttpSession session, @RequestParam Map paramMap) throws IOException, SQLException{ + + ModelAndView mav = new ModelAndView(); + + String memberId = (String) session.getAttribute("memberId"); + + paramMap.put("memberId", memberId); + + LogsVO logsInfo = null; + + logsInfo = memberLogService.logsInfo(paramMap); + + mav.addObject("logsInfo", logsInfo); + + String view = "/_extra/gtm/join/loginInfo"; + + mav.setViewName(view); + + return mav; + } + + @RequestMapping("/gtm/case/join/jsp/DeptInfo.do") + public String deptInfo(ModelMap model, HttpSession session, @RequestParam Map paramMap) throws IOException, SQLException{ + String enableDept = (String) session.getAttribute("enableDept"); + String memberDept = (String) session.getAttribute("memberDept"); + String memberId = (String) session.getAttribute("memberId"); + enableDept += "," + memberDept; + paramMap.put("enableDept", enableDept.replace("null,", "")); + paramMap.put("memberId", memberId); + model.addAttribute("memDept", memberDept); + model.addAttribute("enaDept", memberJoinService.deptList(paramMap)); + + return "/_extra/gtm/join/deptInfo"; + } + + @RequestMapping("/gtm/case/join/ajax/changeDept.do") + public ModelAndView changeDept(HttpServletRequest request, HttpSession session, @RequestParam Map paramMap) throws Exception { + EgovMap params = JSPUtil.makeRequestParams(request, session, true); + ModelAndView mavjson = new ModelAndView(new JSONView()); + /*paramMap.put("memberId", (String) session.getAttribute("memberId")); + paramMap.put("changeDept", params.get("changeDept")); + memberJoinService.memberDeptUpdate(paramMap);*/ + session.removeAttribute("memberDept"); + session.setAttribute("memberDept", params.get("changeDept")); + mavjson.addObject("success"); + return mavjson; + } +} diff --git a/src/main/java/seed/com/gtm/join/MemberLogService.java b/src/main/java/seed/com/gtm/join/MemberLogService.java new file mode 100644 index 00000000..32cdb1bb --- /dev/null +++ b/src/main/java/seed/com/gtm/join/MemberLogService.java @@ -0,0 +1,24 @@ +package seed.com.gtm.join; + +import java.io.IOException; +import java.sql.SQLException; +import java.util.Map; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import seed.com.gtm.dao.MemberLogDao; +import seed.com.gtm.join.LogsVO; + +@Service +public class MemberLogService { + + @Autowired + private MemberLogDao memberLogDao; + + //로그인 로그기록 + public LogsVO logsInfo(Map map) throws IOException, SQLException { + return memberLogDao.logsInfo(map); + } + +} diff --git a/src/main/webapp/WEB-INF/jsp/layout/adminLayout.jsp b/src/main/webapp/WEB-INF/jsp/layout/adminLayout.jsp index 7fecdf8d..c6c81885 100644 --- a/src/main/webapp/WEB-INF/jsp/layout/adminLayout.jsp +++ b/src/main/webapp/WEB-INF/jsp/layout/adminLayout.jsp @@ -28,7 +28,8 @@ - + + diff --git a/src/main/webapp/WEB-INF/jsp/main/inc/EgovIncTopnav.jsp b/src/main/webapp/WEB-INF/jsp/main/inc/EgovIncTopnav.jsp index fc871bd9..ce4704f0 100644 --- a/src/main/webapp/WEB-INF/jsp/main/inc/EgovIncTopnav.jsp +++ b/src/main/webapp/WEB-INF/jsp/main/inc/EgovIncTopnav.jsp @@ -14,7 +14,6 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> - <%-- 전자조정 --%> @@ -92,9 +165,14 @@ function modifyMem(uniqId){

로그아웃

- + +
  • From e2dc7278ef00d81e4b97ba91f32ac16ae156703b Mon Sep 17 00:00:00 2001 From: tolag3 Date: Mon, 23 Sep 2024 16:40:04 +0900 Subject: [PATCH 2/2] Merge branch 'tolag3' --- src/main/java/kcc/web/MainController.java | 131 +---- src/main/java/kcc/xxx/service/XxxVO.java | 105 +--- src/main/java/kcc/xxx/web/XxxController.java | 61 +- .../spring/com/context-security.xml | 1 + .../springmvc/egov-com-servlet.xml | 1 + .../WEB-INF/jsp/web/com/webCommonHeader.jsp | 535 ++++++++++-------- .../WEB-INF/jsp/web/com/webCommonLeftMenu.jsp | 114 ++-- .../jsp/web/com/webCommonSubVisual.jsp | 7 + .../webapp/WEB-INF/jsp/web/com/webLayout.jsp | 87 +-- .../webapp/WEB-INF/jsp/web/xxx/xxxList.jsp | 209 +++++++ .../kofair_case_seed/usr/info/form_list.html | 466 +++++++++------ 11 files changed, 994 insertions(+), 723 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/web/com/webCommonSubVisual.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/web/xxx/xxxList.jsp diff --git a/src/main/java/kcc/web/MainController.java b/src/main/java/kcc/web/MainController.java index 00996074..e3e0d7e2 100644 --- a/src/main/java/kcc/web/MainController.java +++ b/src/main/java/kcc/web/MainController.java @@ -303,17 +303,6 @@ public class MainController { if(ssoLoginVO != null) { model.addAttribute("ssoLoginVO", ssoLoginVO); } - -// String returnSiteUrl = returnSiteUrlGlobal; -// String returnSiteCode = returnSiteCodeGlobal; -// -// String joinUrl = joinUrl_Global; -// String modifyUrl = modifyUrl_Global; - -// model.addAttribute("returnSiteUrl", (URLEncoder.encode(returnSiteUrl))); -// model.addAttribute("returnSiteCode", returnSiteCode); -// model.addAttribute("joinUrl", joinUrl); -// model.addAttribute("modifyUrl", modifyUrl); return "web/com/webCommonHeader"; } @@ -1141,108 +1130,23 @@ public class MainController { */ @RequestMapping(value="/web/com/leftMenu.do") public String webCommonLeftMenu( - @RequestParam Map commandMap, HttpServletRequest request, @ModelAttribute("menuManageVO") MenuManageJTreeVO menuManageVO, + HttpServletRequest request + , @ModelAttribute("menuManageVO") MenuManageJTreeVO menuManageVO, ModelMap model) throws Exception { - MenuManageVO resultVO = new MenuManageVO(); - MenuManageVO tempMenuManageVO = new MenuManageVO(); - tempMenuManageVO.setSearchCondition("Y"); - setViewMenu(request , commandMap , tempMenuManageVO , resultVO , menuManageVO ); - List menuLeftResultList = menuCreateManageService.selectMenuLeftListJtreeWeb(menuManageVO) ; - model.addAttribute("menuLeftResultList", menuLeftResultList); - if(request.getRequestURI().contains("/eng/")){ - model.addAttribute("eng", "eng"); - } +// MenuManageVO resultVO = new MenuManageVO(); +// MenuManageVO tempMenuManageVO = new MenuManageVO(); +// tempMenuManageVO.setSearchCondition("Y"); +// setViewMenu(request , commandMap , tempMenuManageVO , resultVO , menuManageVO ); +// List menuLeftResultList = menuCreateManageService.selectMenuLeftListJtreeWeb(menuManageVO) ; +// model.addAttribute("menuLeftResultList", menuLeftResultList); +// if(request.getRequestURI().contains("/eng/")){ +// model.addAttribute("eng", "eng"); +// } return "web/com/webCommonLeftMenu"; } - - @RequestMapping(value="/{siteId}/web/com/getDivTop.do") - public String getDivTop(@PathVariable("siteId") String siteId , HttpServletRequest request, - @RequestParam Map commandMap, ModelMap model) - throws Exception { - return "blank"; - - } - - @RequestMapping("/{siteId}/web/searchTotal.do") - public String searchTotal(@PathVariable("siteId") String siteId , HttpServletRequest request, @ModelAttribute("searchVO") BoardVO boardVO, - @ModelAttribute("searchTotalVO") SearchTotalVO searchTotalVO, ModelMap model - ,RedirectAttributes redirectAttributes) throws Exception { - - BoardMasterVO bmVO = new BoardMasterVO(); - - searchTotalVO.setPageUnit(propertiesService.getInt("pageUnit")); - searchTotalVO.setPageSize(propertiesService.getInt("pageSize")); - - PaginationInfo paginationInfo = new PaginationInfo(); - - paginationInfo.setCurrentPageNo(searchTotalVO.getPageIndex()); - paginationInfo.setRecordCountPerPage(searchTotalVO.getPageUnit()); - paginationInfo.setPageSize(searchTotalVO.getPageSize()); - - searchTotalVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); - searchTotalVO.setLastIndex(paginationInfo.getLastRecordIndex()); - searchTotalVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); - - //List map = bbsMngService.selectBoardTotalSearch(boardVO); - List resultList = new ArrayList(); - resultList = bbsMngService.selectBoardTotalSearch(searchTotalVO); - int totCnt = bbsMngService.selectBoardTotalSearchCnt(searchTotalVO); - - //paginationInfo.setTotalRecordCount(resultList[0]); - - model.addAttribute("resultList", resultList); - model.addAttribute("totCnt", totCnt); - paginationInfo.setTotalRecordCount(totCnt); - model.addAttribute("paginationInfo", paginationInfo); - model.addAttribute("siteId", siteId); - String siteFolder = "site/"+siteId ; - /*if(!("linc".equals(siteId) || "klc".equals(siteId)) ){ - SiteManagerVO siteManagerVO = new SiteManagerVO(); - siteManagerVO.setSiteId(siteId); - setSiteinfo(siteManagerVO, model , request ); - //return "web/site/theme_"+siteManagerVO.getTheme()+"/"+siteManagerVO.getIsMobile()+"/cop/bbs/EgovNoticeList"; - return "web/site/"+siteId+"/"+siteManagerVO.getIsMobile()+"/main/searchTotal"; - }*/ - return "web/"+siteFolder+"/main/searchTotal"; - } - - - @RequestMapping(value="/com/getThemeLayout.do") - public String getThemeLayout(HttpServletRequest request, - @RequestParam Map commandMap, ModelMap model) - throws Exception { - - if(commandMap.get("url")!=null){ - String siteId = ((String)commandMap.get("url")).split("/")[3] ; - - SiteManagerVO siteManagerVO = new SiteManagerVO(); - siteManagerVO.setSiteId(siteId); - siteManagerVO = egovSiteManagerService.selectSiteManagerVO(siteManagerVO) ; - String theme = "01"; - /*if( !"".equals(siteManagerVO.getTheme()) && null != siteManagerVO.getTheme()){ - theme = siteManagerVO.getTheme() ; - String isMobile = "pc"; - WebUtil util = new WebUtil(); - if(util.isMobile(request)){ - isMobile = "mobile"; - } - //return "web/site/theme_"+theme+"/"+isMobile+"/layout"; - return "web/site/"+siteId+"/"+isMobile+"/layout"; - }*/ - - String isMobile = "pc"; - WebUtil util = new WebUtil(); - if(util.isMobile(request)){ - isMobile = "mobile"; - } - return "web/site/"+siteId+"/"+isMobile+"/layout"; - } - return "blank"; - } - private void setSiteinfo(SiteManagerVO siteManagerVO , ModelMap model , HttpServletRequest request) throws Exception{ SiteManagerVO tempSiteManagerVO = egovSiteManagerService.selectSiteManagerVO(siteManagerVO) ; if(tempSiteManagerVO !=null){ @@ -1519,6 +1423,19 @@ public class MainController { return "web/com/webCommonQuickMenu"; } + /** + * 사용자 좌측 매뉴 + */ + @RequestMapping(value="/web/com/subVisual.do") + public String webCommonSubVisual( + HttpServletRequest request + , @ModelAttribute("menuManageVO") MenuManageJTreeVO menuManageVO, + ModelMap model) + throws Exception { + + return "web/com/webCommonSubVisual"; + } + diff --git a/src/main/java/kcc/xxx/service/XxxVO.java b/src/main/java/kcc/xxx/service/XxxVO.java index de662a03..7ccf8bd6 100644 --- a/src/main/java/kcc/xxx/service/XxxVO.java +++ b/src/main/java/kcc/xxx/service/XxxVO.java @@ -5,9 +5,14 @@ import java.io.Serializable; import kcc.com.cmm.ComDefaultVO; import lombok.Builder; import lombok.Data; +import lombok.Getter; import lombok.NoArgsConstructor; +import lombok.Setter; @SuppressWarnings("serial") +@Getter +@Setter +@NoArgsConstructor public class XxxVO extends ComDefaultVO implements Serializable { // 검색조건 @@ -26,101 +31,11 @@ public class XxxVO extends ComDefaultVO implements Serializable { private String frstRegisterId = ""; // 최조작성자 ID private String frstRegisterNm = ""; // 최조작성자 이름 - public String getSrchYear() { - return srchYear; - } - - public void setSrchYear(String srchYear) { - this.srchYear = srchYear; - } - - public String getEsntlId() { - return esntlId; - } - - public void setEsntlId(String esntlId) { - this.esntlId = esntlId; - } - - public String getXxxSeq() { - return xxxSeq; - } - - public void setXxxSeq(String xxxSeq) { - this.xxxSeq = xxxSeq; - } - - public String getBbsId() { - return bbsId; - } - - public void setBbsId(String bbsId) { - this.bbsId = bbsId; - } - - public String getNttId() { - return nttId; - } - - public void setNttId(String nttId) { - this.nttId = nttId; - } - - public String getAtchFileId() { - return atchFileId; - } - - public void setAtchFileId(String atchFileId) { - this.atchFileId = atchFileId; - } - - public String getLastUpdusrId() { - return lastUpdusrId; - } - - public void setLastUpdusrId(String lastUpdusrId) { - this.lastUpdusrId = lastUpdusrId; - } - - public String getLastUpdusrNm() { - return lastUpdusrNm; - } - - public void setLastUpdusrNm(String lastUpdusrNm) { - this.lastUpdusrNm = lastUpdusrNm; - } - - public String getSearchCnd() { - return searchCnd; - } - - public void setSearchCnd(String searchCnd) { - this.searchCnd = searchCnd; - } - - public String getSearchWrd() { - return searchWrd; - } - - public void setSearchWrd(String searchWrd) { - this.searchWrd = searchWrd; - } - - public String getFrstRegisterId() { - return frstRegisterId; - } - - public void setFrstRegisterId(String frstRegisterId) { - this.frstRegisterId = frstRegisterId; - } - - public String getFrstRegisterNm() { - return frstRegisterNm; - } - - public void setFrstRegisterNm(String frstRegisterNm) { - this.frstRegisterNm = frstRegisterNm; - } + private String col1; + private String col2; + private String col3; + private String col4; + private int totCnt; } diff --git a/src/main/java/kcc/xxx/web/XxxController.java b/src/main/java/kcc/xxx/web/XxxController.java index d2ec094c..e32d9038 100644 --- a/src/main/java/kcc/xxx/web/XxxController.java +++ b/src/main/java/kcc/xxx/web/XxxController.java @@ -1,6 +1,9 @@ package kcc.xxx.web; +import java.util.ArrayList; + import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; import org.json.JSONArray; import org.json.simple.JSONObject; @@ -10,10 +13,11 @@ import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.RequestMapping; -import com.fasterxml.jackson.core.io.JsonStringEncoder; - +import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; +import kcc.com.cmm.CmmUtil; import kcc.utill.OzUtill; import kcc.xxx.service.XxxService; +import kcc.xxx.service.XxxVO; import seed.map.T_MEMBER; @Controller @@ -133,4 +137,57 @@ public class XxxController { return "/xxx/ozReportOdi"; } + + + @RequestMapping("/web/xxx/xxxList.do") + public String xxxList( + ModelMap model + , HttpServletRequest request + , XxxVO xxxVO + ) throws Exception { + + ArrayList xxxList = new ArrayList(); + + for(int i = 0 ; i < 10 ; i++) { + XxxVO tmpVO = new XxxVO(); + tmpVO.setCol1(String.valueOf(i)); + tmpVO.setCol2("유형내용" + i + "입니다."); + tmpVO.setCol3("제목내용" + i + "입니다."); + tmpVO.setCol4("등록일시" + i + "입니다."); + tmpVO.setTotCnt(10); + + xxxList.add(tmpVO); + } + + // 페이징 처리 객체 + PaginationInfo paginationInfo = CmmUtil.getPageing(xxxVO, xxxVO.getPageUnit()); + paginationInfo.setTotalRecordCount(xxxList.size() > 0 ? ((XxxVO) xxxList.get(0)).getTotCnt() : 0); + + model.addAttribute("xxxList", xxxList); + model.addAttribute("paginationInfo", paginationInfo); + +// if(setIdx.equals("101")){ +// session.setAttribute("menuName", "조정신청"); +// }else if(setIdx.equals("102")){ +// session.setAttribute("menuName", "절차진행"); +// }else if(setIdx.equals("103")){ +// session.setAttribute("menuName", "절차종료"); +// }else{ +// session.setAttribute("menuName", "기타"); +// } +// +// paramMap.put("setIdx", setIdx); +// paramMap.put("pageStart", cri.getPageStart()); +// paramMap.put("perPageNum", cri.getPerPageNum()); +// List> bbsList = service.boardList(paramMap); +// +// PageMaker pageMaker = new PageMaker(); +// pageMaker.setCri(cri); +// pageMaker.setTotalCount(service.boardListCnt(paramMap)); +// +// map.addAttribute("bbsList", bbsList); +// map.addAttribute("pageMaker", pageMaker); + + return "/web/xxx/xxxList"; + } } diff --git a/src/main/resources/egovframework/spring/com/context-security.xml b/src/main/resources/egovframework/spring/com/context-security.xml index c74fa4e9..e2a8034c 100644 --- a/src/main/resources/egovframework/spring/com/context-security.xml +++ b/src/main/resources/egovframework/spring/com/context-security.xml @@ -31,6 +31,7 @@ + diff --git a/src/main/webapp/WEB-INF/config/egovframework/springmvc/egov-com-servlet.xml b/src/main/webapp/WEB-INF/config/egovframework/springmvc/egov-com-servlet.xml index e8b0a55a..61af4410 100644 --- a/src/main/webapp/WEB-INF/config/egovframework/springmvc/egov-com-servlet.xml +++ b/src/main/webapp/WEB-INF/config/egovframework/springmvc/egov-com-servlet.xml @@ -95,6 +95,7 @@ + diff --git a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp index 68f9c21c..5c590c03 100644 --- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp @@ -4,226 +4,117 @@ <%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> <%@ page import="egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper" %> <%@ page import="kcc.com.cmm.LoginVO" %> - - -<%-- --%> - - -<%-- --%> -<%-- -<c:choose> - <c:when test="${fn:contains(URL , 'main/mainPage.do')}"> - 저작권 전자조정시스템 - 메인 - </c:when> - <c:when test="${fn:contains(URL , 'web/user/login/ssoLogin.do')}"> - 로그인<한국저작권위원회 - </c:when> - <c:otherwise> - <c:forEach var="result" items="${menuCurrentResultList}" varStatus="status">${result.menuNm}<</c:forEach>한국저작권위원회 - </c:otherwise> -</c:choose> - --%> -<%-- --%> -
    - 본문 바로가기 -
    - -
    - - - -
    - - -
    -
    -
    -
    - 한국저작권위원회 - 바로가기 -
    -
    - - - <%-- 로그인(로컬개발자용) --%> - 회원 들어가기 - <%-- 회원가입 --%> - - -
    - - -
    -
    -
    +
    + 본문 바로가기 +
    +
    +
    +

    + + 한국공정거래조정원 KOREA FAIR TRADE MEDIATION AGENCY + +

    +
    +
    + +
    - - -
    - - - - -
    -
    -
    -
    - 한국저작권위원회 - 바로가기 -
    -
    - - - <%-- 아이디 : 이름 : 권한 : --%> - 로그아웃 - <%-- 회원정보 수정 --%> - -
    - - -
    -
    -
    -
    -     - -
    -
    -

    저작권 전자조정시스템 Copyright Electronic Coordination System

    -
    - -
    -
    - - - - - - - - - - - - -
    +
    + + + +
    -
    - - +
    + -
    + - - -
    - - +
    \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/web/com/webCommonLeftMenu.jsp b/src/main/webapp/WEB-INF/jsp/web/com/webCommonLeftMenu.jsp index 668289d9..2827b2ef 100644 --- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonLeftMenu.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonLeftMenu.jsp @@ -1,83 +1,43 @@ <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> - - - - - -

    - - - - - - -

    -
    -
      - - -
    • - - - - - - - - -
        -
      • - - - - - - - - -
          -
        • -
          • - -
        -         -         -
        • -
      -       -       -
      • -       -       + +
      +

      분쟁조정 안내

      +
      -
      - -
      \ No newline at end of file + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/web/com/webCommonSubVisual.jsp b/src/main/webapp/WEB-INF/jsp/web/com/webCommonSubVisual.jsp new file mode 100644 index 00000000..8e21ee7d --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonSubVisual.jsp @@ -0,0 +1,7 @@ +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> + +
      +

      분쟁조정 안내

      +
      \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/web/com/webLayout.jsp b/src/main/webapp/WEB-INF/jsp/web/com/webLayout.jsp index c8746423..8a3f89eb 100644 --- a/src/main/webapp/WEB-INF/jsp/web/com/webLayout.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/com/webLayout.jsp @@ -3,7 +3,6 @@ <%@ taglib prefix="decorator" uri="http://www.opensymphony.com/sitemesh/decorator"%> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> - @@ -12,13 +11,10 @@ <c:choose> <c:when test="${fn:contains(URL , 'main/mainPage.do')}"> - 저작권 전자조정시스템 - 메인 - </c:when> - <c:when test="${fn:contains(URL , 'web/user/login/ssoLogin.do')}"> - 로그인<한국저작권위원회 + 한국공정거래조정원 온라인분쟁조정시스템 > 메인화면 </c:when> <c:otherwise> - <c:forEach var="result" items="${menuCurrentResultList}" varStatus="status">${result.menuNm}<</c:forEach>한국저작권위원회 + <c:forEach var="result" items="${menuCurrentResultList}" varStatus="status">${result.menuNm}<</c:forEach> 한국공정거래조정원 온라인분쟁조정시스템 </c:otherwise> </c:choose> @@ -26,16 +22,11 @@ - - +<%-- - @@ -58,7 +49,26 @@ content="default-src * self blob: data: gap:; style-src * self 'unsafe-inline' b - + --%> + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - +
      +
      + + <%-- 헤더메뉴 영역 --%> + + + <%-- 본문영역 외 영역 --%> + +
      + <%-- 서브제목 --%> + +
      + <%-- 좌측메뉴 --%> + + +
      +
      +       + <%-- 본문영역 --%> + <%-- 푸터메뉴 영역 --%> + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/web/xxx/xxxList.jsp b/src/main/webapp/WEB-INF/jsp/web/xxx/xxxList.jsp new file mode 100644 index 00000000..2ea267fc --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/xxx/xxxList.jsp @@ -0,0 +1,209 @@ +<%@ page contentType="text/html; charset=utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> + + + + + + + + + + +
      + +
        +
        • +
      • 분쟁조정 안내
        • +
      • 분쟁조정 안내
        • +
      • 분쟁조정 관련 서식
        • +
      + + +

      분쟁조정 관련 서식

      +

      분쟁조정 신청서(및 작성예시), 위임장, 합의취하서 등 분쟁조정 관련 서식을 제공하고 있습니다. 다운로드 받아 사용하시기 바랍니다.

      + + +
      + + + + + + +
      + + + +
      +

      전체 3,581건(10/400 페이지)

      +
      + +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      번호유형제목등록일시조회수
      + ${xxxList.col1} + + ${xxxList.col2} + + + ${xxxList.col3} + + + ${xxxList.col4} + + + 110 +
      등록된 데이터가 없습니다.
      +
      + + + +
      + + + + + + + + + + + + + + + + + + + + + + + + +<%-- + + +xxx 리스트 + + + + +
      +
      +
      + 제목 : + + + +
      +
      +

      게시판 수 :건

      +
      + + + +
      +
      +
      + + + + + + + + + + + + + + + + + + + + +
      컬럼1컬럼2컬럼3컬럼4
      +
      +
      + + +
      +
      +
      + + + --%> \ No newline at end of file diff --git a/src/main/webapp/kofair_case_seed/usr/info/form_list.html b/src/main/webapp/kofair_case_seed/usr/info/form_list.html index 915f2e21..0bafd9a3 100644 --- a/src/main/webapp/kofair_case_seed/usr/info/form_list.html +++ b/src/main/webapp/kofair_case_seed/usr/info/form_list.html @@ -1,184 +1,334 @@ + + + + 한국공정거래조정원 온라인분쟁조정시스템 > 분쟁조정 안내 > 분쟁조정 관련 서식 - - - - 한국공정거래조정원 온라인분쟁조정시스템 > 분쟁조정 안내 > 분쟁조정 관련 서식 + + + + + + + - - - - - - - + + + + + + - - - - - - - + +
      +
      +
      - -
      -
      -
      +
      +
      +

      분쟁조정 안내

      +
      -
      +
      + +
      +

      분쟁조정 안내

      + +
      + -
      -

      분쟁조정 안내

      -
      +
      + +
        +
        • +
      • 분쟁조정 안내
        • +
      • 분쟁조정 안내
        • +
      • 분쟁조정 관련 서식
        • +
      + -
      +

      분쟁조정 관련 서식

      +

      분쟁조정 신청서(및 작성예시), 위임장, 합의취하서 등 분쟁조정 관련 서식을 제공하고 있습니다. 다운로드 받아 사용하시기 바랍니다.

      - -
      -

      분쟁조정 안내

      - -
      - + +
      + -
      + - -
        -
        • -
      • 분쟁조정 안내
        • -
      • 분쟁조정 안내
        • -
      • 분쟁조정 관련 서식
        • -
      - + + +
      + -

      분쟁조정 관련 서식

      -

      분쟁조정 신청서(및 작성예시), 위임장, 합의취하서 등 분쟁조정 관련 서식을 제공하고 있습니다. 다운로드 받아 사용하시기 바랍니다.

      + +
      +

      전체 3,581건(10/400 페이지)

      +
      - -
      +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      번호제목조회수
      등록된 데이터가 없습니다.
      330(가맹) 법에서 조정제외대상으로 지정한 것은 무엇입니까?110
      330(가맹)(2021)(편의점 가맹본부의 부당한 손해배상 의무 부담 관련 분쟁조정 사례)110
      +
      + - + +
      +
      +
      - + + + + 한국공정거래조정원 온라인분쟁조정시스템 > 분쟁조정 안내 > 분쟁조정 관련 서식 - - + + + + + + + -
      - - - -
      -

      전체 3,581건(10/400 페이지)

      -
      - -
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      번호제목조회수
      등록된 데이터가 없습니다.
      330(가맹) 법에서 조정제외대상으로 지정한 것은 무엇입니까?110
      330(가맹)(2021)(편의점 가맹본부의 부당한 손해배상 의무 부담 관련 분쟁조정 사례)110
      -
      - - - + + + + + + + +
      +
      +
      +
      +
      +

      분쟁조정 안내

      +
      + +
      +

      분쟁조정 안내

      + +
      + +
      + +
        +
        • +
      • 분쟁조정 안내
        • +
      • 분쟁조정 안내
        • +
      • 분쟁조정 관련 서식
        • +
      + + +

      분쟁조정 관련 서식

      +

      분쟁조정 신청서(및 작성예시), 위임장, 합의취하서 등 분쟁조정 관련 서식을 제공하고 있습니다. 다운로드 받아 사용하시기 바랍니다.

      + + +
      + + + + + + +
      + + + +
      +

      전체 3,581건(10/400 페이지)

      +
      + +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      번호제목조회수
      등록된 데이터가 없습니다.
      330(가맹) 법에서 조정제외대상으로 지정한 것은 무엇입니까?110
      330(가맹)(2021)(편의점 가맹본부의 부당한 손해배상 의무 부담 관련 분쟁조정 사례)110
      +
      + + + +
      +
      +
      - -
      -
      - - - \ No newline at end of file + + \ No newline at end of file