diff --git a/src/main/java/kcc/kccadr/advcDept/service/DeptUsrInfoService.java b/src/main/java/kcc/kccadr/advcDept/service/DeptUsrInfoService.java index a813cf37..c8617d75 100644 --- a/src/main/java/kcc/kccadr/advcDept/service/DeptUsrInfoService.java +++ b/src/main/java/kcc/kccadr/advcDept/service/DeptUsrInfoService.java @@ -35,5 +35,7 @@ public interface DeptUsrInfoService { //L page List selectPagingList(DeptUsrInfoVO adrHstryMgrVO) throws Exception; - + + //L + List selectDeptPersonList(DeptUsrInfoVO adrHstryMgrVO) throws Exception; } diff --git a/src/main/java/kcc/kccadr/advcDept/service/DeptUsrInfoVO.java b/src/main/java/kcc/kccadr/advcDept/service/DeptUsrInfoVO.java index 50d7c0a9..c5facb6b 100644 --- a/src/main/java/kcc/kccadr/advcDept/service/DeptUsrInfoVO.java +++ b/src/main/java/kcc/kccadr/advcDept/service/DeptUsrInfoVO.java @@ -26,6 +26,12 @@ public class DeptUsrInfoVO extends ComDefaultVO implements Serializable { private String lastUpdusrId; //수정자 + private String ofcpsNm; //직급코드 + private String offmTelno; //전화번호 + private String codeNm; //직급명 + private String userNm; //성명 + + public String getDeptSeq() { return deptSeq; } @@ -104,5 +110,29 @@ public class DeptUsrInfoVO extends ComDefaultVO implements Serializable { public void setLastUpdusrId(String lastUpdusrId) { this.lastUpdusrId = lastUpdusrId; } + public String getOfcpsNm() { + return ofcpsNm; + } + public void setOfcpsNm(String ofcpsNm) { + this.ofcpsNm = ofcpsNm; + } + public String getOffmTelno() { + return offmTelno; + } + public void setOffmTelno(String offmTelno) { + this.offmTelno = offmTelno; + } + public String getCodeNm() { + return codeNm; + } + public void setCodeNm(String codeNm) { + this.codeNm = codeNm; + } + public String getUserNm() { + return userNm; + } + public void setUserNm(String userNm) { + this.userNm = userNm; + } } diff --git a/src/main/java/kcc/kccadr/advcDept/service/impl/DeptUsrInfoDAO.java b/src/main/java/kcc/kccadr/advcDept/service/impl/DeptUsrInfoDAO.java index 01a5c0c0..87069610 100644 --- a/src/main/java/kcc/kccadr/advcDept/service/impl/DeptUsrInfoDAO.java +++ b/src/main/java/kcc/kccadr/advcDept/service/impl/DeptUsrInfoDAO.java @@ -175,7 +175,7 @@ public class DeptUsrInfoDAO extends EgovAbstractDAO { List tlist = (List) list("DeptUsrInfoDAO.selectList", adrHstryMgrVO); return tlist; } - + /** * L - Page * @param addrVO @@ -185,5 +185,11 @@ public class DeptUsrInfoDAO extends EgovAbstractDAO { public List selectPagingList(DeptUsrInfoVO adrHstryMgrVO) throws Exception { List tlist = (List) list("DeptUsrInfoDAO.selectPagingList", adrHstryMgrVO); return tlist; - } + } + + public List selectDeptPersonList(DeptUsrInfoVO adrHstryMgrVO) throws Exception { + List tlist = (List) list("DeptUsrInfoDAO.selectDeptPersonList", adrHstryMgrVO); + return tlist; + } + } diff --git a/src/main/java/kcc/kccadr/advcDept/service/impl/DeptUsrInfoServiceImpl.java b/src/main/java/kcc/kccadr/advcDept/service/impl/DeptUsrInfoServiceImpl.java index 24e3fd76..88616411 100644 --- a/src/main/java/kcc/kccadr/advcDept/service/impl/DeptUsrInfoServiceImpl.java +++ b/src/main/java/kcc/kccadr/advcDept/service/impl/DeptUsrInfoServiceImpl.java @@ -93,4 +93,8 @@ public class DeptUsrInfoServiceImpl implements DeptUsrInfoService { return deptUsrInfoDAO.selectPagingList(adrRecordReadingVO); } + //List + public List selectDeptPersonList(DeptUsrInfoVO adrRecordReadingVO) throws Exception{ + return deptUsrInfoDAO.selectDeptPersonList(adrRecordReadingVO); + } } diff --git a/src/main/java/kcc/let/sym/ccm/cde/service/CmmnDetailCodeVO.java b/src/main/java/kcc/let/sym/ccm/cde/service/CmmnDetailCodeVO.java index f287d880..490b13f3 100644 --- a/src/main/java/kcc/let/sym/ccm/cde/service/CmmnDetailCodeVO.java +++ b/src/main/java/kcc/let/sym/ccm/cde/service/CmmnDetailCodeVO.java @@ -87,6 +87,8 @@ public class CmmnDetailCodeVO extends CmmnDetailCode implements Serializable { private String searchBizCd = ""; + private String tmpCmd = ""; + /** * searchCondition attribute 를 리턴한다. * @return String @@ -322,4 +324,12 @@ public class CmmnDetailCodeVO extends CmmnDetailCode implements Serializable { public void setSearchBizCd(String searchBizCd) { this.searchBizCd = searchBizCd; } + + public String getTmpCmd() { + return tmpCmd; + } + + public void setTmpCmd(String tmpCmd) { + this.tmpCmd = tmpCmd; + } } diff --git a/src/main/java/kcc/let/sym/ccm/cde/service/EgovCcmCmmnDetailCodeManageService.java b/src/main/java/kcc/let/sym/ccm/cde/service/EgovCcmCmmnDetailCodeManageService.java index 1f648b16..d18e8a63 100644 --- a/src/main/java/kcc/let/sym/ccm/cde/service/EgovCcmCmmnDetailCodeManageService.java +++ b/src/main/java/kcc/let/sym/ccm/cde/service/EgovCcmCmmnDetailCodeManageService.java @@ -30,6 +30,8 @@ public interface EgovCcmCmmnDetailCodeManageService { * @throws Exception */ void deleteCmmnDetailCode(CmmnDetailCode cmmnDetailCode) throws Exception; + + void deleteCmmnDetailCodeDept(CmmnDetailCode cmmnDetailCode) throws Exception; /** * 공통상세코드를 등록한다. @@ -37,6 +39,8 @@ public interface EgovCcmCmmnDetailCodeManageService { * @throws Exception */ void insertCmmnDetailCode(CmmnDetailCode cmmnDetailCode) throws Exception; + + void insertCmmnDetailCodeDept(CmmnDetailCode cmmnDetailCode) throws Exception; /** * 공통상세코드 상세항목을 조회한다. @@ -45,7 +49,11 @@ public interface EgovCcmCmmnDetailCodeManageService { * @throws Exception */ CmmnDetailCode selectCmmnDetailCodeDetail(CmmnDetailCode cmmnDetailCode) throws Exception; + + CmmnDetailCode selectCmmnDetailCodeDetailDept(CmmnDetailCode cmmnDetailCode) throws Exception; + CmmnDetailCode selectCmmnDetailCodeDetail4Check(CmmnDetailCode cmmnDetailCode) throws Exception; + /** * 공통상세코드 목록을 조회한다. * @param searchVO @@ -69,13 +77,23 @@ public interface EgovCcmCmmnDetailCodeManageService { void updateCmmnDetailCode(CmmnDetailCode cmmnDetailCode) throws Exception; void updateCmmnDetailNmCode(CmmnDetailCode cmmnDetailCode) throws Exception; + + void updateCmmnDetailNmCodeDept(CmmnDetailCode cmmnDetailCode) throws Exception; List selectCmmnCodeAllList(CmmnDetailCode cmmnDetailCode) throws Exception; + + List selectCmmnCodeDept4Check(CmmnDetailCode cmmnDetailCode) throws Exception; List selectCmmnDetailCodeListAll(CmmnDetailCodeVO searchVO) throws Exception; + List selectCmmnDetailCodeList4Dept(CmmnDetailCodeVO searchVO) throws Exception; + List selectCmmnDetailCodeListWithCode(CmmnDetailCodeVO searchVO) throws Exception; + List selectCmmnDetailCodeListWithCodeDept(CmmnDetailCodeVO searchVO) throws Exception; + void updateCmmnDetailCodePk(CmmnDetailCodeVO cmmnDetailCodeVO) throws Exception; + + void updateCmmnDetailCodeDeptPk(CmmnDetailCodeVO cmmnDetailCodeVO) throws Exception; } diff --git a/src/main/java/kcc/let/sym/ccm/cde/service/impl/CmmnDetailCodeManageDAO.java b/src/main/java/kcc/let/sym/ccm/cde/service/impl/CmmnDetailCodeManageDAO.java index 76c34adb..0c12a2e7 100644 --- a/src/main/java/kcc/let/sym/ccm/cde/service/impl/CmmnDetailCodeManageDAO.java +++ b/src/main/java/kcc/let/sym/ccm/cde/service/impl/CmmnDetailCodeManageDAO.java @@ -38,6 +38,9 @@ public class CmmnDetailCodeManageDAO extends EgovAbstractDAO { delete("CmmnDetailCodeManageDAO.deleteCmmnDetailCode", cmmnDetailCode); } + public void deleteCmmnDetailCodeDept(CmmnDetailCode cmmnDetailCode) throws Exception { + delete("CmmnDetailCodeManageDAO.deleteCmmnDetailCodeDept", cmmnDetailCode); + } /** * 공통상세코드를 등록한다. @@ -47,7 +50,9 @@ public class CmmnDetailCodeManageDAO extends EgovAbstractDAO { public void insertCmmnDetailCode(CmmnDetailCode cmmnDetailCode) throws Exception { insert("CmmnDetailCodeManageDAO.insertCmmnDetailCode", cmmnDetailCode); } - + public void insertCmmnDetailCodeDept(CmmnDetailCode cmmnDetailCode) throws Exception { + insert("CmmnDetailCodeManageDAO.insertCmmnDetailCodeDept", cmmnDetailCode); + } /** * 공통상세코드 상세항목을 조회한다. * @param cmmnDetailCode @@ -57,7 +62,14 @@ public class CmmnDetailCodeManageDAO extends EgovAbstractDAO { return (CmmnDetailCode) select("CmmnDetailCodeManageDAO.selectCmmnDetailCodeDetail", cmmnDetailCode); } + public CmmnDetailCode selectCmmnDetailCodeDetailDept(CmmnDetailCode cmmnDetailCode) throws Exception { + return (CmmnDetailCode) select("CmmnDetailCodeManageDAO.selectCmmnDetailCodeDetailDept", cmmnDetailCode); + } + public CmmnDetailCode selectCmmnDetailCodeDetail4Check(CmmnDetailCode cmmnDetailCode) throws Exception { + return (CmmnDetailCode) select("CmmnDetailCodeManageDAO.selectCmmnDetailCodeDetail4Check", cmmnDetailCode); + } + /** * 공통상세코드 목록을 조회한다. * @param searchVO @@ -90,24 +102,47 @@ public class CmmnDetailCodeManageDAO extends EgovAbstractDAO { update("CmmnDetailCodeManageDAO.updateCmmnDetailNmCode", cmmnDetailCode); } + public void updateCmmnDetailNmCodeDept(CmmnDetailCode cmmnDetailCode) throws Exception { + update("CmmnDetailCodeManageDAO.updateCmmnDetailNmCodeDept", cmmnDetailCode); + } @SuppressWarnings("unchecked") public List selectCmmnCodeAllList(CmmnDetailCode cmmnDetailCode) throws Exception { return (List) list("CmmnDetailCodeManageDAO.selectCmmnCodeAllList", cmmnDetailCode); } + @SuppressWarnings("unchecked") + public List selectCmmnCodeDept4Check(CmmnDetailCode cmmnDetailCode) throws Exception { + return (List) list("CmmnDetailCodeManageDAO.selectCmmnCodeDept4Check", cmmnDetailCode); + } + + @SuppressWarnings("unchecked") public List selectCmmnDetailCodeListAll(CmmnDetailCodeVO searchVO) throws Exception{ return (List) list("CmmnDetailCodeManageDAO.selectCmmnDetailCodeListAll", searchVO); } + @SuppressWarnings("unchecked") + public List selectCmmnDetailCodeList4Dept(CmmnDetailCodeVO searchVO) throws Exception{ + return (List) list("CmmnDetailCodeManageDAO.selectCmmnDetailCodeList4Dept", searchVO); + } + + @SuppressWarnings("unchecked") public List selectCmmnDetailCodeListWithCode(CmmnDetailCodeVO searchVO) throws Exception{ return (List) list("CmmnDetailCodeManageDAO.selectCmmnDetailCodeListWithCode", searchVO); } + + @SuppressWarnings("unchecked") + public List selectCmmnDetailCodeListWithCodeDept(CmmnDetailCodeVO searchVO) throws Exception{ + return (List) list("CmmnDetailCodeManageDAO.selectCmmnDetailCodeListWithCodeDept", searchVO); + } public void updateCmmnDetailCodePk(CmmnDetailCodeVO cmmnDetailCodeVO) throws Exception{ update("CmmnDetailCodeManageDAO.updateCmmnDetailCodePk", cmmnDetailCodeVO); } + public void updateCmmnDetailCodeDeptPk(CmmnDetailCodeVO cmmnDetailCodeVO) throws Exception{ + update("CmmnDetailCodeManageDAO.updateCmmnDetailCodeDeptPk", cmmnDetailCodeVO); + } } diff --git a/src/main/java/kcc/let/sym/ccm/cde/service/impl/EgovCcmCmmnDetailCodeManageServiceImpl.java b/src/main/java/kcc/let/sym/ccm/cde/service/impl/EgovCcmCmmnDetailCodeManageServiceImpl.java index 348850b4..da43b989 100644 --- a/src/main/java/kcc/let/sym/ccm/cde/service/impl/EgovCcmCmmnDetailCodeManageServiceImpl.java +++ b/src/main/java/kcc/let/sym/ccm/cde/service/impl/EgovCcmCmmnDetailCodeManageServiceImpl.java @@ -45,6 +45,11 @@ public class EgovCcmCmmnDetailCodeManageServiceImpl extends EgovAbstractServiceI cmmnDetailCodeManageDAO.deleteCmmnDetailCode(cmmnDetailCode); } + @Override + public void deleteCmmnDetailCodeDept(CmmnDetailCode cmmnDetailCode) throws Exception { + cmmnDetailCodeManageDAO.deleteCmmnDetailCodeDept(cmmnDetailCode); + } + /** * 공통상세코드를 등록한다. */ @@ -53,6 +58,11 @@ public class EgovCcmCmmnDetailCodeManageServiceImpl extends EgovAbstractServiceI cmmnDetailCodeManageDAO.insertCmmnDetailCode(cmmnDetailCode); } + @Override + public void insertCmmnDetailCodeDept(CmmnDetailCode cmmnDetailCode) throws Exception { + cmmnDetailCodeManageDAO.insertCmmnDetailCodeDept(cmmnDetailCode); + } + /** * 공통상세코드 상세항목을 조회한다. */ @@ -62,6 +72,18 @@ public class EgovCcmCmmnDetailCodeManageServiceImpl extends EgovAbstractServiceI return ret; } + @Override + public CmmnDetailCode selectCmmnDetailCodeDetailDept(CmmnDetailCode cmmnDetailCode) throws Exception { + CmmnDetailCode ret = cmmnDetailCodeManageDAO.selectCmmnDetailCodeDetailDept(cmmnDetailCode); + return ret; + } + + @Override + public CmmnDetailCode selectCmmnDetailCodeDetail4Check(CmmnDetailCode cmmnDetailCode) throws Exception { + CmmnDetailCode ret = cmmnDetailCodeManageDAO.selectCmmnDetailCodeDetail4Check(cmmnDetailCode); + return ret; + } + /** * 공통상세코드 목록을 조회한다. */ @@ -91,20 +113,40 @@ public class EgovCcmCmmnDetailCodeManageServiceImpl extends EgovAbstractServiceI cmmnDetailCodeManageDAO.updateCmmnDetailNmCode(cmmnDetailCode); } + @Override + public void updateCmmnDetailNmCodeDept(CmmnDetailCode cmmnDetailCode) throws Exception { + cmmnDetailCodeManageDAO.updateCmmnDetailNmCodeDept(cmmnDetailCode); + } + @Override public List selectCmmnCodeAllList(CmmnDetailCode cmmnDetailCode) throws Exception { return cmmnDetailCodeManageDAO.selectCmmnCodeAllList(cmmnDetailCode); } + + @Override + public List selectCmmnCodeDept4Check(CmmnDetailCode cmmnDetailCode) throws Exception { + return cmmnDetailCodeManageDAO.selectCmmnCodeDept4Check(cmmnDetailCode); + } @Override public List selectCmmnDetailCodeListAll(CmmnDetailCodeVO searchVO) throws Exception { return cmmnDetailCodeManageDAO.selectCmmnDetailCodeListAll(searchVO); } + @Override + public List selectCmmnDetailCodeList4Dept(CmmnDetailCodeVO searchVO) throws Exception { + return cmmnDetailCodeManageDAO.selectCmmnDetailCodeList4Dept(searchVO); + } + @Override public List selectCmmnDetailCodeListWithCode(CmmnDetailCodeVO searchVO) throws Exception { return cmmnDetailCodeManageDAO.selectCmmnDetailCodeListWithCode(searchVO); } + + @Override + public List selectCmmnDetailCodeListWithCodeDept(CmmnDetailCodeVO searchVO) throws Exception { + return cmmnDetailCodeManageDAO.selectCmmnDetailCodeListWithCodeDept(searchVO); + } @Override public void updateCmmnDetailCodePk(CmmnDetailCodeVO cmmnDetailCodeVO) throws Exception { @@ -112,4 +154,9 @@ public class EgovCcmCmmnDetailCodeManageServiceImpl extends EgovAbstractServiceI } + @Override + public void updateCmmnDetailCodeDeptPk(CmmnDetailCodeVO cmmnDetailCodeVO) throws Exception { + cmmnDetailCodeManageDAO.updateCmmnDetailCodeDeptPk(cmmnDetailCodeVO); + + } } diff --git a/src/main/java/kcc/let/uss/rnt/web/EgovCustomRankManageController.java b/src/main/java/kcc/let/uss/rnt/web/EgovCustomRankManageController.java index e26e2b2f..e2cfc8af 100644 --- a/src/main/java/kcc/let/uss/rnt/web/EgovCustomRankManageController.java +++ b/src/main/java/kcc/let/uss/rnt/web/EgovCustomRankManageController.java @@ -5,6 +5,7 @@ import java.io.PrintWriter; import java.util.List; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; @@ -19,9 +20,17 @@ import org.springframework.web.servlet.ModelAndView; import com.fasterxml.jackson.databind.ObjectMapper; 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.ComDefaultVO; import kcc.com.cmm.LoginVO; import kcc.com.cmm.service.CmmnDetailCode; +import kcc.com.cmm.service.EgovCmmUseService; +import kcc.kccadr.advcDept.service.DeptUsrInfoService; +import kcc.kccadr.advcDept.service.DeptUsrInfoVO; +import kcc.let.sec.ram.service.AuthorManageVO; +import kcc.let.sec.ram.service.EgovAuthorManageService; import kcc.let.sym.ccm.cca.service.CmmnCode; import kcc.let.sym.ccm.cca.service.EgovCcmCmmnCodeManageService; import kcc.let.sym.ccm.ccc.service.CmmnClCode; @@ -31,7 +40,10 @@ import kcc.let.sym.ccm.cde.service.EgovCcmCmmnDetailCodeManageService; import kcc.let.sym.mnu.mcm.service.MenuCreatVO; import kcc.let.sym.mnu.mpm.service.MenuManageJTreeVO; import kcc.let.sym.mnu.mpm.service.MenuManageVO; +import kcc.let.uat.uia.service.EgovLoginService; import kcc.let.uss.rnt.service.EgovCustomRankManageService; +import kcc.let.uss.umt.service.EgovUserManageService; +import kcc.let.uss.umt.service.UserDefaultVO; /** * 직급 관리하는 컨트롤러 @@ -50,11 +62,21 @@ import kcc.let.uss.rnt.service.EgovCustomRankManageService; @Controller public class EgovCustomRankManageController { + /** userManageService */ + @Resource(name = "userManageService") + private EgovUserManageService userManageService; /** userManageService */ @Resource(name = "EgovCustomRankManageService") private EgovCustomRankManageService egovCustomRankManageService; + /** cmmUseService */ + @Resource(name = "EgovCmmUseService") + private EgovCmmUseService cmmUseService; + + @Resource(name = "egovAuthorManageService") + private EgovAuthorManageService egovAuthorManageService; + //tree code 관리 @Resource(name = "CmmnDetailCodeManageService") private EgovCcmCmmnDetailCodeManageService cmmnDetailCodeManageService; @@ -66,6 +88,14 @@ public class EgovCustomRankManageController { @Resource(name = "CmmnClCodeManageService") private EgovCcmCmmnClCodeManageService cmmnClCodeManageService; + @Resource(name = "loginService") + private EgovLoginService loginService; + + //부서별 사용자 정보 + @Resource(name = "deptUsrInfoService") + private DeptUsrInfoService deptUsrInfoService; + + @RequestMapping(value = "/uss/rnt/EgovRankManageTree.do") public String selectRankManage(@ModelAttribute("menuCreatVO") MenuCreatVO menuCreatVO, @ModelAttribute("searchVO") ComDefaultVO searchVO, ModelMap model, MenuManageVO menuManageVO , HttpSession session ) throws Exception { @@ -91,7 +121,62 @@ public class EgovCustomRankManageController { // 부서관리 - 관리자 검색 팝업 @RequestMapping(value = "/uss/rnt/popup/EgovDepartmentManagePop.do") - public String selectDepartmentManagePop(@ModelAttribute("menuCreatVO") MenuCreatVO menuCreatVO, ModelMap model ) throws Exception { + public String selectDepartmentManagePop( + @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()); + } + + /** 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"); + } + 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 "cmm/uss/rnt/popup/EgovDepartmentManagePop"; } @@ -119,7 +204,19 @@ public class EgovCustomRankManageController { //CmmnDetailCodeVO searchVO = new CmmnDetailCodeVO(); searchVO.setId("CC401"); - List resultList = cmmnDetailCodeManageService.selectCmmnDetailCodeListWithCode(searchVO) ; + System.out.println("aaaaaaaaaaa23"); + List resultList = null; + + try { + resultList = cmmnDetailCodeManageService.selectCmmnDetailCodeListWithCode(searchVO) ; + }catch(Exception ex) { + ex.printStackTrace(); + } + + + //List resultList = cmmnDetailCodeManageService.selectCmmnDetailCodeListWithCode(searchVO) ; + + System.out.println("aaaaaaaaaaa2"); CmmnDetailCodeVO topCmmnDetailCodeVO = new CmmnDetailCodeVO(); topCmmnDetailCodeVO.setParent("#"); @@ -146,11 +243,11 @@ public class EgovCustomRankManageController { //CmmnDetailCodeVO searchVO = new CmmnDetailCodeVO(); searchVO.setId("CC402"); - List resultList = cmmnDetailCodeManageService.selectCmmnDetailCodeListWithCode(searchVO) ; + List resultList = cmmnDetailCodeManageService.selectCmmnDetailCodeListWithCodeDept(searchVO) ; CmmnDetailCodeVO topCmmnDetailCodeVO = new CmmnDetailCodeVO(); topCmmnDetailCodeVO.setParent("#"); - topCmmnDetailCodeVO.setId("CC402"); + topCmmnDetailCodeVO.setId("0"); topCmmnDetailCodeVO.setText("부서관리"); resultList.add(0, topCmmnDetailCodeVO); @@ -207,7 +304,7 @@ public class EgovCustomRankManageController { return modelAndView; } cmmnClCodeManageService.insertCmmnClCode(cmmnClCode); - }else if(cmmnDetailCodeVO.getNodeDepth().equals("3")){ //LETTCCMMNCODE 테이블(공통코드)) + }else if(cmmnDetailCodeVO.getNodeDepth().equals("300")){ //LETTCCMMNCODE 테이블(공통코드)) CmmnCode cmmnCode = new CmmnCode(); cmmnCode.setCodeId(newCode); cmmnCode.setCodeIdNm("공통코드"); @@ -231,7 +328,6 @@ public class EgovCustomRankManageController { } cmmnCodeManageService.insertCmmnCode(cmmnCode); }else if(cmmnDetailCodeVO.getNodeDepth().equals("2") - || cmmnDetailCodeVO.getNodeDepth().equals("4") ){ //LETTCCMMNDETAILCODE 테이블(상세코드)) cmmnDetailCodeVO.setCodeId(menuManageVO.getUpperMenuId()); cmmnDetailCodeVO.setCode(newCode); @@ -241,6 +337,22 @@ public class EgovCustomRankManageController { cmmnDetailCodeVO.setFrstRegisterId(user.getId()); cmmnDetailCodeManageService.insertCmmnDetailCode(cmmnDetailCodeVO); newCode = menuManageVO.getUpperMenuId()+"__"+ newCode ; + + }else if(cmmnDetailCodeVO.getNodeDepth().equals("3") + || cmmnDetailCodeVO.getNodeDepth().equals("4") + || cmmnDetailCodeVO.getNodeDepth().equals("5") + || cmmnDetailCodeVO.getNodeDepth().equals("6") + ){ //LETTCCMMNDETAILCODE 테이블(상세코드)) + System.out.println(menuManageVO.getUpperMenuId()); + //cmmnDetailCodeVO.setCodeId(menuManageVO.getUpperMenuId().split("__")[1]); + cmmnDetailCodeVO.setCodeId(menuManageVO.getUpperMenuId()); + cmmnDetailCodeVO.setCode(newCode); + cmmnDetailCodeVO.setCodeNm("상세코드"); + cmmnDetailCodeVO.setCodeDc("상세코드설명"); + cmmnDetailCodeVO.setUseAt("Y"); + cmmnDetailCodeVO.setFrstRegisterId(user.getId()); + cmmnDetailCodeManageService.insertCmmnDetailCodeDept(cmmnDetailCodeVO); + newCode = menuManageVO.getUpperMenuId()+"__"+ newCode ; } modelAndView.addObject("newMenuNo", newCode); modelAndView.addObject("status", "success"); @@ -296,8 +408,58 @@ public class EgovCustomRankManageController { return modelAndView; } + @RequestMapping("/uss/rnt/EgovDeptDataUpdateNmJtreeAjax.do") + public ModelAndView updateDeptInfoNmUpdateAjax(@ModelAttribute("menuManageVO") MenuManageJTreeVO menuManageVO, + @ModelAttribute("cmmnDetailCodeVO") CmmnDetailCodeVO cmmnDetailCodeVO, + ModelMap model) throws Exception { + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + LoginVO user = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser(); + try{ + System.out.println("cmmnDetailCodeVO.getNodeDepth()"); + System.out.println(cmmnDetailCodeVO.getNodeDepth()); + System.out.println(menuManageVO.getUpperMenuId()); + System.out.println(menuManageVO.getMenuNo()); + + + if(cmmnDetailCodeVO.getNodeDepth().equals("200")) { //LETTCCMMNCLCODE 테이블(분류코드) + CmmnClCode cmmnClCodeVO = new CmmnClCode(); + cmmnClCodeVO.setClCode(menuManageVO.getMenuNo()); + cmmnClCodeVO.setClCodeNm(menuManageVO.getMenuNm()); + cmmnClCodeVO.setLastUpdusrId(user.getId()); + cmmnClCodeManageService.updateCmmnClCodeNm(cmmnClCodeVO); + }else if(cmmnDetailCodeVO.getNodeDepth().equals("300")){ //LETTCCMMNCODE 테이블(공통코드)) + CmmnCode cmmnCodeVO = new CmmnCode(); + cmmnCodeVO.setCodeId(menuManageVO.getMenuNo()); + cmmnCodeVO.setCodeIdNm(menuManageVO.getMenuNm()); + cmmnCodeVO.setLastUpdusrId(user.getId()); + cmmnCodeManageService.updateCmmnCodeNm(cmmnCodeVO); + }else if(cmmnDetailCodeVO.getNodeDepth().equals("2")){ //LETTCCMMNDETAILCODE 테이블(상세코드)) + cmmnDetailCodeVO.setCodeId(menuManageVO.getUpperMenuId()); + cmmnDetailCodeVO.setCode(menuManageVO.getMenuNo()); + cmmnDetailCodeVO.setCodeNm(menuManageVO.getMenuNm()); + cmmnDetailCodeVO.setLastUpdusrId(user.getId()); + cmmnDetailCodeManageService.updateCmmnDetailNmCode(cmmnDetailCodeVO); + }else if(cmmnDetailCodeVO.getNodeDepth().equals("3") + ||cmmnDetailCodeVO.getNodeDepth().equals("4") + ||cmmnDetailCodeVO.getNodeDepth().equals("5") + ||cmmnDetailCodeVO.getNodeDepth().equals("6") + ){ //LETTCCMMNDETAILCODE 테이블(상세코드)) + cmmnDetailCodeVO.setCodeId(menuManageVO.getUpperMenuId()); + cmmnDetailCodeVO.setCode(menuManageVO.getMenuNo()); + cmmnDetailCodeVO.setCodeNm(menuManageVO.getMenuNm()); + cmmnDetailCodeVO.setLastUpdusrId(user.getId()); + cmmnDetailCodeManageService.updateCmmnDetailNmCodeDept(cmmnDetailCodeVO); + } + modelAndView.addObject("status", "success"); + }catch (Exception e) { + modelAndView.addObject("status", "fail"); + } + return modelAndView; + } + /** - * 공통 코드 정보를 조회한다. + * 공통 코드 정보를 조회한다.(직급관리) * * @param partInfVO * @param model @@ -361,6 +523,115 @@ public class EgovCustomRankManageController { return modelAndView; } + /** + * 공통 코드 정보를 조회한다.(부서관리) + * + * @param partInfVO + * @param model + * @return + * @throws Exception + */ + @RequestMapping("/uss/rnt/EgovDeptDataCodeInfoJtreeAjax.do") + public ModelAndView EgovDeptDataCodeInfoJtreeAjax(@ModelAttribute("menuManageVO") MenuManageJTreeVO menuManageVO, + @ModelAttribute("cmmnDetailCodeVO") CmmnDetailCodeVO cmmnDetailCodeVO, + @ModelAttribute("searchVO") ComDefaultVO searchVO , ModelMap model) throws Exception { + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + cmmnDetailCodeVO.setCodeId(menuManageVO.getMenuNo()); + + /*if(cmmnDetailCodeVO.getMenuCodeChange().equals("Y")) { + modelAndView.addObject("status", "success"); + return modelAndView; + }*/ + + //부서 상세 정보 가져오기 + if(cmmnDetailCodeVO.getNodeDepth().equals("200")) { //LETTCCMMNCLCODE 테이블(분류코드) + CmmnClCode cmmnClCode = new CmmnClCode(); + cmmnClCode.setClCode(menuManageVO.getMenuNo()); + + CmmnClCode cmmnClCodeVO = cmmnClCodeManageService.selectCmmnClCodeDetail(cmmnClCode); + cmmnDetailCodeVO.setCodeId(cmmnClCodeVO.getClCode()); + cmmnDetailCodeVO.setCodeNm(cmmnClCodeVO.getClCodeNm()); + cmmnDetailCodeVO.setCodeDc(cmmnClCodeVO.getClCodeDc()); + cmmnDetailCodeVO.setUseAt(cmmnClCodeVO.getUseAt()); + cmmnDetailCodeVO.setParent("0"); + + model.addAttribute("menuManageVO", cmmnDetailCodeVO); + }else if(cmmnDetailCodeVO.getNodeDepth().equals("300")){ //LETTCCMMNCODE 테이블(공통코드) + CmmnCode cmmnCode = new CmmnCode(); + cmmnCode.setCodeId(menuManageVO.getMenuNo()); + + CmmnCode cmmnCodeVO =cmmnCodeManageService.selectCmmnCodeDetail(cmmnCode); + cmmnDetailCodeVO.setCodeId(cmmnCodeVO.getCodeId()); + cmmnDetailCodeVO.setCodeNm(cmmnCodeVO.getCodeIdNm()); + cmmnDetailCodeVO.setCodeDc(cmmnCodeVO.getCodeIdDc()); + cmmnDetailCodeVO.setUseAt(cmmnCodeVO.getUseAt()); + cmmnDetailCodeVO.setParent(cmmnCodeVO.getClCode()); + model.addAttribute("menuManageVO", cmmnDetailCodeVO); + }else if(cmmnDetailCodeVO.getNodeDepth().equals("2") + ){ //LETTCCMMNDETAILCODE 테이블(상세코드) + cmmnDetailCodeVO.setCodeId(menuManageVO.getUpperMenuId()); + //cmmnDetailCodeVO.setCode(menuManageVO.getMenuNo().split("__")[1]); + cmmnDetailCodeVO.setCode(menuManageVO.getMenuNo()); + CmmnDetailCode cmmnDetailCode = new CmmnDetailCode(); + cmmnDetailCode = cmmnDetailCodeManageService.selectCmmnDetailCodeDetail(cmmnDetailCodeVO); + + cmmnDetailCodeVO.setCodeId(cmmnDetailCode.getCode()); + cmmnDetailCodeVO.setCodeNm(cmmnDetailCode.getCodeNm()); + cmmnDetailCodeVO.setCodeDc(cmmnDetailCode.getCodeDc()); + cmmnDetailCodeVO.setUseAt(cmmnDetailCode.getUseAt()); + cmmnDetailCodeVO.setParent(cmmnDetailCode.getCodeId()); + cmmnDetailCodeVO.setSortNo(cmmnDetailCode.getSortNo()); + model.addAttribute("menuManageVO", cmmnDetailCodeVO); + }else if( + cmmnDetailCodeVO.getNodeDepth().equals("3") + || cmmnDetailCodeVO.getNodeDepth().equals("4") + || cmmnDetailCodeVO.getNodeDepth().equals("5") + || cmmnDetailCodeVO.getNodeDepth().equals("6") + ){ //LETTCCMMNDETAILCODE 테이블(상세코드) + cmmnDetailCodeVO.setCodeId(menuManageVO.getUpperMenuId()); + cmmnDetailCodeVO.setCode(menuManageVO.getMenuNo()); + CmmnDetailCode cmmnDetailCode = new CmmnDetailCode(); + cmmnDetailCode = cmmnDetailCodeManageService.selectCmmnDetailCodeDetailDept(cmmnDetailCodeVO); + + cmmnDetailCodeVO.setCodeId(cmmnDetailCode.getCode()); + cmmnDetailCodeVO.setCodeNm(cmmnDetailCode.getCodeNm()); + cmmnDetailCodeVO.setCodeDc(cmmnDetailCode.getCodeDc()); + cmmnDetailCodeVO.setUseAt(cmmnDetailCode.getUseAt()); + cmmnDetailCodeVO.setParent(cmmnDetailCode.getCodeId()); + cmmnDetailCodeVO.setSortNo(cmmnDetailCode.getSortNo()); + model.addAttribute("menuManageVO", cmmnDetailCodeVO); + } + + + //상위 부서명 가져오기 + List resultList = null; + + try { + resultList = cmmnDetailCodeManageService.selectCmmnDetailCodeList4Dept(cmmnDetailCodeVO) ; + model.addAttribute("resultList", resultList); + }catch(Exception ex) { + ex.printStackTrace(); + } + + + //소속인원 정보 가져오기 + List personList = null; + + try { + DeptUsrInfoVO deptUsrInfoVO = new DeptUsrInfoVO(); + deptUsrInfoVO.setDeptTy(cmmnDetailCodeVO.getCode()); + personList = deptUsrInfoService.selectDeptPersonList(deptUsrInfoVO) ; + model.addAttribute("personList", personList); + }catch(Exception ex) { + ex.printStackTrace(); + } + + modelAndView.addObject("status", "success"); + return modelAndView; + } + /** * 매뉴 정보를 삭제한다.(트리구조에서) * @@ -371,18 +642,26 @@ public class EgovCustomRankManageController { */ @Transactional(rollbackFor = Exception.class) @RequestMapping(value = "/uss/rnt/EgovRankDataDeketeJtreeAjax.do") - public ModelAndView EgovRankDataDeketeJtreeAjax(@ModelAttribute("menuManageVO") MenuManageJTreeVO menuManageVO, - @ModelAttribute("cmmnDetailCodeVO") CmmnDetailCodeVO cmmnDetailCodeVO,ModelMap model) throws Exception { + public ModelAndView EgovRankDataDeketeJtreeAjax( + @ModelAttribute("menuManageVO") MenuManageJTreeVO menuManageVO + , @ModelAttribute("cmmnDetailCodeVO") CmmnDetailCodeVO cmmnDetailCodeVO + , ModelMap model + ) throws Exception { + ModelAndView modelAndView = new ModelAndView(); modelAndView.setViewName("jsonView"); cmmnDetailCodeVO.setCodeId(menuManageVO.getMenuNo()); + //modelAndView = this._delete(modelAndView, cmmnDetailCodeVO, menuManageVO.getMenuNo(), "CC401"); + //modelAndView = this._delete(modelAndView, cmmnDetailCodeVO, menuManageVO.getMenuNo(), menuManageVO.getAuthorCode()); + + try { //cmmnDetailCodeVO.setCode(menuManageVO.getMenuNo().split("__")[1]); cmmnDetailCodeVO.setCode(menuManageVO.getMenuNo()); - cmmnDetailCodeVO.setCodeId("CC401"); - + cmmnDetailCodeVO.setCodeId(menuManageVO.getAuthorCode()); + cmmnDetailCodeManageService.deleteCmmnDetailCode(cmmnDetailCodeVO); modelAndView.addObject("status", "success"); }catch(Exception e) { @@ -432,6 +711,151 @@ public class EgovCustomRankManageController { return modelAndView; } + /** + * 매뉴 정보를 삭제한다.(트리구조에서)-부서관리 + * + * @param partInfVO + * @param model + * @return + * @throws Exception + */ + @Transactional(rollbackFor = Exception.class) + @RequestMapping(value = "/uss/rnt/EgovDeptDataDeketeJtreeAjax.do") + public ModelAndView EgovDeptDataDeketeJtreeAjax( + @ModelAttribute("menuManageVO") MenuManageJTreeVO menuManageVO + , @ModelAttribute("cmmnDetailCodeVO") CmmnDetailCodeVO cmmnDetailCodeVO + , ModelMap model + ) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + cmmnDetailCodeVO.setCodeId(menuManageVO.getMenuNo()); + + System.out.println("menuManageVO.getMenuNo()"); + System.out.println(menuManageVO.getMenuNo()); + System.out.println(menuManageVO.getAuthorCode()); + System.out.println(menuManageVO.getUpperMenuId()); + + //modelAndView = this._delete(modelAndView, cmmnDetailCodeVO, menuManageVO.getMenuNo(), "CC401"); + //modelAndView = this._delete(modelAndView, cmmnDetailCodeVO, menuManageVO.getMenuNo(), menuManageVO.getAuthorCode()); + + //step0.어느테이블의 정보인지 확인하기 + //step1.하위 소속이 있는지 확인 하기 + //step2-1.정상이면 삭제 + //step2-2.비정상이면 삭제거부 + + + try { + //cmmnDetailCodeVO.setCode(menuManageVO.getMenuNo().split("__")[1]); + + // + + + //step0.어느테이블의 정보인지 확인하기 + cmmnDetailCodeVO.setCode(menuManageVO.getMenuNo()); + cmmnDetailCodeVO.setCodeId(menuManageVO.getUpperMenuId()); + + CmmnDetailCode cmmnDetailCodeTmp = new CmmnDetailCodeVO(); + cmmnDetailCodeTmp = cmmnDetailCodeManageService.selectCmmnDetailCodeDetail4Check(cmmnDetailCodeVO); + + + + if ("Y".equals(cmmnDetailCodeTmp.getCodeIdNm()) + && "Y".equals(cmmnDetailCodeTmp.getCodeNm()) + ){ + //동일한 값이 2개 있음 오류 + modelAndView.addObject("status", "fail"); + return modelAndView; + + }else if ("Y".equals(cmmnDetailCodeTmp.getCodeIdNm()) + ){ + //step1.하위 소속이 있는지 확인 하기 + List tmpList = cmmnDetailCodeManageService.selectCmmnCodeDept4Check(cmmnDetailCodeVO); + + System.out.println("tmpList.size()"); + System.out.println(tmpList.size()); + + if (tmpList.size()>0) { + //하위가 있음 오류 + modelAndView.addObject("status", "fail"); + return modelAndView; + } + + cmmnDetailCodeManageService.deleteCmmnDetailCode(cmmnDetailCodeVO); + + + }else if ("Y".equals(cmmnDetailCodeTmp.getCodeNm()) + ){ + //step1.하위 소속이 있는지 확인 하기 + //step1.하위 소속이 있는지 확인 하기 + List tmpList = cmmnDetailCodeManageService.selectCmmnCodeDept4Check(cmmnDetailCodeVO); + + System.out.println("tmpList.size()"); + System.out.println(tmpList.size()); + + if (tmpList.size()>0) { + //하위가 있음 오류 + modelAndView.addObject("status", "fail"); + return modelAndView; + } + + cmmnDetailCodeManageService.deleteCmmnDetailCodeDept(cmmnDetailCodeVO); + + }else { + //값이 없음 오류 + modelAndView.addObject("status", "fail"); + return modelAndView; + } + + modelAndView.addObject("status", "success"); + + }catch(Exception e) { + modelAndView.addObject("status", "fail"); + } + + /* + if(cmmnDetailCodeVO.getNodeDepth().equals("200")) { //lettccmmnclcode 테이블 + try { + CmmnCodeVO searchCodeVO = new CmmnCodeVO(); //참조키 리스트 조회(공통코드) + searchCodeVO.setClCode(menuManageVO.getMenuNo()); + int extCnt = cmmnCodeManageService.selectExistCmmncodeCnt(searchCodeVO) ; + if(extCnt > 0) { + modelAndView.addObject("status", "duplPk"); + return modelAndView; + } + CmmnClCode cmmnClCode = new CmmnClCode(); //분류코드 + cmmnClCode.setClCode(menuManageVO.getMenuNo()); + cmmnClCodeManageService.deleteCmmnClCode(cmmnClCode); + modelAndView.addObject("status", "success"); + }catch(Exception e) { + modelAndView.addObject("status", "fail"); + } + }if(cmmnDetailCodeVO.getNodeDepth().equals("3")) { //공통코드 + try { + CmmnCode cmmnCode = new CmmnCode(); + cmmnCode.setCodeId(menuManageVO.getMenuNo()); + cmmnCodeManageService.deleteCmmnCode(cmmnCode); + modelAndView.addObject("status", "success"); + }catch(Exception e) { + modelAndView.addObject("status", "fail"); + } + }else if(cmmnDetailCodeVO.getNodeDepth().equals("4") + ||cmmnDetailCodeVO.getNodeDepth().equals("2")){ //LETTCCMMNDETAILCODE 테이블(상세코드)) + try { + //cmmnDetailCodeVO.setCode(menuManageVO.getMenuNo().split("__")[1]); + cmmnDetailCodeVO.setCode(menuManageVO.getMenuNo()); + cmmnDetailCodeVO.setCodeId(menuManageVO.getUpperMenuId()); + + cmmnDetailCodeManageService.deleteCmmnDetailCode(cmmnDetailCodeVO); + modelAndView.addObject("status", "success"); + }catch(Exception e) { + modelAndView.addObject("status", "fail"); + } + } + */ + return modelAndView; + } + /** * 코드 정보를 수정한다. * @@ -452,45 +876,37 @@ public class EgovCustomRankManageController { modelAndView.setViewName("jsonView"); LoginVO user = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser(); - try{ - System.out.println("cmmnDetailCodeVO.getNodeDepth()"); - System.out.println(cmmnDetailCodeVO.getNodeDepth()); - String newCode = menuManageVO.getMenuNo() ; - System.out.println(newCode); + + //step0.어느테이블의 정보인지 확인하기 + //step1.하위 소속이 있는지 확인 하기 + //step2-1.정상이면 삭제 + //step2-2.비정상이면 삭제거부 + + + try { + //cmmnDetailCodeVO.setCode(menuManageVO.getMenuNo().split("__")[1]); + + // + - cmmnDetailCodeVO.setCodeId(menuManageVO.getUpperMenuId()); + //step0.어느테이블의 정보인지 확인하기 cmmnDetailCodeVO.setCode(menuManageVO.getMenuNo()); - cmmnDetailCodeVO.setTempCodeId(menuManageVO.getTmp_Id()); - cmmnDetailCodeVO.setCodeNm(menuManageVO.getMenuNm()); - cmmnDetailCodeVO.setCodeDc(menuManageVO.getMenuDc()); - cmmnDetailCodeVO.setUseAt(menuManageVO.getUseYn()); - cmmnDetailCodeVO.setLastUpdusrId(user.getId()); - //cmmnDetailCodeManageService.updateCmmnDetailCode(cmmnDetailCodeVO); - cmmnDetailCodeManageService.updateCmmnDetailCodePk(cmmnDetailCodeVO); - newCode = menuManageVO.getUpperMenuId()+"__"+menuManageVO.getMenuNo(); + cmmnDetailCodeVO.setCodeId(menuManageVO.getUpperMenuId()); + + CmmnDetailCode cmmnDetailCodeTmp = new CmmnDetailCodeVO(); + cmmnDetailCodeTmp = cmmnDetailCodeManageService.selectCmmnDetailCodeDetail4Check(cmmnDetailCodeVO); - /* - if(cmmnDetailCodeVO.getNodeDepth().equals("200")) { //LETTCCMMNCLCODE 테이블(분류코드) - CmmnClCode cmmnClCodeVO = new CmmnClCode(); - cmmnClCodeVO.setClCode(menuManageVO.getMenuNo()); - cmmnClCodeVO.setTempClCode(menuManageVO.getTmp_Id()); - cmmnClCodeVO.setClCodeNm(menuManageVO.getMenuNm()); - cmmnClCodeVO.setClCodeDc(menuManageVO.getMenuDc()); - cmmnClCodeVO.setLastUpdusrId(user.getId()); - cmmnClCodeVO.setUseAt(menuManageVO.getUseYn()); - cmmnClCodeManageService.updateCmmnClCodePk(cmmnClCodeVO); - }else if(cmmnDetailCodeVO.getNodeDepth().equals("3")){ //LETTCCMMNCODE 테이블(공통코드)) - CmmnCode cmmnCodeVO = new CmmnCode(); - cmmnCodeVO.setCodeId(menuManageVO.getMenuNo()); - cmmnCodeVO.setTempCodeId(menuManageVO.getTmp_Id()); - cmmnCodeVO.setCodeIdNm(menuManageVO.getMenuNm()); - cmmnCodeVO.setCodeIdDc(menuManageVO.getMenuDc()); - cmmnCodeVO.setUseAt(menuManageVO.getUseYn()); - cmmnCodeVO.setLastUpdusrId(user.getId()); - cmmnCodeManageService.updateCmmnCodePk(cmmnCodeVO); - }else if(cmmnDetailCodeVO.getNodeDepth().equals("4") - || cmmnDetailCodeVO.getNodeDepth().equals("2") - ){ //LETTCCMMNDETAILCODE 테이블(상세코드)) + + + if ("Y".equals(cmmnDetailCodeTmp.getCodeIdNm()) + && "Y".equals(cmmnDetailCodeTmp.getCodeNm()) + ){ + //동일한 값이 2개 있음 오류 + modelAndView.addObject("status", "fail"); + return modelAndView; + + }else if ("Y".equals(cmmnDetailCodeTmp.getCodeIdNm()) //오리지널 + ){ cmmnDetailCodeVO.setCodeId(menuManageVO.getUpperMenuId()); cmmnDetailCodeVO.setCode(menuManageVO.getMenuNo()); cmmnDetailCodeVO.setTempCodeId(menuManageVO.getTmp_Id()); @@ -500,15 +916,152 @@ public class EgovCustomRankManageController { cmmnDetailCodeVO.setLastUpdusrId(user.getId()); //cmmnDetailCodeManageService.updateCmmnDetailCode(cmmnDetailCodeVO); cmmnDetailCodeManageService.updateCmmnDetailCodePk(cmmnDetailCodeVO); - newCode = menuManageVO.getUpperMenuId()+"__"+menuManageVO.getMenuNo(); - } - */ + String newCode = menuManageVO.getUpperMenuId()+"__"+menuManageVO.getMenuNo(); + + modelAndView.addObject("status", "success"); + modelAndView.addObject("newMenuNo", newCode); + modelAndView.addObject("nodeDepth", cmmnDetailCodeVO.getNodeDepth()); + + }else if ("Y".equals(cmmnDetailCodeTmp.getCodeNm()) //_dept + ){ + cmmnDetailCodeVO.setCodeId(menuManageVO.getUpperMenuId()); + cmmnDetailCodeVO.setCode(menuManageVO.getMenuNo()); + cmmnDetailCodeVO.setTempCodeId(menuManageVO.getTmp_Id()); + cmmnDetailCodeVO.setTmpCmd(menuManageVO.getTmp_Cmd()); + cmmnDetailCodeVO.setCodeNm(menuManageVO.getMenuNm()); + cmmnDetailCodeVO.setCodeDc(menuManageVO.getMenuDc()); + cmmnDetailCodeVO.setUseAt(menuManageVO.getUseYn()); + cmmnDetailCodeVO.setLastUpdusrId(user.getId()); + //cmmnDetailCodeManageService.updateCmmnDetailCode(cmmnDetailCodeVO); + cmmnDetailCodeManageService.updateCmmnDetailCodeDeptPk(cmmnDetailCodeVO); + String newCode = menuManageVO.getUpperMenuId()+"__"+menuManageVO.getMenuNo(); + + modelAndView.addObject("status", "success"); + modelAndView.addObject("newMenuNo", newCode); + modelAndView.addObject("nodeDepth", cmmnDetailCodeVO.getNodeDepth()); + + }else { + //값이 없음 오류 + modelAndView.addObject("status", "fail"); + return modelAndView; + } + modelAndView.addObject("status", "success"); - modelAndView.addObject("newMenuNo", newCode); - modelAndView.addObject("nodeDepth", cmmnDetailCodeVO.getNodeDepth()); - }catch (Exception e) { + + }catch(Exception e) { modelAndView.addObject("status", "fail"); } + return modelAndView; } + + /** + * 소속인원삭제 + * + * @param partInfVO + * @param model + * @return + * @throws Exception + */ + @Transactional(rollbackFor = Exception.class) + @RequestMapping("/uss/rnt/EgovDeptPersonDeleteAjax.do") + public ModelAndView EgovDeptPersonDeleteAjax( + @ModelAttribute("deptUsrInfoVO") DeptUsrInfoVO deptUsrInfoVO + , ModelMap model) throws Exception { + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + LoginVO user = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser(); + + //step1.해당 부서의 하위 소속인원 삭제처리(dept_seq) + + int i_ret = 0; + + try { + //cmmnDetailCodeVO.setCode(menuManageVO.getMenuNo().split("__")[1]); + + // + i_ret = deptUsrInfoService.delete(deptUsrInfoVO); + + if (i_ret<=0) { + modelAndView.addObject("status", "fail"); + }else { + modelAndView.addObject("status", "success"); + } + + }catch(Exception e) { + modelAndView.addObject("status", "fail"); + } + + return modelAndView; + } + + /** + * 소속인원등록 + * + * @param partInfVO + * @param model + * @return + * @throws Exception + */ + @Transactional(rollbackFor = Exception.class) + @RequestMapping("/uss/rnt/EgovDeptPersonInsertAjax.do") + public ModelAndView EgovDeptPersonInsertAjax( + @ModelAttribute("deptUsrInfoVO") DeptUsrInfoVO deptUsrInfoVO + , ModelMap model) throws Exception { + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + LoginVO user = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser(); + + //step1.해당 부서의 하위 소속인원 등록처리(dept_seq) + + int i_ret = 0; + + try { + //cmmnDetailCodeVO.setCode(menuManageVO.getMenuNo().split("__")[1]); + + // + + deptUsrInfoVO.setFrstRegisterId(user.getUniqId()); + + + String[] a_mngrIds = deptUsrInfoVO.getMngrId().split(","); + for (int i=0;i + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/egovframework/sqlmap/kccadr/advcDept/DeptUsrInfo_SQL_Cubrid.xml b/src/main/resources/egovframework/sqlmap/kccadr/advcDept/DeptUsrInfo_SQL_Cubrid.xml index bbcfe87e..acb22c7c 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/advcDept/DeptUsrInfo_SQL_Cubrid.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/advcDept/DeptUsrInfo_SQL_Cubrid.xml @@ -13,24 +13,35 @@ + /* dept_seq, + */ dept_ty, mngr_id, frst_regist_pnttm, - frst_register_id + frst_register_id, + + last_updt_pnttm, + last_updusr_id +/* a.dept_seq AS deptSeq, + */ a.dept_ty AS deptTy, a.mngr_id AS mngrId, DATE_FORMAT(a.frst_regist_pnttm,'%Y-%m-%d %H:%i:%s') AS frstRegistPnttm, - a.frst_register_id AS frstRegisterId + a.frst_register_id AS frstRegisterId, + + DATE_FORMAT(a.last_updt_pnttm,'%Y-%m-%d %H:%i:%s') AS lastUpdtPnttm, + a.last_updusr_id AS lastUpdusrId + @@ -43,14 +54,20 @@ )VALUES( - #deptSeq#, #deptTy#, #mngrId#, NOW(), - #frstRegisterId# + #frstRegisterId#, + NULL, + NULL + ) + ON DUPLICATE KEY UPDATE + last_updt_pnttm = NOW() + , last_updusr_id = #lastUpdusrId# + @@ -59,8 +76,9 @@ FROM a - WHERE - a.dept_seq = #deptSeq# + WHERE + a.dept_ty = #deptTy# + AND a.mngr_id = #mngrId# @@ -70,7 +88,8 @@ SET - dept_seq = #deptSeq# + last_updt_pnttm = NOW() + , last_updusr_id = #lastUpdusrId# , dept_ty = #deptTy# @@ -81,7 +100,8 @@ WHERE - dept_seq = #deptSeq# + dept_ty = #deptTy# + AND mngr_id = #mngrId# @@ -90,7 +110,8 @@ DELETE FROM WHERE - dept_seq = #deptSeq# + dept_ty = #deptTy# + AND mngr_id = #mngrId# @@ -106,7 +127,11 @@ AND a.dept_seq = #deptSeq# - + + AND a.mngr_id = #mngrId# + + + ORDER BY a.frst_regist_pnttm @@ -126,7 +151,11 @@ AND a.dept_seq = #deptSeq# - + + + AND a.mngr_id = #mngrId# + + $selectPagingListQuery$ @@ -144,5 +173,24 @@ LIMIT #recordCountPerPage# OFFSET #firstIndex# - + + + + + diff --git a/src/main/resources/egovframework/sqlmap/let/sym/ccm/cde/EgovCmmnDetailCodeManage_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/sym/ccm/cde/EgovCmmnDetailCodeManage_SQL_Mysql.xml index bfcebb0a..09605ac0 100644 --- a/src/main/resources/egovframework/sqlmap/let/sym/ccm/cde/EgovCmmnDetailCodeManage_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/sym/ccm/cde/EgovCmmnDetailCodeManage_SQL_Mysql.xml @@ -84,6 +84,73 @@ ]]> + + + + + + + + + - + + + + + - 부서명 + 상위부서명 - + + + 상위 코드 + + + + + 부서설명 - - - - - 사용/미사용 - - + + + 코드순서 + + + + + + + 사용/미사용 + + + + 소속인원 @@ -827,7 +1013,7 @@ - + 1 홍길동 @@ -858,8 +1044,8 @@
- - + +
@@ -868,5 +1054,9 @@ +
+ + +
\ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/rnt/EgovRankManageTree.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/rnt/EgovRankManageTree.jsp index 9fc2011b..750c6d68 100644 --- a/src/main/webapp/WEB-INF/jsp/cmm/uss/rnt/EgovRankManageTree.jsp +++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/rnt/EgovRankManageTree.jsp @@ -97,7 +97,8 @@ //alert("loaded_"); //console.log("jstree loaded"); //$(this).jstree(true).open_all(); - $('#kopost_organization').jstree('open_node' , $('#0') ) + //$('#kopost_organization').jstree('open_node' , $('#0') ) + $('#kopost_organization').jstree('open_all' ); }) .on('select_node.jstree', function (e, data) { //우클릭시 //alert("select_node"); @@ -365,7 +366,7 @@ //alert(modiNodeId); if(modiNodeId !=""){ - $('#'+data.instance.get_node(modiNodeId).a_attr.id).trigger("click"); + //$('#'+data.instance.get_node(modiNodeId).a_attr.id).trigger("click"); } }); } @@ -420,7 +421,12 @@ $.ajax({ type:"POST", "url" : "", - data:{ "menuNo" : p_menuNo, "upperMenuId" : $('#upperMenuId').val() }, + data:{ + "menuNo" : p_menuNo + , "upperMenuId" : $('#upperMenuId').val() + , "authorCode" : "CC401" + }, + dataType:'json', //timeout:(1000*30), success : function(returnData, status) { @@ -758,7 +764,7 @@
-

직급 추가등록 상세

+

직급 상세

diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/rnt/popup/EgovDepartmentManagePop.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/rnt/popup/EgovDepartmentManagePop.jsp index d9fa5d8e..e7c1ff7e 100644 --- a/src/main/webapp/WEB-INF/jsp/cmm/uss/rnt/popup/EgovDepartmentManagePop.jsp +++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/rnt/popup/EgovDepartmentManagePop.jsp @@ -14,6 +14,104 @@ function fncGoClose() { self.close(); } + +function fnCheckAll(){ + var checkField = document.listForm.checkField; + if(document.listForm.checkAll.checked) { + if(checkField) { + if(checkField.length > 1) { + for(var i=0; i < checkField.length; i++) { + checkField[i].checked = true; + } + } else { + checkField.checked = true; + } + } + } else { + if(checkField) { + if(checkField.length > 1) { + for(var j=0; j < checkField.length; j++) { + checkField[j].checked = false; + } + } else { + checkField.checked = false; + } + } + } +} +function fnInsertUser() { + if($("input:checkbox[name='checkField']").is(":checked")==false){ + alert("선택된 항목이 없습니다."); + return; + } + var checkField = document.listForm.checkField; + var id = document.listForm.checkId; + var checkedIds = ""; + var checkedCount = 0; + if(checkField) { + if(checkField.length > 1) { + for(var i=0; i < checkField.length; i++) { + if(checkField[i].checked) { + checkedIds += ((checkedCount==0? "" : ",") + id[i].value); + checkedCount++; + } + } + } else { + if(checkField.checked) { + checkedIds = id.value; + } + } + } + //alert(checkedIds); + + top.window.opener.fn_insert_person(checkedIds); + /* + if(checkedIds.length > 0) { + //alert(checkedIds); + if(confirm("")){ + document.listForm.checkedIdForDel.value=checkedIds; + document.listForm.action = ""; + document.listForm.submit(); + } + } + */ + + fncGoClose(); +} +function fnSelectUser(id) { + document.modiForm.selectedId.value = id; + array = id.split(":"); + if(array[0] == "") { + } else { + userTy = array[0]; + userId = array[1]; + } + document.modiForm.selectedId.value = userId; + document.modiForm.action = ""; + document.modiForm.submit(); +} + +function fnSearch(){ + <%-- + if(""!= document.listForm.searchKeyword.value){ + updateRecentSearch();//최근검색어 등록 + } + --%> + + linkPage(1); +} + +function linkPage(pageNo){ + var listForm = document.listForm ; + listForm.pageIndex.value = pageNo ; + listForm.searchCondition.value = $('#searchCondition').val(); + if($('#searchConditionSite').length != 0){ + listForm.searchConditionSite.value = $('#searchConditionSite').val(); + } + listForm.searchKeyword.value = $('#searchKeyword').val(); + listForm.action = ""; + listForm.submit(); +}