diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/impl/PgrCmmServiceImpl.java b/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/impl/PgrCmmServiceImpl.java index 0ef249ad..e7cceefe 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/impl/PgrCmmServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/impl/PgrCmmServiceImpl.java @@ -64,8 +64,6 @@ public class PgrCmmServiceImpl implements PgrCmmService { PgrCmmVO result = pgrCmmDAO.selectPgrCmm(pgrCmmVO); decpyptVo(result); - - System.out.println("result.getAppPlace() : "+ result.getAppPlace()); if (!StringUtil.isEmpty(result.getAppPlace())) { String app[] = (result.getAppPlace()).split("\\|"); diff --git a/src/main/java/kcc/kccadr/adjReqMgrOff/web/AdjReqMgrOffLineController.java b/src/main/java/kcc/kccadr/adjReqMgrOff/web/AdjReqMgrOffLineController.java index 04e5b68b..749ffeaf 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrOff/web/AdjReqMgrOffLineController.java +++ b/src/main/java/kcc/kccadr/adjReqMgrOff/web/AdjReqMgrOffLineController.java @@ -1,5 +1,7 @@ package kcc.kccadr.adjReqMgrOff.web; +import java.io.OutputStreamWriter; +import java.io.PrintWriter; import java.util.ArrayList; import java.util.Iterator; import java.util.LinkedHashMap; @@ -9,6 +11,7 @@ import java.util.Properties; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -23,6 +26,8 @@ import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.support.RedirectAttributes; +import com.fasterxml.jackson.databind.ObjectMapper; + import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; import kcc.com.cmm.LoginVO; @@ -34,6 +39,7 @@ import kcc.com.cmm.util.StringUtil; import kcc.com.utl.fcc.service.EgovStringUtil; import kcc.kccadr.adjReqMgrOff.service.AdjReqMgrOffLineService; import kcc.kccadr.adjReqMgrOff.service.AdjReqMgrOffLineVO; +import kcc.let.sym.mnu.mpm.service.MenuManageJTreeVO; import kcc.let.utl.fcc.service.EgovCryptoUtil; @Controller @@ -585,14 +591,35 @@ public class AdjReqMgrOffLineController { } /** - * auth : bhkim - * 전자조정신청 목록 화면 - * date : 2021.09.111 + * auth : 이준호 + * 결재선 지정 팝업 + * date : 2022.09.23 */ @RequestMapping("/kccadr/adjReqMgOff/popup/adjReqMgrOffAppReqPop.do") public String adjReqMgrOffAppReqPop(@ModelAttribute("adjReqMgrOffLineVO") AdjReqMgrOffLineVO adjReqMgrOffLineVO, ModelMap model) throws Exception { return "kccadr/adjReqMgrOff/popup/adjReqMgrOffAppReqPop"; } + + @RequestMapping("/kccadr/adjReqMgOff/adjReqMgrOffAppReqPopAjax.do") + public void adjReqMgrOffAppReqPopAjax(@ModelAttribute("menuManageVO") MenuManageJTreeVO menuManageVO, ModelMap model, + HttpServletResponse response , HttpServletRequest request) throws Exception { + ObjectMapper mapper = new ObjectMapper(); + //response.setHeader("Content-Type", "text/html;charset=utf-8"); + PrintWriter out = new PrintWriter(new OutputStreamWriter(response.getOutputStream(), "UTF-8")); + + + List resultList = null ; + + MenuManageJTreeVO menuManageTopVO = new MenuManageJTreeVO(); + menuManageTopVO.setUpperMenuId("#"); + menuManageTopVO.setMenuNo("0"); + menuManageTopVO.setMenuNm("관련인"); + + resultList.add(0, menuManageTopVO); + System.out.println("resultList :: "+resultList); + mapper.writeValue(out, resultList); + out.flush(); + } public void decryptInfomation(List list, AdjReqMgrOffLineVO info){ diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java index 589ad02b..58f2140d 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java @@ -16,13 +16,19 @@ public interface AdjReqMgrPastService { ResponseEntity insertAdjReqMgrRpplReq(AdjReqMgrPastVO adjReqMgrPastVO) throws Exception; ResponseEntity checkNInsertAprvlPastAjax(AdjReqMgrPastVO adjReqMgrPastVO) throws Exception; + + ResponseEntity checkNUpdateAprvlPastAjax(AdjReqMgrPastVO adjReqMgrPastVO) throws Exception; List selectAdrPrtclMgrPastList(AdjReqMgrPastVO adjReqMgrPastVO); AdjReqMgrPastVO selectMemAss(AdjReqMgrPastVO adjReqMgrPastVO); + + List findAllAssPstInfo(AdjReqMgrPastVO adjReqMgrPastVO); AdjReqMgrPastVO findByIdPrtclMgr(AdjReqMgrPastVO adjReqMgrPastVO); List selectAdrRpplPastList(AdjReqMgrPastVO adjReqMgrPastVO); + + AdjReqMgrPastVO findByIdAdrMgrMaster(AdjReqMgrPastVO adjPastVO); } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastVO.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastVO.java index 3e667a71..093fe457 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastVO.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastVO.java @@ -36,6 +36,7 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable { private String nextAppDeDay; /* 다음조정기일일시 */ private String appPlaceTx; /* 조정기일장소 */ + private String addUsrNm; /* 조정부장 */ private String addUsrNm0; /* 조정부장 */ private String addUsrNm1; /* 조정위원1 */ private String addUsrNm2; /* 조정위원2 */ @@ -105,11 +106,14 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable { private String rpplPhone3 = ""; // 연락처3 private String rpplRelation = ""; //신청인과의 관계() private String rpplRelationEtc = ""; //신청인과의 관계 기타 입력 - + + private String assUsrTy = ""; //신청인과의 관계 기타 입력 private String addUsrIdList[]; /* ass.addUsrId | ass.assUsrTy | add_yn " */ private String addUsrId; /* ass.addUsrId | ass.assUsrTy | add_yn " */ private String addAgntList[]; /* ass.agntSeq | ass.assUsrTy | add_yn " */ - // 조정기일대리인 + + // 조정기일대리인 + private String addUsrNmList[]; /* ass.agntSeq | ass.assUsrTy | add_yn " */ private String adrSn = ""; // 조정회차 private String agntSeq = ""; // 대리인일련번호 private String agntSbmtYn = ""; // 조정대리신청제출여부 @@ -182,9 +186,9 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable { private String assPstUsrTy; private String addYn; private String addChgYn; + private String ccTyTx; - - + private String appPlaceDetailTx; public AdjReqMgrVO getAdrVO() { return adrVO; @@ -306,6 +310,14 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable { this.appPlaceTx = appPlaceTx; } + public String getAddUsrNm() { + return addUsrNm; + } + + public void setAddUsrNm(String addUsrNm) { + this.addUsrNm = addUsrNm; + } + public String getAddUsrNm0() { return addUsrNm0; } @@ -802,6 +814,14 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable { this.rpplRelationEtc = rpplRelationEtc; } + public String getAssUsrTy() { + return assUsrTy; + } + + public void setAssUsrTy(String assUsrTy) { + this.assUsrTy = assUsrTy; + } + public String[] getAddUsrIdList() { return addUsrIdList; } @@ -1185,6 +1205,32 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable { public void setAddChgYn(String addChgYn) { this.addChgYn = addChgYn; } + + public String getCcTyTx() { + return ccTyTx; + } + + public void setCcTyTx(String ccTyTx) { + this.ccTyTx = ccTyTx; + } + + public String getAppPlaceDetailTx() { + return appPlaceDetailTx; + } + + public void setAppPlaceDetailTx(String appPlaceDetailTx) { + this.appPlaceDetailTx = appPlaceDetailTx; + } + + public String[] getAddUsrNmList() { + return addUsrNmList; + } + + public void setAddUsrNmList(String[] addUsrNmList) { + this.addUsrNmList = addUsrNmList; + } + + // ============================================= diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java index 799e1d57..aafb8487 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java @@ -60,6 +60,10 @@ public class AdjReqMgrPastDAO extends EgovAbstractDAO { public void insertAdjAssList(List adjAssMgrPastList) { insert("adjReqMgrPastDAO.insertAdjAssList", adjAssMgrPastList ); } + + public void updateAdjAss(AdjAssMgrPastVO adjAssMgrPastList) { + update("adjReqMgrPastDAO.updateAdjAss", adjAssMgrPastList ); + } public void updateAdrPrtclMgr(AdjReqMgrPastVO adjPastVO) { update("adjReqMgrPastDAO.updateAdrPrtclMgr", adjPastVO ); @@ -73,5 +77,13 @@ public class AdjReqMgrPastDAO extends EgovAbstractDAO { return (List) list("adjReqMgrPastDAO.selectAdrRpplPastList", adjReqMgrPastVO); } + + public List findAllAssPstInfo(AdjReqMgrPastVO adjReqMgrPastVO) { + return (List) list("adjReqMgrPastDAO.findAllAssPstInfo", adjReqMgrPastVO); + } + + public AdjReqMgrPastVO findByIdAdrMgrMaster(AdjReqMgrPastVO adjPastVO) { + return (AdjReqMgrPastVO) select("adjReqMgrPastDAO.findByIdAdrMgrMaster", adjPastVO); + } } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java index 1609f451..5e097bc4 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java @@ -4,6 +4,7 @@ import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; import javax.annotation.Resource; @@ -12,6 +13,8 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; +import com.mchange.v2.sql.filter.SynchronizedFilterCallableStatement; + import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl; import egovframework.rte.fdl.cmmn.exception.FdlException; import egovframework.rte.fdl.idgnr.EgovIdGnrService; @@ -542,13 +545,37 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements System.out.println(" 공개여부 :: "+adjPastVO.getOpenYn()); -// this.insertAdjAssAndDataCleansing(adjPastVO); - this.insertAdrPrtclMgrAndDataCleansing(adjPastVO); + this.insertAdjAssAndDataCleansing(adjPastVO); + this.updateAdrPrtclMgrAndDataCleansing(adjPastVO); + return ResponseEntity.ok(new RestResponse(HttpStatus.OK, "기일조서 등록이 완료되었습니다.", LocalDateTime.now())); + } + + @Override + public ResponseEntity checkNUpdateAprvlPastAjax(AdjReqMgrPastVO adjPastVO) throws Exception { + + System.out.println(" 조정기일일 :: "+adjPastVO.getAppDeDay()); + System.out.println(" 조정기일시 :: "+adjPastVO.getAppDeTime()); + System.out.println(" 다음조정기일일 :: "+adjPastVO.getNextAppDeDay()); + System.out.println(" 다음조정기일시 :: "+adjPastVO.getNextAppDeTime()); + System.out.println(" 조정기일장소 :: "+adjPastVO.getAppPlaceTx()); + System.out.println(" 기일조서내용 :: "+adjPastVO.getPrtclCn()); + System.out.println(" 장소 Type :: "+adjPastVO.getAppPlaceTy()); + System.out.println(" 장소 :: "+adjPastVO.getAppPlaceTx()); + System.out.println(" 공개여부 :: "+adjPastVO.getOpenYn()); + + try { + this.updateAdjAssAndDataCleansing(adjPastVO); + + } catch (Exception e) { + e.printStackTrace(); + } + +// this.updateAdrPrtclMgrAndDataCleansing(adjPastVO); return ResponseEntity.ok(new RestResponse(HttpStatus.OK, "기일조서 등록이 완료되었습니다.", LocalDateTime.now())); } - private void insertAdrPrtclMgrAndDataCleansing(AdjReqMgrPastVO adjPastVO) { + private void updateAdrPrtclMgrAndDataCleansing(AdjReqMgrPastVO adjPastVO) { String addDe = adjPastVO.getAppDeDay()+" "+adjPastVO.getAppDeTime(); @@ -567,7 +594,6 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements adjReqMgrPastDAO.updateAdrPrtclMgr(adjPastVO); } - public void insertAdjAssAndDataCleansing(AdjReqMgrPastVO adjPastVO) throws FdlException { List adjAssMgrPastList = new ArrayList(); @@ -647,11 +673,64 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements adjReqMgrPastDAO.insertAdjAssList(adjAssMgrPastList); } + + // 과거사건 기일조서 수정 + public void updateAdjAssAndDataCleansing(AdjReqMgrPastVO adjPastVO) throws FdlException { + + + /* 신청인 */ + AdjAssMgrPastVO adjAssMgrPastVO = new AdjAssMgrPastVO(adjPastVO); + + for(String addusrList : adjPastVO.getAddUsrIdList()) + { + adjAssMgrPastVO = new AdjAssMgrPastVO(adjPastVO); + adjAssMgrPastVO.setAssPstSeq(addusrList.split("\\|")[0]); + adjAssMgrPastVO.setAddYn(addusrList.split("\\|")[1]); + adjReqMgrPastDAO.updateAdjAss(adjAssMgrPastVO); + } + + + for(String addusrList : adjPastVO.getAddAgntList()) + { + if(StringUtils.isNotEmpty(addusrList)) + { + adjAssMgrPastVO = new AdjAssMgrPastVO(adjPastVO); + adjAssMgrPastVO.setAssPstSeq(addusrList.split("\\|")[0]); + adjAssMgrPastVO.setAssPstUsrNm(addusrList.split("\\|")[1]); + adjAssMgrPastVO.setAddYn("Y"); + adjReqMgrPastDAO.updateAdjAss(adjAssMgrPastVO); + } + } + + // 조정위원 + for(String addusrList : adjPastVO.getAddUsrNmList()) + { + if(StringUtils.isNotEmpty(addusrList)) + { + adjAssMgrPastVO = new AdjAssMgrPastVO(adjPastVO); + adjAssMgrPastVO.setAssPstSeq(addusrList.split("\\|")[0]); + adjAssMgrPastVO.setAssPstUsrTy(addusrList.split("\\|")[1]); + adjAssMgrPastVO.setAssPstUsrNm(addusrList.split("\\|")[2]); + adjAssMgrPastVO.setAddYn("Y"); + adjReqMgrPastDAO.updateAdjAss(adjAssMgrPastVO); + } + } + + } @Override public AdjReqMgrPastVO findByIdPrtclMgr(AdjReqMgrPastVO adjReqMgrPastVO) { - return adjReqMgrPastDAO.findByIdPrtclMgr(adjReqMgrPastVO); + AdjReqMgrPastVO adjPastVO = adjReqMgrPastDAO.findByIdPrtclMgr(adjReqMgrPastVO); + + adjPastVO.setAppDeDay(adjPastVO.getAppDe().split(" ")[0]); + String appTime = adjPastVO.getAppDe().split(" ")[1]; + adjPastVO.setAppDeTime(appTime.substring(0, appTime.lastIndexOf(":"))); + + adjPastVO.setNextAppDeDay(adjPastVO.getNextAppDe().split(" ")[0]); + String appNextTime = adjPastVO.getNextAppDe().split(" ")[1]; + adjPastVO.setNextAppDeTime(appNextTime.substring(0, appTime.lastIndexOf(":"))); + return adjPastVO; } @@ -661,6 +740,22 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements return adjReqMgrPastDAO.selectAdrRpplPastList(adjReqMgrPastVO); } + + @Override + public List findAllAssPstInfo(AdjReqMgrPastVO adjReqMgrPastVO) { + +// List adjReqMgrPastListVO = adjReqMgrPastDAO.findAllAssPstInfo(adjReqMgrPastVO); +// List usrTyList = adjReqMgrPastListVO.stream().map(AdjReqMgrPastVO::getAssPstUsrTy).collect(Collectors.toList()); + + return adjReqMgrPastDAO.findAllAssPstInfo(adjReqMgrPastVO); + } + + + @Override + public AdjReqMgrPastVO findByIdAdrMgrMaster(AdjReqMgrPastVO adjPastVO) { + return adjReqMgrPastDAO.findByIdAdrMgrMaster(adjPastVO); + } + } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java index a08da26a..62af11eb 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java @@ -200,7 +200,7 @@ public class AdjReqMgrPastController { // PgrCmmVO info = cmmService.selectPgrCmm(cmmVO); // model.addAttribute("info", info); // model.addAttribute("adjReqMgrPastListVO", adjReqMgrPastService.selectAdrPrtclMgrPastList(adjReqMgrPastVO)); - + List rpplList = new ArrayList(); rpplList = adjReqMgrPastService.selectAdrRpplPastList(adjReqMgrPastVO); @@ -241,16 +241,6 @@ public class AdjReqMgrPastController { model.addAttribute("memAss", adjReqMgrPastService.selectMemAss(adjReqVO)); - // 등록된 값이 있으면 select - if(StringUtils.isNotEmpty(cmmVO.getPrtclCn())) - { - List apmChgInfo = apmService.selectApmChgDateInfo(cmmVO); - model.addAttribute("apmChgInfo", apmChgInfo.get(0)); - //조정위원 정보 불러오기 - PgrCmmVO dntVO = this.getDntInfo(cmmVO); - model.addAttribute("uiwonInfo", dntVO); - - } model.addAttribute("newAdrSn", cmmVO.getNowAdrSn()); @@ -274,32 +264,27 @@ public class AdjReqMgrPastController { AdjReqMgrPastVO adjPastVO = adjReqMgrPastService.findByIdPrtclMgr(adjReqMgrPastVO); + System.out.println(" adjPastVO.getPrtclCn() :: " + adjPastVO.getPrtclCn()); + + model.addAttribute("adjPastVO", adjPastVO); - -// DrtVO drtVO = new DrtVO(); -// drtVO.setAdrSeq(adjReqMgrPastVO.); -// drtVO.setAdrSn(adrSeq); - -// model.addAttribute("assList", drtService.selectAssRegList(drtVO)); - - //사건 정보 불러오기 -// PgrCmmVO info = cmmService.selectPgrCmm(cmmVO); + DrtVO drtVO = new DrtVO(); + drtVO.setAdrSeq(adjPastVO.getAdrSeq()); + drtVO.setAdrSn(adjPastVO.getAdrSn()); + model.addAttribute("assList", drtService.selectAssRegList(drtVO)); + + model.addAttribute("info", adjReqMgrPastService.findByIdAdrMgrMaster(adjPastVO)); /* 조정부 / 조정조사관 select */ -// AdjReqMgrPastVO adjReqVO = new AdjReqMgrPastVO(); -// adjReqVO.setAdrSeq(cmmVO.getAdrSeq()); -// model.addAttribute("memAss", adjReqMgrPastService.selectMemAss(adjReqVO)); + model.addAttribute("memAss", adjReqMgrPastService.selectMemAss(adjPastVO)); + + List list = adjReqMgrPastService.findAllAssPstInfo(adjPastVO); + list.stream().forEach(System.out::println); + /* 참석 인원 select */ + model.addAttribute("assInfoList", adjReqMgrPastService.findAllAssPstInfo(adjPastVO)); + - - // 등록된 값이 있으면 select -// if(StringUtils.isNotEmpty(cmmVO.getPrtclCn())) -// { - -// } -// model.addAttribute("newAdrSn", cmmVO.getNowAdrSn()); - - - return "/kccadr/adjReqMgrPast/drtRegPop"; + return "/kccadr/adjReqMgrPast/drtUpdtPop"; } @@ -366,6 +351,30 @@ public class AdjReqMgrPastController { + @RequestMapping(value = {"/kccadr/adjReqMgOff/checkNUpdateAprvlPastAjax.do"}) + public ResponseEntity checkNUpdateAprvlPastAjax(@ModelAttribute("adrVO") AdjReqMgrPastVO adjReqMgrPastVO + , RedirectAttributes redirectAttributes + , HttpServletRequest request) throws Exception { + + //로그인 권한정보 불러오기 + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; + String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId()); + + if(userId.equals("")) { + // Unauthorized : 401, 권한 없음, 예를 들면, 로그인 페이지가 필요한 페이지를 로그인 없이 접속하려는 경우 반환되는 코드 (인증 실패) (Unauthorized) + return ResponseEntity.ok(new RestResponse(HttpStatus.UNAUTHORIZED, "로그인이 필요합니다.", LocalDateTime.now())); + } + + //사용자 유니크 아이디 받아오기 + adjReqMgrPastVO.setLastUpdusrId(userId); + + //조정신청, 대리인, 신청인 등록 처리 + return adjReqMgrPastService.checkNUpdateAprvlPastAjax(adjReqMgrPastVO); + } + + + + diff --git a/src/main/java/kcc/let/sym/mnu/mcm/web/EgovMenuCreateManageController.java b/src/main/java/kcc/let/sym/mnu/mcm/web/EgovMenuCreateManageController.java index df957c71..e966c0b3 100644 --- a/src/main/java/kcc/let/sym/mnu/mcm/web/EgovMenuCreateManageController.java +++ b/src/main/java/kcc/let/sym/mnu/mcm/web/EgovMenuCreateManageController.java @@ -296,6 +296,7 @@ public class EgovMenuCreateManageController { menuManageTopVO.setMenuNo("0"); menuManageTopVO.setMenuNm("사용자메뉴"); + if("ROLE_ADMIN".equals(menuManageVO.getAuthorCode())){ menuManageTopVO.setMenuNm("관리자메뉴"); } diff --git a/src/main/java/kcc/let/uss/rnt/web/EgovCustomRankManageController.java b/src/main/java/kcc/let/uss/rnt/web/EgovCustomRankManageController.java index 9340e6a0..dc4c3693 100644 --- a/src/main/java/kcc/let/uss/rnt/web/EgovCustomRankManageController.java +++ b/src/main/java/kcc/let/uss/rnt/web/EgovCustomRankManageController.java @@ -54,6 +54,24 @@ public class EgovCustomRankManageController { return "cmm/uss/rnt/EgovRankManageTree"; } + // 부서관리 + @RequestMapping(value = "/uss/rnt/EgovDepartmentManageTree.do") + public String selectDepartmentManage(@ModelAttribute("menuCreatVO") MenuCreatVO menuCreatVO, @ModelAttribute("searchVO") ComDefaultVO searchVO, + ModelMap model, MenuManageVO menuManageVO , HttpSession session ) throws Exception { + // 직급정보 C0050 + if(menuCreatVO.getMenuUserType() == null){ + menuCreatVO.setMenuUserType("A"); //사용자 디폴트 + } + + return "cmm/uss/rnt/EgovDepartmentManageTree"; + } + + // 부서관리 - 관리자 검색 팝업 + @RequestMapping(value = "/uss/rnt/popup/EgovDepartmentManagePop.do") + public String selectDepartmentManagePop(@ModelAttribute("menuCreatVO") MenuCreatVO menuCreatVO, ModelMap model ) throws Exception { + return "cmm/uss/rnt/popup/EgovDepartmentManagePop"; + } + @RequestMapping(value = {"/uss/rnt/EgovRankDataLoad.do"}, method = RequestMethod.POST) public ResponseEntity egovRankDataLoad(HttpServletRequest request , @RequestBody EgovCustomRankManageVO rankManageVO) throws Exception { 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 5d31a836..1d578185 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 @@ -417,6 +417,20 @@ + + + + + UPDATE ADR_ASS_MGR_PST SET + ADD_YN = #addYn# + , ASS_PST_USR_NM = #assPstUsrNm# + , LAST_UPDUSR_ID = #lastUpdusrId# + , LAST_UPDT_PNTTM = NOW() + WHERE + ASS_PST_SEQ = #assPstSeq# + + + @@ -429,9 +443,11 @@ , next_app_de = TO_DATETIME(TO_CHAR(#nextAppDe#,'YYYY-MM-DD HH24:MI')) , prtcl_cn = #prtclCn# , sbmt_yn = #sbmtYn# - , appr_yn = #apprYn# - , frst_regist_pnttm = NOW() - , frst_register_id = #frstRegisterId# + , appr_yn = #apprYn# + + , frst_regist_pnttm = NOW() + , frst_register_id = #frstRegisterId# + , last_updt_pnttm = NOW() , last_updusr_id = #lastUpdusrId# , app_result_ty = #appResultTy# @@ -449,7 +465,7 @@ FROM adr_ass_mgr_pst a WHERE a.ass_pst_usr_ty IN ('10', '20', '50') AND a.adr_seq = #adrSeq# - GROUP BY a.ass_pst_usr_ty; + GROUP BY a.ass_pst_usr_ty @@ -459,28 +475,74 @@ + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/decorators.xml b/src/main/webapp/WEB-INF/decorators.xml index 8a0c17aa..bcfbb335 100644 --- a/src/main/webapp/WEB-INF/decorators.xml +++ b/src/main/webapp/WEB-INF/decorators.xml @@ -81,6 +81,7 @@ /kccadr/**/popup/* + /uss/**/popup/* diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/rnt/EgovDepartmentManageTree.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/rnt/EgovDepartmentManageTree.jsp new file mode 100644 index 00000000..e549923d --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/rnt/EgovDepartmentManageTree.jsp @@ -0,0 +1,396 @@ +<%-- + Class Name : EgovOrgChartManage.jsp + Description : 조직도 관리 화면 + Modification Information + + 수정일 수정자 수정내용 + ------- -------- --------------------------- + 2018.06.11 ITN 최초 생성 + + author : ITN + since : 2018.06.11 +--%> +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<%@ page import="kcc.com.cmm.service.EgovProperties"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> + + + + + + + + + + + +부서관리 + + +
+ + + +
+ + + \ 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 e6a8da38..52d80874 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 @@ -46,12 +46,13 @@ // 초기 데이터 만드는 function function fn_makeList(data){ + console.log(' makeList data : ', data); var resultList = data['dataList']; var dataList = []; var data = {}; - data.id = 'C0050'; + data.id = 'CC041'; data.text = '직급관리'; data.parent = '#'; data.state = {opened : true}; @@ -74,7 +75,7 @@ // jsTree function function fn_jsTree(resultData){ - + console.log('resultData : ', resultData); $("#rank_organization").jstree({ "core" : { @@ -208,17 +209,18 @@ type : "POST" , url : "" , data : JSON.stringify({ - codeId : "C0050" + codeId : "CC041" }) , dataType : 'json' , async : false , processData : false , contentType : "application/json" , cache : false - , success : function(returnData) { + , success : function(data) { + console.log('returnData : ', data); if (data.status == "OK") { // 초기데이터 생성 후 jsTree 만듬 - var resultData = fn_makeList(returnData); + var resultData = fn_makeList(data); fn_jsTree(resultData); } else { alert(returnData.data); 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 new file mode 100644 index 00000000..d9fa5d8e --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/rnt/popup/EgovDepartmentManagePop.jsp @@ -0,0 +1,77 @@ + +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> + + + + + +관리자 검색 + + +
+
+
    + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
번호성명직책부서명
1홍길동부서장-
2홍길동팀장등록임치팀
+
+ +
+
+
+ + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp index 1f7bb027..e8803421 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp @@ -291,7 +291,9 @@ $(document).ready(function(){ commonPopWindowopenForm("/kccadr/adjPgrMgr/apm/popup/adrAdmMemo.do", '820', '500', "entInfoPop", $('#pop')); } - + function fnc_aprvl_pop(param){ + commonPopWindowopenForm("/kccadr/adjReqMgOff/popup/adjReqMgrOffAppReqPop.do", '1000', '700', "entInfoPop", $('#pop')); + } @@ -675,7 +677,8 @@ $(document).ready(function(){ - + + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/popup/adjReqMgrOffAppReqPop.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/popup/adjReqMgrOffAppReqPop.jsp index 59a6c93e..61396f90 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/popup/adjReqMgrOffAppReqPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/popup/adjReqMgrOffAppReqPop.jsp @@ -10,7 +10,776 @@ + + + + + + + + + + + + + + + " /> + " /> + + + + + + +
+
+ +
+

기일조서 수정

+
    +
  • + +
    • +
  • + 과거사건등록 +
    • +
  • + 기일조서 수정 +
    • +
+
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
조 정 부 + +
차 수 + +
사 건 + + 사건내용 + +
신청인 + + +

+ +

+ + + + 		대리인 + + +

+ +

+ + + +
참관대리인 + + + + + + + + +
피신청인 + + +

+ +

+ + + + 		대리인 + + +

+ +

+ + + +
참관대리인 + + + + + + + + +
조정기일 +
+ " data-datecontrol="true" onkeyup="setFormat('day',this)" maxlength="10" readonly> +
+ + +
+
+ " onkeyup="setFormat('time',this)" maxlength="8"> + 		공개여부 + +
장소 + + +
기일결과 + +
다음 기일 지정 여부 +
+ + checked onclick="fncCheckNextYn()"> + + + + checked onclick="fncCheckNextYn()"> + + +
+
고지된 다음기일 +
+ +
+ + +
+
+ +
조서내용 + +
조정부장 + + + + + + + +   +
조정위원1 + + + + + + + +   +
조정위원2 + + + + + + + + + +   +
조정조사관 + +
+
+ +
+
+
+ + +
+
+
+
+
+ + +