diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnVO.java b/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnVO.java index c74b66a3..76844132 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnVO.java +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnVO.java @@ -75,6 +75,27 @@ public class AdjCourtCnctnVO extends ComDefaultVO implements Serializable { private String searchStatCd; + private String ckStsList[]; + private String ckStsListAll; + + private String searchMonth; + + private String searchStartDt; + private String searchEndDt; + + private String deptNmArr; + + private String searchLoginId; + + private String crtAllctDdlDeAdd1st; + private String crtAllctDdlDeAdd2nd; + + private int pageUnit = 50; + + private int pageSize = 50; + + private int recordCountPerPage = 50; + public String getCrtSeq() { return crtSeq; } @@ -357,10 +378,78 @@ public class AdjCourtCnctnVO extends ComDefaultVO implements Serializable { public void setSearchStatCd(String searchStatCd) { this.searchStatCd = searchStatCd; } - - - - + public String[] getCkStsList() { + return ckStsList; + } + public void setCkStsList(String[] ckStsList) { + this.ckStsList = ckStsList; + } + public String getCkStsListAll() { + return ckStsListAll; + } + public void setCkStsListAll(String ckStsListAll) { + this.ckStsListAll = ckStsListAll; + } + public String getSearchMonth() { + return searchMonth; + } + public void setSearchMonth(String searchMonth) { + this.searchMonth = searchMonth; + } + public String getSearchStartDt() { + return searchStartDt; + } + public void setSearchStartDt(String searchStartDt) { + this.searchStartDt = searchStartDt; + } + public String getSearchEndDt() { + return searchEndDt; + } + public void setSearchEndDt(String searchEndDt) { + this.searchEndDt = searchEndDt; + } + public String getDeptNmArr() { + return deptNmArr; + } + public void setDeptNmArr(String deptNmArr) { + this.deptNmArr = deptNmArr; + } + public String getSearchLoginId() { + return searchLoginId; + } + public void setSearchLoginId(String searchLoginId) { + this.searchLoginId = searchLoginId; + } + public String getCrtAllctDdlDeAdd1st() { + return crtAllctDdlDeAdd1st; + } + public void setCrtAllctDdlDeAdd1st(String crtAllctDdlDeAdd1st) { + this.crtAllctDdlDeAdd1st = crtAllctDdlDeAdd1st; + } + public String getCrtAllctDdlDeAdd2nd() { + return crtAllctDdlDeAdd2nd; + } + public void setCrtAllctDdlDeAdd2nd(String crtAllctDdlDeAdd2nd) { + this.crtAllctDdlDeAdd2nd = crtAllctDdlDeAdd2nd; + } + public int getPageUnit() { + return pageUnit; + } + public void setPageUnit(int pageUnit) { + this.pageUnit = pageUnit; + } + public int getPageSize() { + return pageSize; + } + public void setPageSize(int pageSize) { + this.pageSize = pageSize; + } + public int getRecordCountPerPage() { + return recordCountPerPage; + } + public void setRecordCountPerPage(int recordCountPerPage) { + this.recordCountPerPage = recordCountPerPage; + } } diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtDeptVO.java b/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtDeptVO.java index bb51e515..4453f6a0 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtDeptVO.java +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtDeptVO.java @@ -31,6 +31,7 @@ public class AdjCourtDeptVO extends ComDefaultVO implements Serializable { private String emplyrId; private String userNm; private String pstinstCode; + private String ofcpsNm; public String getCrtAtchFileId() { return crtAtchFileId; @@ -122,5 +123,12 @@ public class AdjCourtDeptVO extends ComDefaultVO implements Serializable { public void setPstinstCode(String pstinstCode) { this.pstinstCode = pstinstCode; } + public String getOfcpsNm() { + return ofcpsNm; + } + public void setOfcpsNm(String ofcpsNm) { + this.ofcpsNm = ofcpsNm; + } + } diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtAprvlController.java b/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtAprvlController.java index 69c47987..c217d37f 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtAprvlController.java +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtAprvlController.java @@ -60,6 +60,13 @@ public class AdjCourtAprvlController { model.addAttribute("msg", "로그인 해주세요."); return "redirect:/web/user/login/ssoLogin.do"; } + if("ROLE_COURT_ADMIN".equals(loginVO.getAuthority()) + && "80".equals(loginVO.getOfcpsNm())) { + + model.addAttribute("msg", "접근 할 수 없습니다."); + return "redirect:/kccadr/adjCourtCnctn/adjCourtCnctnList.do"; + } + if(adjCourtaprvlVO.getPageUnit() != 10) { adjCourtaprvlVO.setPageUnit(adjCourtaprvlVO.getPageUnit()); @@ -70,10 +77,7 @@ public class AdjCourtAprvlController { adjCourtaprvlVO.setSearchSortOrd("desc"); } - //내부결재 목록 페이지 접근시 결재상태 - 결재대기(01), 결재진행중(02) 상태가 기본값으로 해달라는 요청_220225_이준호수정 - //내부결재 목록 페이지 접근시 결재상태 - 결재대기(01) 상태가 기본값으로 해달라는 요청_221201_조용준수정 if("".equals(adjCourtaprvlVO.getSearchStatusArr()) || adjCourtaprvlVO.getSearchStatusArr() == null){ - //String[] defaultSearchStatusArr = {"01", "02"}; String[] defaultSearchStatusArr = {"01"}; adjCourtaprvlVO.setSearchStatusArr(defaultSearchStatusArr); } @@ -82,6 +86,10 @@ public class AdjCourtAprvlController { adjCourtaprvlVO.setSearchStartDt(CmmUtil.getDiffMonth(1 , "yyyy-MM-dd")); adjCourtaprvlVO.setSearchEndDt(CmmUtil.getDateNow("yyyy-MM-dd")); } + + if(StringUtils.isEmpty(adjCourtaprvlVO.getSearchMonth())) { + adjCourtaprvlVO.setSearchMonth("3"); + } /** paging */ PaginationInfo paginationInfo = new PaginationInfo(); diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java b/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java index c73d39b6..18093188 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java @@ -1,13 +1,21 @@ package kcc.kccadr.adjCourtCnctn.web; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; import java.util.List; -import java.util.stream.Collectors; +import java.util.Map; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; +import org.apache.commons.lang.time.DateFormatUtils; +import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; @@ -15,17 +23,29 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.multipart.MultipartHttpServletRequest; import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; +import egovframework.rte.psl.dataaccess.util.EgovMap; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; +import kcc.com.cmm.ComDefaultCodeVO; import kcc.com.cmm.LoginVO; +import kcc.com.cmm.service.EgovCmmUseService; import kcc.com.cmm.service.EgovFileMngService; import kcc.com.cmm.service.FileVO; +import kcc.com.cmm.util.RedirectUrlMaker; import kcc.com.cmm.util.StringUtil; import kcc.com.utl.fcc.service.EgovStringUtil; import kcc.kccadr.adjCourtCnctn.service.AdjCourtAppVO; import kcc.kccadr.adjCourtCnctn.service.AdjCourtCnctnService; import kcc.kccadr.adjCourtCnctn.service.AdjCourtCnctnVO; import kcc.kccadr.adjCourtCnctn.service.AdjCourtDeptVO; +import kcc.kccadr.cmm.KccadrCourtConstants; import kcc.kccadr.cmm.RestResponse; +import kcc.let.org.service.LocVO; +import kcc.let.sec.ram.service.AuthorManageVO; +import kcc.let.sec.ram.service.EgovAuthorManageService; +import kcc.let.uat.uia.service.EgovLoginService; +import kcc.let.uss.umt.service.EgovUserManageService; +import kcc.let.uss.umt.service.UserDefaultVO; +import kcc.let.uss.umt.service.UserManageVO; /** * @@ -52,9 +72,29 @@ public class AdjCourtCnctnController { @Resource(name = "EgovFileMngService") private EgovFileMngService fileService; + @Resource(name = "loginService") + private EgovLoginService loginService; + + @Resource(name = "userManageService") + private EgovUserManageService userManageService; + + /** cmmUseService */ + @Resource(name = "EgovCmmUseService") + private EgovCmmUseService cmmUseService; + + @Resource(name = "egovAuthorManageService") + private EgovAuthorManageService egovAuthorManageService; + + @Resource(name = "EgovFileMngService") + private EgovFileMngService fileMngService; + @RequestMapping("/kccadr/adjCourtCnctn/adjCourtCnctnList.do") public String adjCourtCnctnList(@ModelAttribute("adjCourtCnctnVO") AdjCourtCnctnVO adjCourtCnctnVO, ModelMap model) throws Exception { + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated() ? (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser() : null; + + if(loginVO != null && (KccadrCourtConstants.CRT_DEPT_ORDINARY).equals(loginVO.getOfcpsNm())) + adjCourtCnctnVO.setSearchStatCd("list"); if(adjCourtCnctnVO.getPageUnit() != 10) { @@ -78,18 +118,25 @@ public class AdjCourtCnctnController { paginationInfo.setTotalRecordCount(adjCourtCnctnService.adjCourtCnctnListCount(adjCourtCnctnVO)); model.addAttribute("paginationInfo", paginationInfo); + if(StringUtil.isEmpty(adjCourtCnctnVO.getSearchMonth())) { + adjCourtCnctnVO.setSearchMonth("1"); + } + + if (StringUtil.isEmpty(adjCourtCnctnVO.getSearchStartDt())) { // 조회일시가 null인경우 + Date today = new Date(); + int month = -1; + if(StringUtil.isNotEmpty(adjCourtCnctnVO.getSearchMonth())) { + month = -(Integer.valueOf(adjCourtCnctnVO.getSearchMonth())); + } + adjCourtCnctnVO.setSearchStartDt(DateFormatUtils.format(DateUtils.addMonths(today, month), "yyyyMMdd")); + adjCourtCnctnVO.setSearchEndDt(DateFormatUtils.format(today, "yyyyMMdd")); + + } List list = adjCourtCnctnService.adjCourtCnctnList(adjCourtCnctnVO); -// try { -// list = list.stream() -// .filter(t -> t.getCrtStatCd() != null) -// .filter(t -> Integer.parseInt(t.getCrtStatCd()) <= 201050) -// .collect(Collectors.toList()); -// } catch (Exception e) { -// System.out.println(e.getMessage()); -// } - // 복호화 + model.addAttribute("deptNmArr", deptNmArr(list)); + model.addAttribute("list", list); return "kccadr/adjCourtCnctn/adjCourtCnctnList"; @@ -372,4 +419,174 @@ public class AdjCourtCnctnController { model.addAttribute("list", list); return "kccadr/adjCourtCnctn/adjCourtCnctnEndDetailTab1"; } + + + @RequestMapping("/kccadr/adjCourtCnctn/adjCourtSelectUserList.do") + public String adjCourtSelectUserList(@ModelAttribute("userSearchVO") UserDefaultVO userSearchVO, + ModelMap model, + HttpServletRequest request, + HttpSession session) throws Exception { + { + //일반관리자가 좌측의 매뉴의 관리자 관리 클릭시 리스트가 아닌 자신의 정보수정페이지로 리로딩. + LoginVO loginVO = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser();//최고관리자의 경우 비밀번호 확인 없음. + loginVO.setId(loginVO.getId()); + if(!"ROLE_ADMIN".equals(loginService.getUserAuth(loginVO).getAuthority())){//최고관리자 아닐경우 + return "redirect:/EgovTopPageLink.do?link=/uss/umt/user/EgovUserSelectUpdtView.do?selectedId="+loginVO.getUniqId()+"&baseMenuNo=3500000" ; + } + } + + if(userSearchVO.getPageUnit() != 10) { + userSearchVO.setPageUnit(userSearchVO.getPageUnit()); + } + + userSearchVO.setPageUnit(50); + + /** pageing */ + PaginationInfo paginationInfo = new PaginationInfo(); + paginationInfo.setCurrentPageNo(userSearchVO.getPageIndex()); + paginationInfo.setRecordCountPerPage(userSearchVO.getPageUnit()); + paginationInfo.setPageSize(userSearchVO.getPageSize()); + + userSearchVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); + userSearchVO.setLastIndex(paginationInfo.getLastRecordIndex()); + userSearchVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); + LoginVO loginVO = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser(); + //userSearchVO.setAdminYn("Y"); + if("".equals(userSearchVO.getSearchSortCnd())){ //최초조회시 최신것 조회List + userSearchVO.setSearchSortCnd("uniqId"); + userSearchVO.setSearchSortOrd("desc"); + } + userSearchVO.setCourtYn("Y"); + List resultList = userManageService.selectUserList(userSearchVO) ; + model.addAttribute("resultList", resultList); + //paginationInfo.setTotalRecordCount( resultList.size()> 0 ? ((Long)((EgovMap)resultList.get(0)).get("totCnt")).intValue() : 0); + paginationInfo.setTotalRecordCount( resultList.size()> 0 ? ((int)((EgovMap)resultList.get(0)).get("totCnt")) : 0); + model.addAttribute("paginationInfo", paginationInfo); + + //사용자상태코드를 코드정보로부터 조회 + ComDefaultCodeVO vo = new ComDefaultCodeVO(); + vo.setCodeId("COM038"); + model.addAttribute("emplyrSttusCode_result", cmmUseService.selectCmmCodeDetail(vo));//사용자상태코드목록 + + //권한조회 + AuthorManageVO authorManageVO = new AuthorManageVO(); + authorManageVO.setFirstIndex(0); + authorManageVO.setLastIndex(10); + authorManageVO.setRecordCountPerPage(10); + authorManageVO.setAuthorManageList(egovAuthorManageService.selectAuthorList(authorManageVO)); + model.addAttribute("authorList", authorManageVO.getAuthorManageList()); + + return "kccadr/adjCourtCnctn/adjCourtUserList"; + } + + @RequestMapping("/kccadr/adjCourtCnctn/adjCourtSelectUserDetail.do") + public String adjCourtSelectUserDetail(@RequestParam("selectedId") String uniqId, + @ModelAttribute("searchVO") UserDefaultVO userSearchVO, + HttpServletRequest request, + @RequestParam Map commandMap, + Model model) throws Exception { + ComDefaultCodeVO vo = new ComDefaultCodeVO(); + //패스워드힌트목록을 코드정보로부터 조회 + vo.setCodeId("COM022"); + model.addAttribute("passwordHint_result", cmmUseService.selectCmmCodeDetail(vo)); + //성별구분코드를 코드정보로부터 조회 + vo.setCodeId("COM014"); + model.addAttribute("sexdstnCode_result", cmmUseService.selectCmmCodeDetail(vo)); + //사용자상태코드를 코드정보로부터 조회 + vo.setCodeId("COM013"); + model.addAttribute("emplyrSttusCode_result", cmmUseService.selectCmmCodeDetail(vo)); + //소속기관코드를 코드정보로부터 조회 - COM025 + vo.setCodeId("COM025"); + model.addAttribute("insttCode_result", cmmUseService.selectCmmCodeDetail(vo)); + //조직정보를 조회 - ORGNZT_ID정보 + vo.setTableNm("LETTNORGNZTINFO"); + model.addAttribute("orgnztId_result", cmmUseService.selectOgrnztIdDetail(vo)); + //그룹정보를 조회 - GROUP_ID정보 + vo.setTableNm("LETTNORGNZTINFO"); + model.addAttribute("groupId_result", cmmUseService.selectGroupIdDetail(vo)); + + UserManageVO userManageVO = new UserManageVO(); + userManageVO = userManageService.selectUser(uniqId); + model.addAttribute("userSearchVO", userSearchVO); + model.addAttribute("userManageVO", userManageVO); + + if(StringUtils.isNotBlank(userManageVO.getAtchFileId())){ + FileVO fileVO = new FileVO(); + fileVO.setAtchFileId(userManageVO.getAtchFileId()); + List fileList = fileMngService.selectFileInfs(fileVO); + model.addAttribute("fileList", fileList); + } + + //권한조회 + AuthorManageVO authorManageVO = new AuthorManageVO(); + authorManageVO.setFirstIndex(0); + authorManageVO.setLastIndex(10); + authorManageVO.setRecordCountPerPage(10); + authorManageVO.setAuthorSet("01"); + authorManageVO.setSearchSortCnd("sort_num"); + authorManageVO.setSearchSortOrd("desc"); + authorManageVO.setAuthorManageList(egovAuthorManageService.selectAuthorList(authorManageVO)); + model.addAttribute("authorList", authorManageVO.getAuthorManageList()); + //initRsa(request); + + LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser(); + + if(!"ROLE_ADMIN".equals(loginVO.getAuthority()) && !uniqId.equals(loginVO.getUniqId())) { + /*return "/cmm/main/mainPage.do";*/ + RedirectUrlMaker redirectUrlMaker = new RedirectUrlMaker("/cmm/main/mainPage.do"); + return redirectUrlMaker.getRedirectUrl(); + } + + if("ROLE_ADMIN".equals(loginVO.getAuthority())) { + model.addAttribute("isAdmin", "Y"); + } + + if("ROLE_USER_MEMBER".equals(loginVO.getAuthority())) { + model.addAttribute("isMember", "Y"); + } + +// //selectbox 미리 만들기 +// LocVO locVO = new LocVO(); +// locVO.setTopLocNo(topLocNo); //최상위 매뉴번호 +// List orgHiddenList = orgChartManageService.selectOrgChartListAjax(locVO); +// String userOneDepth = ""; +// String userTwoDepth = ""; +// +// if(null != userManageVO.getPartIdx() && !"".equals(userManageVO.getPartIdx())) { +// for(LocVO tempLocVO : orgHiddenList) { +// if(userManageVO.getPartIdx().equals(tempLocVO.getId())){ +// if(1==tempLocVO.getDepths()) { //1뎁스면 조회 안함 +// userOneDepth = tempLocVO.getId(); +// }else { //2뎁스면 +// userTwoDepth = tempLocVO.getId() ; +// userOneDepth = tempLocVO.getParent() ; +// } +// } +// } +// } +// model.addAttribute("userOneDepth", userOneDepth); +// model.addAttribute("userTwoDepth", userTwoDepth); +// model.addAttribute("orgHiddenList", orgHiddenList); + return "kccadr/adjCourtCnctn/adjCourtUserDetail"; + } + + + private List> deptNmArr(List list){ + List> tmp1 = new ArrayList>(); + if(list.stream().count() > 0) { + String[] deptNmArr = list.get(0).getDeptNmArr().split("\\|"); + for(String tmp : deptNmArr) { + String[] tmpArr = null; + tmpArr = tmp.split("§"); + Map tmpMap = new HashMap(); + tmpMap.put("userNm", tmpArr[0]); + tmpMap.put("esntlId", tmpArr[1]); + + tmp1.add(tmpMap); + } + } + return tmp1; + } + + } diff --git a/src/main/java/kcc/kccadr/cmm/KccadrCourtConstants.java b/src/main/java/kcc/kccadr/cmm/KccadrCourtConstants.java index da501e6f..b664d147 100644 --- a/src/main/java/kcc/kccadr/cmm/KccadrCourtConstants.java +++ b/src/main/java/kcc/kccadr/cmm/KccadrCourtConstants.java @@ -16,4 +16,10 @@ public class KccadrCourtConstants { public static final String CRT_FILE_ADD = "20"; // 추가문건 public static final String CRT_FILE_APP = "30"; // 기일문건 public static final String CRT_FILE_ACTION = "40"; // 사무수행보고서 + + + + //법원연계 조정위원 OfcpsNm + public static final String CRT_DEPT_GENERAL = "90"; + public static final String CRT_DEPT_ORDINARY = "80"; } \ No newline at end of file diff --git a/src/main/java/kcc/let/main/web/EgovMainController.java b/src/main/java/kcc/let/main/web/EgovMainController.java index f32604fc..a7233c2a 100644 --- a/src/main/java/kcc/let/main/web/EgovMainController.java +++ b/src/main/java/kcc/let/main/web/EgovMainController.java @@ -13,6 +13,8 @@ import java.util.Date; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.stream.Collector; +import java.util.stream.Collectors; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; @@ -59,6 +61,7 @@ import kcc.kccadr.adjPgrMgr.iam.service.InternalApprovManageService; import kcc.kccadr.adjPgrMgr.iam.service.InternalApprovManageVO; import kcc.kccadr.cmm.CmmUtil; import kcc.kccadr.cmm.KccadrConstants; +import kcc.kccadr.cmm.KccadrCourtConstants; import kcc.let.cop.bbs.service.BoardVO; import kcc.let.cop.bbs.service.EgovBBSManageService; import kcc.let.sts.com.StatsVO; @@ -381,9 +384,21 @@ public class EgovMainController { //menuManageVO.setMenuUserType("A"); //관리자만 조회 //menuManageVO.setSiteId(user.getSiteId()); List list_headmenu = menuManageService.selectMainMenuHead(menuManageVO); - model.addAttribute("list_headmenu", list_headmenu); - List list_menulist = menuManageService.selectMainMenuLeft(menuManageVO); +// List list_menulist = menuManageService.selectMainMenuLeft(menuManageVO); + List> list_menulist = (List>) menuManageService.selectMainMenuLeft(menuManageVO); + + + if("ROLE_COURT_ADMIN".equals(user.getAuthority()) + && (KccadrCourtConstants.CRT_DEPT_ORDINARY).equals(user.getOfcpsNm())) { + list_menulist = list_menulist.stream() + .filter( + t -> !"/kccadr/adjCourtAprvl/aprvlList.do".equals(t.get("chkURL")) + ) + .collect(Collectors.toList()); + } + + model.addAttribute("list_headmenu", list_headmenu); model.addAttribute("list_menulist", list_menulist); /* diff --git a/src/main/java/kcc/let/sym/site/web/EgovSiteManagerController.java b/src/main/java/kcc/let/sym/site/web/EgovSiteManagerController.java index 98b54478..704cf224 100644 --- a/src/main/java/kcc/let/sym/site/web/EgovSiteManagerController.java +++ b/src/main/java/kcc/let/sym/site/web/EgovSiteManagerController.java @@ -1576,10 +1576,11 @@ public class EgovSiteManagerController { //로그인 세션 연장 @RequestMapping("/sym/site/sessionExpendAjax.do") - public ModelAndView sessionExpendAjax(SiteManagerVO siteManagerVO + public ModelAndView sessionExpendAjax(SiteManagerVO siteManagerVO, HttpServletRequest request ) throws Exception { ModelAndView modelAndView = new ModelAndView(); modelAndView.setViewName("jsonView"); + request.getSession().setMaxInactiveInterval(60 * 60); return modelAndView; } diff --git a/src/main/java/kcc/let/uss/umt/service/UserDefaultVO.java b/src/main/java/kcc/let/uss/umt/service/UserDefaultVO.java index 8106a280..dd55b3b8 100644 --- a/src/main/java/kcc/let/uss/umt/service/UserDefaultVO.java +++ b/src/main/java/kcc/let/uss/umt/service/UserDefaultVO.java @@ -103,6 +103,8 @@ public class UserDefaultVO implements Serializable { private String userNewBlock; + private String courtYn; + public String getUserTotailCount() { return userTotailCount; } @@ -459,4 +461,14 @@ public class UserDefaultVO implements Serializable { public void setSearchSortOrd(String searchSortOrd) { this.searchSortOrd = searchSortOrd; } + + public String getCourtYn() { + return courtYn; + } + + public void setCourtYn(String courtYn) { + this.courtYn = courtYn; + } + + } diff --git a/src/main/java/kcc/let/uss/umt/service/impl/EgovUserManageServiceImpl.java b/src/main/java/kcc/let/uss/umt/service/impl/EgovUserManageServiceImpl.java index 8d834bf2..47ff2851 100644 --- a/src/main/java/kcc/let/uss/umt/service/impl/EgovUserManageServiceImpl.java +++ b/src/main/java/kcc/let/uss/umt/service/impl/EgovUserManageServiceImpl.java @@ -9,6 +9,7 @@ import org.springframework.transaction.annotation.Transactional; import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl; import egovframework.rte.fdl.idgnr.EgovIdGnrService; +import kcc.kccadr.cmm.KccadrCourtConstants; import kcc.let.sec.rgm.service.AuthorGroup; import kcc.let.sec.rgm.service.EgovAuthorGroupService; import kcc.let.sym.site.service.SiteManagerVO; @@ -204,7 +205,7 @@ public class EgovUserManageServiceImpl extends EgovAbstractServiceImpl implement userManageVO.setPassword(pass); int chkCourt_link_house_cnt = userManageDAO.selectUserCourtCnt(userManageVO); - if(!"90".equals(userManageVO.getOfcpsNm())) { + if(!(KccadrCourtConstants.CRT_DEPT_GENERAL).equals(userManageVO.getOfcpsNm())) { userManageVO.setInsttCode("00"); } if(chkCourt_link_house_cnt > 0) { diff --git a/src/main/java/kcc/let/uss/umt/web/EgovUserManageController.java b/src/main/java/kcc/let/uss/umt/web/EgovUserManageController.java index 4deb6fc8..a64f0564 100644 --- a/src/main/java/kcc/let/uss/umt/web/EgovUserManageController.java +++ b/src/main/java/kcc/let/uss/umt/web/EgovUserManageController.java @@ -874,7 +874,11 @@ public class EgovUserManageController { //RedirectUrlMaker redirectUrlMaker = new RedirectUrlMaker("/uss/umt/user/EgovUserManage.do"); RedirectUrlMaker redirectUrlMaker = new RedirectUrlMaker("/uss/umt/user/EgovUserSelectUpdtView.do?selectedId="+loginService.getUserAuth(tempUser).getId()); return redirectUrlMaker.getRedirectUrl(); - }else { + }else if("ROLE_COURT_ADMIN".equals(userManageVO.getAuthorCode())) { + RedirectUrlMaker redirectUrlMaker = new RedirectUrlMaker("/kccadr/adjCourtCnctn/adjCourtSelectUserList.do"); + return redirectUrlMaker.getRedirectUrl(); + } + else { RedirectUrlMaker redirectUrlMaker = new RedirectUrlMaker("/uss/umt/user/EgovUserManage.do"); return redirectUrlMaker.getRedirectUrl(); } diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjCourtCnctn/AdjCourtCnctn_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjCourtCnctn/AdjCourtCnctn_SQL_Mysql.xml index 50496548..ef6f8325 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjCourtCnctn/AdjCourtCnctn_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjCourtCnctn/AdjCourtCnctn_SQL_Mysql.xml @@ -8,6 +8,93 @@ + + FROM adr_court_mgr a + LEFT JOIN + (SELECT t1.crt_seq, + t1.esntl_id, + t1.crt_dept_ty, + t2.user_nm + FROM adr_court_dept_mgr t1 + LEFT JOIN lettnemplyrinfo t2 + ON t1.esntl_id = t2.esntl_id + WHERE t1.crt_dept_ty = '20' + ) + b + ON a.crt_seq = b.crt_seq + , (SELECT GROUP_CONCAT(DISTINCT t2.user_nm separator '|') AS user_nm + FROM adr_court_dept_mgr t1 + LEFT JOIN ( + SELECT CONCAT(tt1.user_nm, '§',tt1.esntl_id) AS user_nm, + tt1.esntl_id + FROM lettnemplyrinfo tt1 + ) t2 + ON t1.esntl_id = t2.esntl_id + WHERE t1.crt_dept_ty = '20' + ) + c + WHERE 1=1 + + + + /*조정 사건번호*/ + crt_ori_no LIKE CONCAT('%' , #searchKeyword#, '%') + + + /*본사건번호*/ + crt_no LIKE CONCAT('%' , #searchKeyword#, '%') + + + + + /*날짜 검색 - 기간지정*/ + + TO_CHAR(crt_allct_de,'YYYYMMDD') = ]]> REPLACE(#searchStartDt#, '-' , '') + + + + TO_CHAR(crt_allct_de,'YYYYMMDD') REPLACE(#searchEndDt#, '-' , '') + + + + + /*날짜 검색 - 1개월 전까지*/ + + TO_CHAR(crt_allct_de,'YYYYMMDD') = ]]> REPLACE(#diffMonth#, '-' , '') + + + + + /*날짜 검색 - 3개월 전까지*/ + + TO_CHAR(crt_allct_de,'YYYYMMDD') = ]]> REPLACE(#diffMonth#, '-' , '') + + + + crt_stat_cd + + 201050 + + + ]]> 201050 + + + AND crt_stat_cd IS NOT NULL + + + + #ckStsList[]# + + + + + b.esntl_id = #searchLoginId# + + + + + + @@ -209,6 +176,8 @@ crt_link_house, crt_stat_cd, crt_agrment, + crt_allct_ddl_de_add1st, + crt_allct_ddl_de_add2nd, frst_regist_pnttm, frst_register_id ) @@ -239,6 +208,8 @@ #crtLinkHouse#, #crtStatCd#, #crtAgrment# , + #crtAllctDdlDeAdd1st#, + #crtAllctDdlDeAdd2nd#, NOW() , #frstRegisterId# ) @@ -282,7 +253,9 @@ b.user_nm AS crtDeptKng, b.esntl_id AS esntlId, c.user_nm AS crtDeptOrdi, - a.crt_end_de as crtEndDe + a.crt_end_de as crtEndDe, + a.crt_allct_ddl_de_add1st as crtAllctDdlDeAdd1st, + a.crt_allct_ddl_de_add2nd as crtAllctDdlDeAdd2nd FROM adr_court_mgr a LEFT JOIN (SELECT t1.crt_seq, @@ -376,14 +349,25 @@ MERGE INTO ADR_COURT_DEPT_MGR T1 USING DB_ROOT ON ( - T1.CRT_SEQ = #crtSeq# - AND T1.ESNTL_ID = #esntlId# + T1.CRT_SEQ = #crtSeq# + + AND T1.CRT_DEPT_TY = '20' + + + AND T1.CRT_DEPT_TY = '10' + + ) WHEN MATCHED THEN UPDATE SET CRT_SEQ = #crtSeq# , ESNTL_ID = #esntlId# - , CRT_DEPT_TY = #pstinstCode# + + , CRT_DEPT_TY = '20' + + + , CRT_DEPT_TY = '10' + , LAST_UPDT_PNTTM = NOW() , LAST_UPDUSR_ID = #lastUpdusrId# WHEN NOT MATCHED THEN @@ -396,7 +380,12 @@ ) VALUES ( #crtSeq# , #esntlId# - , #pstinstCode# + + ,'20' + + + ,'10' + , NOW() , #frstRegisterId# ) @@ -464,12 +453,12 @@ @@ -928,6 +917,8 @@ crt_cc_ty = #crtCcTy#, crt_link_house = #crtLinkHouse#, crt_agrment = #crtAgrment#, + crt_allct_ddl_de_add1st = #crtAllctDdlDeAdd1st#, + crt_allct_ddl_de_add2nd = #crtAllctDdlDeAdd2nd#, last_updt_pnttm = NOW(), last_updusr_id = #lastUpdusrId# WHERE diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml index fa2364b4..7a5a651a 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml @@ -395,8 +395,8 @@ left join ADR_MEM_DEPT_MGR_PST AMDMP on AMD.MEM_DEPT_SEQ = AMDMP.MEM_PST_SEQ left join ADR_ASS_MGR_PST AAMP on - - AMD.ADR_SEQ = AAMP.ADR_SEQ + AMD.ADR_ADM_ID = AAMP.ASS_PST_SEQ + where AMD.ADR_SEQ= #adrSeq# @@ -918,7 +918,7 @@ LEFT JOIN ADR_MGR_DETAIL amd ON amm.ADR_SEQ = amd.ADR_SEQ LEFT JOIN ADR_ASS_MGR_PST aamp - ON amd.adr_seq = aamp.adr_seq + ON amd.ADR_ADM_ID = aamp.ASS_PST_SEQ LEFT JOIN ADR_MEM_DEPT_MGR_PST amdm ON amd.MEM_DEPT_SEQ = amdm.MEM_PST_SEQ LEFT JOIN ADR_HSTRY ah @@ -1001,7 +1001,7 @@ LEFT JOIN ADR_MGR_DETAIL amd ON amm.ADR_SEQ = amd.ADR_SEQ LEFT JOIN ADR_ASS_MGR_PST aamp - ON amd.adr_seq = aamp.adr_seq + ON amd.ADR_ADM_ID = aamp.ASS_PST_SEQ LEFT JOIN ADR_MEM_DEPT_MGR_PST amdm ON amd.MEM_DEPT_SEQ = amdm.MEM_PST_SEQ LEFT JOIN ADR_HSTRY ah diff --git a/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Mysql.xml index de614ce3..81515cf7 100644 --- a/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Mysql.xml @@ -82,6 +82,12 @@ AND A.siteId = #searchConditionSite# + + + AND B.AUTHOR_CODE = 'ROLE_COURT_ADMIN' + + + ORDER BY 1=1 ,$searchSortCnd$ diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtAprvlDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtAprvlDetail.jsp index 7857bbe5..16a324e6 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtAprvlDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtAprvlDetail.jsp @@ -332,11 +332,11 @@ - 결정일자 + 법원결정일 - 수령일자 + 메일수신일(사건기록) @@ -352,7 +352,7 @@ - 보고일자 + 사무수행보고일 @@ -434,7 +434,7 @@ 분야 - + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtAprvlList.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtAprvlList.jsp index d11a1975..75971731 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtAprvlList.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtAprvlList.jsp @@ -75,9 +75,7 @@ } function setSearchMonthDate(month){ - if(month == undefined || month == ""){ - month = '${adjCourtaprvlVO.searchMonth}'; - } + month = '${adjCourtaprvlVO.searchMonth}'; //현재날짜 var now = new Date(); diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnDetailTab0.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnDetailTab0.jsp index 369515f4..9c9297c7 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnDetailTab0.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnDetailTab0.jsp @@ -126,17 +126,20 @@ function endAfterPop(){ - 결정일자 + + 법원결정일 - 수령일자 + + 메일수신일(사건기록)(사건기록) - 배당일자 + + 배당일(위원지정) @@ -146,22 +149,33 @@ function endAfterPop(){ - 보고일자 + + 기한연장(1차) + + + + 기한연장(2차) + + + + + + + 사무수행보고일 + 조정 사건번호 + + + 본 사건번호 [] - 조정 사건번호 - - - - 총괄조정위원 @@ -231,7 +245,7 @@ function endAfterPop(){ 분야 - + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnEndDetailTab0.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnEndDetailTab0.jsp index 9ef2cf37..3fe2de39 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnEndDetailTab0.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnEndDetailTab0.jsp @@ -127,11 +127,11 @@ function endAfterPop(){ - 결정일자 + 법원결정일 - 수령일자 + 메일수신일(사건기록) @@ -147,7 +147,7 @@ function endAfterPop(){ - 보고일자 + 사무수행보고일 @@ -232,7 +232,7 @@ function endAfterPop(){ 분야 - + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnList.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnList.jsp index 67f9889b..40e553df 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnList.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnList.jsp @@ -7,6 +7,7 @@ <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> <%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> <%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> + @@ -17,6 +18,38 @@ $(document).ready(function(){ //해당 페이지에 대한 권한 체크 _admin_fn_check_authority("adjCourtCnctnList", "div.cont", "ALL"); + + + $("input[name=ckStsListAll]").attr("checked", true); + + + fncCheckValue('ckStsList', '${val}') + + + $("input[name=searchStatusArr]").on("click", function() { + var value = $(this).val(); + if (value == "99") { + $("input[name=searchStatusArr]").prop("checked", $(this).is(":checked")); + } + }) + + $("input[name=searchMonth]").on("click", function() { + var value = $(this).val(); + if (value == "99") { + setSearchMonthDate(1); + $("#sel_date").find("button").prop("disabled", false); + $("#sel_date").find("input").prop("readonly", false); + } else { + setSearchMonthDate(value); + $("#sel_date").find("button").prop("disabled", true); + $("#sel_date").find("input").prop("readonly", true); + } + }); + if ('${adjCourtCnctnVO.searchMonth}' != '99') { + setSearchMonthDate('${adjCourtCnctnVO.searchMonth}'); + }; + + }); //권한 체크 결과값으로 후속처리 @@ -54,6 +87,21 @@ function fn_goEndDetail(crtSeq){ goForm.submit(); } +function fncCheckValue(name, value) { + + $("input[name=" + name + "]").each(function(index, item) { + if (item.value == value) { + item.checked = true; + } + + }) +} + +function setSearchMonthDate(month) { + $("input[name=searchStartDt]").val(moment('').add(month * -1, 'months').format('YYYY-MM-DD')); + $("input[name=searchEndDt]").val(moment('').format('YYYY-MM-DD')); +} + @@ -75,7 +123,7 @@ function fn_goEndDetail(crtSeq){
-
+ <%--
    @@ -92,7 +140,115 @@ function fn_goEndDetail(crtSeq){
+
--%> + + +
+
+
+
    +
  • +

    구분

    + + + +
    • +
  • +<%-- --%> +

    조정상태

    +
    + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    • +
  • +

    조정위원

    + +
    • +
  • +

    배당일(위원지정)

    +
    + + + + + + + + + +
    + +
    + + +
    + ~ + +
    + + +
    +
    +
    +
    • +
+
+
+ + + + + + + + + + + + + + + + + + +

총 건 입니다.

@@ -144,7 +300,7 @@ function fn_goEndDetail(crtSeq){ - + @@ -155,7 +311,7 @@ function fn_goEndDetail(crtSeq){ - + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnModify.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnModify.jsp index 3dd3af67..13647a4f 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnModify.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnModify.jsp @@ -17,11 +17,11 @@ $(document).ready(function(){ - // 배당일자, 보고일자 선택하면 발동되는 event + // 배당일자, 사무수행보고일 선택하면 발동되는 event // 소요일 계산 - $('#crtAllctDe').on('focusin',function(){ + $('#crtRcptDe').on('focusin',function(){ - var alctnVal = $('#crtAllctDe').val(); + var alctnVal = $('#crtRcptDe').val(); var returnVal = StringToDate(alctnVal, 45); $('#crtAllctDdlDe').val(returnVal); }); @@ -31,9 +31,31 @@ $(document).ready(function(){ $('#file_temp').click(); }); + // 600초 마다 세션 갱신 + const intervalId = setInterval(() => + { + sessionExpend(); + } + , 600000); }); +function sessionExpend(){ + $.ajax({ + url :"/sym/site/sessionExpendAjax.do" + ,type:"post" + ,data:{"session": "expend"} + ,dataType:"json" + ,success:function(data){ + console.log("세션이 연장되었습니다."); + } + ,error:function(request , status, error){ + alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error); + console.log("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error); + } + }); +} + function StringToDate(date, n) { let yyyy = date.substring(0, 4); let mm = date.substring(5, 7); @@ -147,10 +169,11 @@ function fn_GoList(){ - 결정일자 + + 법원결정일
- +
- 수령일자 + + 메일수신일(사건기록)(사건기록)
- +