From 851274c946336e4c6a11b97aefc8b90cdb094f85 Mon Sep 17 00:00:00 2001 From: myname Date: Fri, 28 Oct 2022 17:27:50 +0900 Subject: [PATCH] =?UTF-8?q?2022-10-28=2017:27=20=EA=B2=B0=EC=9E=AC=20?= =?UTF-8?q?=EB=B0=8F=20=EB=8C=80=EA=B2=B0=20=EA=B4=80=EB=A6=AC=20=EB=AA=A9?= =?UTF-8?q?=EB=A1=9D=20=EC=9E=91=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/InternalApprovManageService.java | 4 + .../impl/InternalAppovManageServiceImpl.java | 10 + .../service/impl/InternalApprovManageDAO.java | 15 +- .../web/InternalApprovManageController.java | 5 +- .../web/InsteadOfPaymentManageController.java | 479 +++++++- .../adjPgrMgr/iam/IamManage_SQL_Mysql.xml | 290 +++++ .../iam/internalApprovManageList.jsp | 4 +- .../iop/insteadOfPaymentManageDetail.jsp | 1078 +++++++++++++++++ .../iop/insteadOfPaymentManageDetail30.jsp | 1078 +++++++++++++++++ .../iop/insteadOfPaymentManageDetail50.jsp | 1078 +++++++++++++++++ .../insteadOfPaymentManageDetail502030.jsp | 1078 +++++++++++++++++ .../iop/insteadOfPaymentManageList.jsp | 297 ++++- 12 files changed, 5307 insertions(+), 109 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iop/insteadOfPaymentManageDetail.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iop/insteadOfPaymentManageDetail30.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iop/insteadOfPaymentManageDetail50.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iop/insteadOfPaymentManageDetail502030.jsp diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/iam/service/InternalApprovManageService.java b/src/main/java/kcc/kccadr/adjPgrMgr/iam/service/InternalApprovManageService.java index 916735bf..b7897791 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/iam/service/InternalApprovManageService.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/iam/service/InternalApprovManageService.java @@ -6,6 +6,8 @@ import java.util.List; public interface InternalApprovManageService { Integer selectInternalApprovManageCount(InternalApprovManageVO internalApprovManageVO) throws Exception; + + Integer selectInternalApprovAdminManageCount(InternalApprovManageVO internalApprovManageVO) throws Exception; Integer updateinternalApprovManageSave(InternalApprovManageVO internalApprovManageVO , String p_code_desc @@ -14,6 +16,8 @@ public interface InternalApprovManageService { ) throws Exception; List selectInternalApprovManageList(InternalApprovManageVO internalApprovManageVO) throws Exception; + //관리자 결재 및 대결 관리 목록 + List selectInternalApprovAdminManageList(InternalApprovManageVO internalApprovManageVO) throws Exception; InternalApprovManageVO selectInternalApprovManageDetail(InternalApprovManageVO internalApprovManageVO) throws Exception; diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/iam/service/impl/InternalAppovManageServiceImpl.java b/src/main/java/kcc/kccadr/adjPgrMgr/iam/service/impl/InternalAppovManageServiceImpl.java index 39bdab88..bee311c7 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/iam/service/impl/InternalAppovManageServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/iam/service/impl/InternalAppovManageServiceImpl.java @@ -33,11 +33,21 @@ public class InternalAppovManageServiceImpl implements InternalApprovManageServi return internalApprovManageDAO.selectInternalApprovManageCount(internalApprovManageVO); } + @Override + public Integer selectInternalApprovAdminManageCount(InternalApprovManageVO internalApprovManageVO) throws Exception { + return internalApprovManageDAO.selectInternalApprovAdminManageCount(internalApprovManageVO); + } + @Override public List selectInternalApprovManageList(InternalApprovManageVO internalApprovManageVO) throws Exception { return internalApprovManageDAO.selectInternalApprovManageList(internalApprovManageVO); } + @Override + public List selectInternalApprovAdminManageList(InternalApprovManageVO internalApprovManageVO) throws Exception { + return internalApprovManageDAO.selectInternalApprovAdminManageList(internalApprovManageVO); + } + @Override public InternalApprovManageVO selectInternalApprovManageDetail(InternalApprovManageVO internalApprovManageVO) throws Exception { return internalApprovManageDAO.selectInternalApprovManageDetail(internalApprovManageVO); diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/iam/service/impl/InternalApprovManageDAO.java b/src/main/java/kcc/kccadr/adjPgrMgr/iam/service/impl/InternalApprovManageDAO.java index d0f85f7f..fe5cb493 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/iam/service/impl/InternalApprovManageDAO.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/iam/service/impl/InternalApprovManageDAO.java @@ -1,10 +1,11 @@ package kcc.kccadr.adjPgrMgr.iam.service.impl; +import java.util.List; + +import org.springframework.stereotype.Repository; + import egovframework.rte.psl.dataaccess.EgovAbstractDAO; import kcc.kccadr.adjPgrMgr.iam.service.InternalApprovManageVO; -import org.springframework.stereotype.Repository; - -import java.util.List; @Repository("internalApprovManageDAO") public class InternalApprovManageDAO extends EgovAbstractDAO { @@ -14,10 +15,18 @@ public class InternalApprovManageDAO extends EgovAbstractDAO { return (Integer) select("InternalApprovManage.selectInternalApprovManageCount", internalApprovManageVO); } + public Integer selectInternalApprovAdminManageCount(InternalApprovManageVO internalApprovManageVO) throws Exception { + return (Integer) select("InternalApprovManage.selectInternalApprovAdminManageCount", internalApprovManageVO); + } + public List selectInternalApprovManageList(InternalApprovManageVO internalApprovManageVO) throws Exception { return (List)list("internalApprovManageDAO.selectInternalApprovManageList", internalApprovManageVO); } + public List selectInternalApprovAdminManageList(InternalApprovManageVO internalApprovManageVO) throws Exception { + return (List)list("internalApprovManageDAO.selectInternalApprovAdminManageList", internalApprovManageVO); + } + public InternalApprovManageVO selectInternalApprovManageDetail(InternalApprovManageVO internalApprovManageVO) throws Exception { return (InternalApprovManageVO) select("internalApprovManageDAO.selectInternalApprovManageDetail", internalApprovManageVO); } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/iam/web/InternalApprovManageController.java b/src/main/java/kcc/kccadr/adjPgrMgr/iam/web/InternalApprovManageController.java index 1b40e648..6acf96f6 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/iam/web/InternalApprovManageController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/iam/web/InternalApprovManageController.java @@ -112,7 +112,10 @@ public class InternalApprovManageController { @RequestMapping(value = "/kccadr/adjPgrMgr/iam/internalApprovManageList.do") - public String internalApprovManageList(@ModelAttribute("internalApprovManageVO") InternalApprovManageVO internalApprovManageVO , ModelMap model, HttpServletRequest request) throws Exception { + public String internalApprovManageList( + @ModelAttribute("internalApprovManageVO") InternalApprovManageVO internalApprovManageVO + , ModelMap model + , HttpServletRequest request) throws Exception { String auth = EgovUserDetailsHelper.isAuthenticated() ? null : EgovUserDetailsHelper.getAuthenticatedUser().toString(); LoginVO loginVO = "anonymousUser".equals(auth) ? null : (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser(); diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/iop/web/InsteadOfPaymentManageController.java b/src/main/java/kcc/kccadr/adjPgrMgr/iop/web/InsteadOfPaymentManageController.java index db4b1d86..a3400c0d 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/iop/web/InsteadOfPaymentManageController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/iop/web/InsteadOfPaymentManageController.java @@ -1,9 +1,7 @@ package kcc.kccadr.adjPgrMgr.iop.web; -import java.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Date; import java.util.List; import javax.annotation.Resource; @@ -11,50 +9,24 @@ import javax.servlet.http.HttpServletRequest; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; -import org.json.simple.JSONArray; -import org.json.simple.JSONObject; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.servlet.ModelAndView; -import egovframework.rte.fdl.idgnr.EgovIdGnrService; import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; import kcc.com.cmm.LoginVO; -import kcc.com.cmm.service.EgovFileMngService; -import kcc.com.cmm.service.FileVO; import kcc.com.cmm.util.DateUtil; -import kcc.com.cmm.util.IpUtil; import kcc.com.cmm.util.StringUtil; -import kcc.com.utl.user.service.CheckAdrProcessUtil; -import kcc.kccadr.adjPgrMgr.apm.service.ApmService; -import kcc.kccadr.adjPgrMgr.apm.service.ApmVO; -import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmService; -import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmVO; import kcc.kccadr.adjPgrMgr.drt.service.DrtService; import kcc.kccadr.adjPgrMgr.drt.service.DrtVO; import kcc.kccadr.adjPgrMgr.ent.service.EntService; import kcc.kccadr.adjPgrMgr.ent.service.EntVO; import kcc.kccadr.adjPgrMgr.iam.service.InternalApprovManageService; import kcc.kccadr.adjPgrMgr.iam.service.InternalApprovManageVO; -import kcc.kccadr.adjPgrMgr.iop.service.InsteadOfPaymentManageVO; -import kcc.kccadr.adjReqMgrPast.service.AdjReqMgrPastVO; -import kcc.kccadr.adjcclt.service.AdjstConciliatorService; -import kcc.kccadr.adjcclt.service.AdjstConciliatorVO; -import kcc.kccadr.adjreqmgr.service.AdjReqMgrVO; -import kcc.kccadr.adjreqmgr.web.AdjReqMgrController; -import kcc.kccadr.adjst.service.AdjstReqService; -import kcc.kccadr.adjst.service.AdjstReqVO; import kcc.kccadr.cmm.CmmUtil; import kcc.kccadr.cmm.KccadrConstants; -import kcc.kccadr.kccadrCom.service.KccadrMgrUdtService; -import kcc.kccadr.ozSchd.web.OzSchdExportUtil; import kcc.let.uss.umt.service.EgovUserManageService; import kcc.let.uss.umt.service.UserManageVO; import kcc.let.utl.fcc.service.EgovCryptoUtil; @@ -65,9 +37,29 @@ public class InsteadOfPaymentManageController { // @Resource(name = "apmService") // private ApmService apmService; + /** userManageService */ + @Resource(name = "userManageService") + private EgovUserManageService userManageService; + + @Resource(name = "internalApprovManageService") + private InternalApprovManageService internalApprovManageService; + //암/복호화 유틸 + @Resource(name = "egovCryptoUtil") + EgovCryptoUtil egovCryptoUtil; + + @Resource(name = "drtService") + private DrtService drtService; + + @Resource(name = "EntService") + private EntService entService; + @RequestMapping(value = "/kccadr/adjPgrMgr/iop/insteadOfPaymentManageList.do") - public String insteadOfPaymentManageList(@ModelAttribute("insteadOfPaymentManageVO") InsteadOfPaymentManageVO insteadOfPaymentManageVO , ModelMap model, HttpServletRequest request) throws Exception { + public String insteadOfPaymentManageList( + @ModelAttribute("internalApprovManageVO") InternalApprovManageVO internalApprovManageVO + , ModelMap model + , HttpServletRequest request + ) throws Exception { String auth = EgovUserDetailsHelper.isAuthenticated() ? null : EgovUserDetailsHelper.getAuthenticatedUser().toString(); LoginVO loginVO = "anonymousUser".equals(auth) ? null : (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser(); @@ -77,28 +69,423 @@ public class InsteadOfPaymentManageController { return "redirect:/web/user/login/ssoLogin.do"; } - PaginationInfo paginationInfo = new PaginationInfo(); - paginationInfo.setCurrentPageNo(insteadOfPaymentManageVO.getPageIndex()); - paginationInfo.setRecordCountPerPage(insteadOfPaymentManageVO.getPageUnit()); - paginationInfo.setPageSize(insteadOfPaymentManageVO.getPageSize()); + internalApprovManageVO.setFrstRegisterId(loginVO.getUniqId()); + internalApprovManageVO.setMemSeq(loginVO.getUniqId()); + internalApprovManageVO.setSearchSbmtId(loginVO.getUniqId()); - insteadOfPaymentManageVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); - insteadOfPaymentManageVO.setLastIndex(paginationInfo.getLastRecordIndex()); - insteadOfPaymentManageVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); - -// paginationInfo.setTotalRecordCount(adjReqMgrPastService.selectAdjReqMgrPastListCount(insteadOfPaymentManageVO)); - model.addAttribute("paginationInfo", paginationInfo); - // list -// List list = adjReqMgrPastService.selectAdjReqMgrPastList(adjReqMgrPastVO); - List list = new ArrayList(); - - // 임시 - model.addAttribute("list", list); + if(internalApprovManageVO.getPageUnit() != 10) { + internalApprovManageVO.setPageUnit(internalApprovManageVO.getPageUnit()); + } + if("".equals(internalApprovManageVO.getSearchSortCnd())){ //최초조회시 최신것 조회List + internalApprovManageVO.setSearchSortCnd("RS.adrNo"); + internalApprovManageVO.setSearchSortOrd("desc"); + } + + //내부결재 목록 페이지 접근시 결재상태 - 결재대기(01), 결재진행중(02) 상태가 기본값으로 해달라는 요청_220225_이준호수정 + if("".equals(internalApprovManageVO.getSearchStatusArr()) || internalApprovManageVO.getSearchStatusArr() == null){ + String[] defaultSearchStatusArr = {"01", "02"}; + internalApprovManageVO.setSearchStatusArr(defaultSearchStatusArr); + } + + if(StringUtils.isEmpty(internalApprovManageVO.getSearchStartDt()) && StringUtils.isEmpty(internalApprovManageVO.getSearchEndDt())){ + internalApprovManageVO.setSearchStartDt(CmmUtil.getDiffMonth(1 , "yyyy-MM-dd")); + internalApprovManageVO.setSearchEndDt(CmmUtil.getDateNow("yyyy-MM-dd")); + } + + /** paging */ + PaginationInfo paginationInfo = new PaginationInfo(); + paginationInfo.setCurrentPageNo(internalApprovManageVO.getPageIndex()); + paginationInfo.setRecordCountPerPage(internalApprovManageVO.getPageUnit()); + paginationInfo.setPageSize(internalApprovManageVO.getPageSize()); + + //위원장 아이디는 위원장이 결재 시점에서만 조회되게 + // 리스트 조건절 결재선 1,2 라인이 결재 완료이고 위원장 아이디 일때만 조회 + UserManageVO userManageVO = new UserManageVO(); + userManageVO = userManageService.selectUser(loginVO.getUniqId()); + + if(KccadrConstants.ADR_SBMT_TY_40.equals(userManageVO.getOfcpsNm())) { + internalApprovManageVO.setUiWonJangId(loginVO.getUniqId()); + } - + //22.02.08 이준호 내부결재목록 최고관리자의 경우 모든 결재가 보이게 처리 요청사항 적용 + if("ROLE_ADMIN".equals(loginVO.getAuthority())) { + internalApprovManageVO.setAuthor(loginVO.getAuthority()); + } + + internalApprovManageVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); + internalApprovManageVO.setLastIndex(paginationInfo.getLastRecordIndex()); + internalApprovManageVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); + paginationInfo.setTotalRecordCount(internalApprovManageService.selectInternalApprovAdminManageCount(internalApprovManageVO)); + model.addAttribute("paginationInfo", paginationInfo); + + + model.addAttribute("list", internalApprovManageService.selectInternalApprovAdminManageList(internalApprovManageVO)); return "kccadr/adjPgrMgr/iop/insteadOfPaymentManageList"; } + /** + * 내부결재 관리 상세 화면 - 203040 + */ + @RequestMapping("/kccadr/adjPgrMgr/iop/insteadOfPaymentManageDetail.do") + public String insteadOfPaymentManageDetail(@ModelAttribute("internalApprovManageVO") InternalApprovManageVO internalApprovManageVO, ModelMap model) throws Exception { + String auth = EgovUserDetailsHelper.isAuthenticated() ? null : EgovUserDetailsHelper.getAuthenticatedUser().toString(); + LoginVO loginVO = "anonymousUser".equals(auth) ? null : (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser(); + + if (loginVO == null) { + + model.addAttribute("msg", "로그인 해주세요."); + return "redirect:/web/user/login/ssoLogin.do"; + } + + internalApprovManageVO.setSearchSbmtId(loginVO.getUniqId()); + InternalApprovManageVO info = internalApprovManageService.selectInternalApprovManageDetail(internalApprovManageVO); + List approvLine = internalApprovManageService.selectInternalApprovLine(info); + decryptInfomation(null, info); + + String aftThree = ""; + //접수일로부터 3개월뒤 날짜 구하기 + if(StringUtil.isNotEmpty(info.getReqDt())) { + + String reqDt = info.getReqDt(); + DateUtil dateUtil = new DateUtil(); + aftThree = dateUtil.AddDate(reqDt, 0, 3, 0); + + } + + //취하신청 정보 + EntVO entVO = new EntVO(); + entVO.setAdrSeq(internalApprovManageVO.getAdrSeq()); + entVO.setApprYn(KccadrConstants.ADR_CNCL_DROP_REQ); + EntVO resultEntInfo = entService.selectEntInfo(entVO); + + model.addAttribute("resultEntInfo", resultEntInfo); + + //취하신청 등록 여부 + EntVO entVO_2 = new EntVO(); + entVO_2.setAdrSeq(internalApprovManageVO.getAdrSeq()); + entVO_2.setApprYn(KccadrConstants.ADR_CNCL_DROP_REQ); + EntVO resultEntInfo_2 = entService.selectEntInfo_2(entVO_2); + + model.addAttribute("resultEntInfo_2", resultEntInfo_2); + + //기일조서값 + DrtVO drtVO = new DrtVO(); + drtVO.setAdrSeq(internalApprovManageVO.getAdrSeq()); + drtVO.setAdrSn(internalApprovManageVO.getAdrSn()); + drtVO = drtService.selectAdrPrtclMgr(drtVO); + model.addAttribute("drtInfo", drtVO); + + model.addAttribute("info", info); + model.addAttribute("approvLine", approvLine); + model.addAttribute("aftThree", aftThree); //접수일로 3개월 뒤 날짜 정보 + //22.02.08 최고관리자의 경우 반려 결재 버튼 미노출 처리 + model.addAttribute("auth", loginVO.getAuthority()); + return "kccadr/adjPgrMgr/iop/insteadOfPaymentManageDetail"; + } + /** + * 내부결재 관리 상세 화면 - 203040 + */ + @RequestMapping("/kccadr/adjPgrMgr/iop/insteadOfPaymentManageDetail30.do") + public String insteadOfPaymentManageDetail30(@ModelAttribute("internalApprovManageVO") InternalApprovManageVO internalApprovManageVO, ModelMap model) throws Exception { + String auth = EgovUserDetailsHelper.isAuthenticated() ? null : EgovUserDetailsHelper.getAuthenticatedUser().toString(); + LoginVO loginVO = "anonymousUser".equals(auth) ? null : (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser(); + + if (loginVO == null) { + + model.addAttribute("msg", "로그인 해주세요."); + return "redirect:/web/user/login/ssoLogin.do"; + } + + internalApprovManageVO.setSearchSbmtId(loginVO.getUniqId()); + InternalApprovManageVO info = internalApprovManageService.selectInternalApprovManageDetail(internalApprovManageVO); + List approvLine = internalApprovManageService.selectInternalApprovLine(info); + decryptInfomation(null, info); + + String aftThree = ""; + //접수일로부터 3개월뒤 날짜 구하기 + if(StringUtil.isNotEmpty(info.getReqDt())) { + + String reqDt = info.getReqDt(); + DateUtil dateUtil = new DateUtil(); + aftThree = dateUtil.AddDate(reqDt, 0, 3, 0); + + } + + //취하신청 정보 + EntVO entVO = new EntVO(); + entVO.setAdrSeq(internalApprovManageVO.getAdrSeq()); + entVO.setApprYn(KccadrConstants.ADR_CNCL_DROP_REQ); + EntVO resultEntInfo = entService.selectEntInfo(entVO); + + model.addAttribute("resultEntInfo", resultEntInfo); + + //취하신청 등록 여부 + EntVO entVO_2 = new EntVO(); + entVO_2.setAdrSeq(internalApprovManageVO.getAdrSeq()); + entVO_2.setApprYn(KccadrConstants.ADR_CNCL_DROP_REQ); + EntVO resultEntInfo_2 = entService.selectEntInfo_2(entVO_2); + + model.addAttribute("resultEntInfo_2", resultEntInfo_2); + + //기일조서값 + DrtVO drtVO = new DrtVO(); + drtVO.setAdrSeq(internalApprovManageVO.getAdrSeq()); + drtVO.setAdrSn(internalApprovManageVO.getAdrSn()); + drtVO = drtService.selectAdrPrtclMgr(drtVO); + model.addAttribute("drtInfo", drtVO); + + model.addAttribute("info", info); + model.addAttribute("approvLine", approvLine); + model.addAttribute("aftThree", aftThree); //접수일로 3개월 뒤 날짜 정보 + //22.02.08 최고관리자의 경우 반려 결재 버튼 미노출 처리 + model.addAttribute("auth", loginVO.getAuthority()); + return "kccadr/adjPgrMgr/iop/insteadOfPaymentManageDetail30"; + } + + /** + * 내부결재 관리 상세 화면 - 203040 + */ + @RequestMapping("/kccadr/adjPgrMgr/iop/insteadOfPaymentManageDetail502030.do") + public String insteadOfPaymentManageDetail502030(@ModelAttribute("internalApprovManageVO") InternalApprovManageVO internalApprovManageVO, ModelMap model) throws Exception { + String auth = EgovUserDetailsHelper.isAuthenticated() ? null : EgovUserDetailsHelper.getAuthenticatedUser().toString(); + LoginVO loginVO = "anonymousUser".equals(auth) ? null : (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser(); + + if (loginVO == null) { + + model.addAttribute("msg", "로그인 해주세요."); + return "redirect:/web/user/login/ssoLogin.do"; + } + + internalApprovManageVO.setSearchSbmtId(loginVO.getUniqId()); + InternalApprovManageVO info = internalApprovManageService.selectInternalApprovManageDetail(internalApprovManageVO); + List approvLine = internalApprovManageService.selectInternalApprovLine(info); + decryptInfomation(null, info); + + String aftThree = ""; + //접수일로부터 3개월뒤 날짜 구하기 + if(StringUtil.isNotEmpty(info.getReqDt())) { + + String reqDt = info.getReqDt(); + DateUtil dateUtil = new DateUtil(); + aftThree = dateUtil.AddDate(reqDt, 0, 3, 0); + + } + + //취하신청 정보 + EntVO entVO = new EntVO(); + entVO.setAdrSeq(internalApprovManageVO.getAdrSeq()); + entVO.setApprYn(KccadrConstants.ADR_CNCL_DROP_REQ); + EntVO resultEntInfo = entService.selectEntInfo(entVO); + + model.addAttribute("resultEntInfo", resultEntInfo); + + //취하신청 등록 여부 + EntVO entVO_2 = new EntVO(); + entVO_2.setAdrSeq(internalApprovManageVO.getAdrSeq()); + entVO_2.setApprYn(KccadrConstants.ADR_CNCL_DROP_REQ); + EntVO resultEntInfo_2 = entService.selectEntInfo_2(entVO_2); + + model.addAttribute("resultEntInfo_2", resultEntInfo_2); + + //기일조서값 + DrtVO drtVO = new DrtVO(); + drtVO.setAdrSeq(internalApprovManageVO.getAdrSeq()); + drtVO.setAdrSn(internalApprovManageVO.getAdrSn()); + drtVO = drtService.selectAdrPrtclMgr(drtVO); + model.addAttribute("drtInfo", drtVO); + + model.addAttribute("info", info); + model.addAttribute("approvLine", approvLine); + model.addAttribute("aftThree", aftThree); //접수일로 3개월 뒤 날짜 정보 + //22.02.08 최고관리자의 경우 반려 결재 버튼 미노출 처리 + model.addAttribute("auth", loginVO.getAuthority()); + return "kccadr/adjPgrMgr/iop/insteadOfPaymentManageDetail502030"; + } + + /** + * 내부결재 관리 상세 화면 - 203040 + */ + @RequestMapping("/kccadr/adjPgrMgr/iop/insteadOfPaymentManageDetail50.do") + public String insteadOfPaymentManageDetail50(@ModelAttribute("internalApprovManageVO") InternalApprovManageVO internalApprovManageVO, ModelMap model) throws Exception { + String auth = EgovUserDetailsHelper.isAuthenticated() ? null : EgovUserDetailsHelper.getAuthenticatedUser().toString(); + LoginVO loginVO = "anonymousUser".equals(auth) ? null : (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser(); + + if (loginVO == null) { + + model.addAttribute("msg", "로그인 해주세요."); + return "redirect:/web/user/login/ssoLogin.do"; + } + + internalApprovManageVO.setSearchSbmtId(loginVO.getUniqId()); + InternalApprovManageVO info = internalApprovManageService.selectInternalApprovManageDetail(internalApprovManageVO); + List approvLine = internalApprovManageService.selectInternalApprovLine(info); + decryptInfomation(null, info); + + String aftThree = ""; + //접수일로부터 3개월뒤 날짜 구하기 + if(StringUtil.isNotEmpty(info.getReqDt())) { + + String reqDt = info.getReqDt(); + DateUtil dateUtil = new DateUtil(); + aftThree = dateUtil.AddDate(reqDt, 0, 3, 0); + + } + + //취하신청 정보 + EntVO entVO = new EntVO(); + entVO.setAdrSeq(internalApprovManageVO.getAdrSeq()); + entVO.setApprYn(KccadrConstants.ADR_CNCL_DROP_REQ); + EntVO resultEntInfo = entService.selectEntInfo(entVO); + + model.addAttribute("resultEntInfo", resultEntInfo); + + //취하신청 등록 여부 + EntVO entVO_2 = new EntVO(); + entVO_2.setAdrSeq(internalApprovManageVO.getAdrSeq()); + entVO_2.setApprYn(KccadrConstants.ADR_CNCL_DROP_REQ); + EntVO resultEntInfo_2 = entService.selectEntInfo_2(entVO_2); + + model.addAttribute("resultEntInfo_2", resultEntInfo_2); + + //기일조서값 + DrtVO drtVO = new DrtVO(); + drtVO.setAdrSeq(internalApprovManageVO.getAdrSeq()); + drtVO.setAdrSn(internalApprovManageVO.getAdrSn()); + drtVO = drtService.selectAdrPrtclMgr(drtVO); + model.addAttribute("drtInfo", drtVO); + + model.addAttribute("info", info); + model.addAttribute("approvLine", approvLine); + model.addAttribute("aftThree", aftThree); //접수일로 3개월 뒤 날짜 정보 + //22.02.08 최고관리자의 경우 반려 결재 버튼 미노출 처리 + model.addAttribute("auth", loginVO.getAuthority()); + return "kccadr/adjPgrMgr/iop/insteadOfPaymentManageDetail50"; + } + + private void decryptInfomation(List list, InternalApprovManageVO info){ + if(CollectionUtils.isNotEmpty(list)){ + for(InternalApprovManageVO model : list){ + model.setRpplNm(egovCryptoUtil.decrypt(model.getRpplNm())); + model.setRpplAddr(egovCryptoUtil.decrypt(model.getRpplAddr())); + model.setRpplAddrDtl(egovCryptoUtil.decrypt(model.getRpplAddrDtl())); + model.setRpplPost(egovCryptoUtil.decrypt(model.getRpplPost())); + model.setRpplEmail(egovCryptoUtil.decrypt(model.getRpplEmail())); + model.setRpplPhone(egovCryptoUtil.decrypt(model.getRpplPhone())); + model.setRpplRealPost(egovCryptoUtil.decrypt(model.getRpplRealPost())); + model.setRpplRealAddr(egovCryptoUtil.decrypt(model.getRpplRealAddr())); + model.setRpplRealAddrDtl(egovCryptoUtil.decrypt(model.getRpplRealAddrDtl())); + + + model.setDepuTyNm(egovCryptoUtil.decrypt(model.getDepuTyNm())); + model.setResPonDentNm(egovCryptoUtil.decrypt(model.getResPonDentNm())); + model.setAppliCantNm(egovCryptoUtil.decrypt(model.getAppliCantNm())); + model.setAdrAdmNm(egovCryptoUtil.decrypt(model.getAdrAdmNm())); + model.setCmntNm(egovCryptoUtil.decrypt(model.getCmntNm())); + + // 피신청인 다중으로 가져왔을때.. + if(StringUtils.isNotBlank(model.getResPonDentNms())){ + String[] resNms = model.getResPonDentNms().split(","); + if(resNms.length > 1 ){ + List names = new ArrayList<>(); + for(String name : resNms){ + names.add(egovCryptoUtil.decrypt(name)); + } + model.setResPonDentNms(String.join(",", names)); + }else{ + model.setResPonDentNms(egovCryptoUtil.decrypt(resNms[0])); + } + } + + // 피신청인 대리인 다중으로 가져왔을때.. + if(StringUtils.isNotBlank(model.getResPonAgntNms())){ + String[] resNms = model.getResPonAgntNms().split(","); + if(resNms.length > 1 ){ + List names = new ArrayList<>(); + for(String name : resNms){ + names.add(egovCryptoUtil.decrypt(name)); + } + model.setResPonAgntNms(String.join(",", names)); + }else{ + model.setResPonAgntNms(egovCryptoUtil.decrypt(resNms[0])); + } + } + } + } + + if(info != null){ + info.setRpplNm(egovCryptoUtil.decrypt(info.getRpplNm())); + info.setRpplAddr(egovCryptoUtil.decrypt(info.getRpplAddr())); + info.setRpplAddrDtl(egovCryptoUtil.decrypt(info.getRpplAddrDtl())); + info.setRpplPost(egovCryptoUtil.decrypt(info.getRpplPost())); + info.setRpplEmail(egovCryptoUtil.decrypt(info.getRpplEmail())); + info.setRpplPhone(egovCryptoUtil.decrypt(info.getRpplPhone())); + info.setDepuTyNm(egovCryptoUtil.decrypt(info.getDepuTyNm())); + info.setResPonDentNm(egovCryptoUtil.decrypt(info.getResPonDentNm())); + info.setAppliCantNm(egovCryptoUtil.decrypt(info.getAppliCantNm())); + info.setAdrAdmNm(egovCryptoUtil.decrypt(info.getAdrAdmNm())); + info.setRpplRealPost(egovCryptoUtil.decrypt(info.getRpplRealPost())); + info.setRpplRealAddr(egovCryptoUtil.decrypt(info.getRpplRealAddr())); + info.setRpplRealAddrDtl(egovCryptoUtil.decrypt(info.getRpplRealAddrDtl())); + info.setCmntNm(egovCryptoUtil.decrypt(info.getCmntNm())); + info.setAdrCdnt(egovCryptoUtil.decrypt(info.getAdrCdnt())); + // 피신청인 다중으로 가져왔을때.. + if(StringUtils.isNotBlank(info.getResPonDentNms())){ + String[] resNms = info.getResPonDentNms().split(","); + if(resNms.length > 1 ){ + List names = new ArrayList<>(); + for(String name : resNms){ + names.add(egovCryptoUtil.decrypt(name)); + } + info.setResPonDentNms(String.join(",", names)); + }else{ + info.setResPonDentNms(egovCryptoUtil.decrypt(resNms[0])); + } + } + + // 신청인 대리인 다중으로 가져왔을때.. + if(StringUtils.isNotBlank(info.getDepuTyNms())){ + String[] resNms = info.getDepuTyNms().split(","); + if(resNms.length > 1 ){ + List names = new ArrayList<>(); + for(String name : resNms){ + names.add(egovCryptoUtil.decrypt(name)); + } + info.setDepuTyNms(String.join(",", names)); + }else{ + info.setDepuTyNms(egovCryptoUtil.decrypt(resNms[0])); + } + } + + // 피신청인 대리인 다중으로 가져왔을때.. + if(StringUtils.isNotBlank(info.getResPonAgntNms())){ + String[] resNms = info.getResPonAgntNms().split(","); + if(resNms.length > 1 ){ + List names = new ArrayList<>(); + for(String name : resNms){ + names.add(egovCryptoUtil.decrypt(name)); + } + info.setResPonAgntNms(String.join(",", names)); + }else{ + info.setResPonAgntNms(egovCryptoUtil.decrypt(resNms[0])); + } + } + + // 조정위원 다중으로 가져왔을때.. + if(StringUtils.isNotBlank(info.getAdrCclt())){ + String[] ccltNms = info.getAdrCclt().split(","); + if(ccltNms.length > 1 ){ + List names = new ArrayList<>(); + for(String name : ccltNms){ + names.add(egovCryptoUtil.decrypt(name)); + } + info.setAdrCclt(String.join(",", names)); + }else{ + info.setAdrCclt(egovCryptoUtil.decrypt(ccltNms[0])); + } + } + + } + } } diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/iam/IamManage_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/iam/IamManage_SQL_Mysql.xml index 76315340..9b96bfad 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/iam/IamManage_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/iam/IamManage_SQL_Mysql.xml @@ -171,6 +171,142 @@ + + + + + " /> + " /> + " /> + + +
+ + + + + + + + + + + +
+
+ +
+

조정결재상세 -

+
    +
  • +
  • 조정진행관리

  • +
  • 내부결재목록

  • +
  • 조정결재상세
  • +
+
+ + +
+ + + + + + <%--
+

조정번호 : 2021조정054

+

접수일 : 2021-07-15

+

진행현황 : 조정진행

+
--%> + + +

사건 정보

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- 조정기일 통지서요청(205010) 이후 결재 요청일 경우 조정기일 정보 노출_이준호_220222 --%> + <%-- 205010 --%> + + + + + + + + +

조정번호

+ + +

조정건명

이용에 따른 분쟁

신청인

신청인의 대리인

+ + () + +

피신청인

피신청인의 대리인

+ + () + +

접수연월일

+

+ + + () + +

+

종료년월일

조정부

+

+ + + (부장: + + 위원: + + ) + +

+

장소

조정결과

+

+ <%-- --%> + +

+

종결일

조정기일

+

+ +

+

+
+ + + +
+ + +
+ + +

결재진행

+
+ <%-- --%> + + <%-- --%> +
+
+ + + + + + + + + + + + + + + + +
결재요청일 +

+
결재대기 +

+ +

+
+
+ + +
+ + + <%-- 반려 이후 제외 --%> + + + + + + + + + + + + + + + + + + + + +
+ +

+

+
+ + + +
+
+
+ +
+
+ <%-- 대결버튼은 현재 결재자 이거나 최고관리자인 경우만 나타나게 --%> + + + + + + <%-- 취하종결 상세보기 --%> + <%-- + + + + --%> + + <%-- 불성립종결, 직권조정, 조정권고 상세보기 --%> + <%-- + + + + + + + + + + + + + + + + + + + + --%> +
+
+ <%-- 최고관리자의 경우 결재, 반려 버튼 미노출 --%> + + + + + + + +
+
+ +
+
+
+
+ + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iop/insteadOfPaymentManageDetail30.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iop/insteadOfPaymentManageDetail30.jsp new file mode 100644 index 00000000..db3c3108 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iop/insteadOfPaymentManageDetail30.jsp @@ -0,0 +1,1078 @@ + +<%@ page language="java" contentType="text/html; charset=utf-8" + pageEncoding="utf-8"%> +<%@ page import="kcc.kccadr.cmm.KccadrConstants"%> +<%@ 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="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> +<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> + +<% + /** + * @Class Name : insteadOfPaymentManageDetail30.jsp + * @Description : 결재 및 대결 관리 상세 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2021.08.16 김봉호 최초 생성 + * @author 김봉호 + * @since 2021.08.21 + * @version 1.0 + * @see + * + */ +%> + + +조정결재 + + + + + + + + + +
+ + + + + +
+ +
+ +
+ +
+ + + + + " /> + " /> + " /> + + +
+ + + + + + + + + + + +
+
+ +
+

조정결재상세 -

+
    +
  • +
  • 조정진행관리

  • +
  • 내부결재목록

  • +
  • 조정결재상세
  • +
+
+ + +
+ + + + + + <%--
+

조정번호 : 2021조정054

+

접수일 : 2021-07-15

+

진행현황 : 조정진행

+
--%> + + +

사건 정보

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- 조정기일 통지서요청(205010) 이후 결재 요청일 경우 조정기일 정보 노출_이준호_220222 --%> + <%-- 205010 --%> + + + + + + + + +

조정번호

+ + +

조정건명

이용에 따른 분쟁

신청인

신청인의 대리인

+ + () + +

피신청인

피신청인의 대리인

+ + () + +

접수연월일

+

+ + + () + +

+

종료년월일

조정부

+

+ + + (부장: + + 위원: + + ) + +

+

장소

조정결과

+

+ <%-- --%> + +

+

종결일

조정기일

+

+ +

+

+
+ + + +
+ + +
+ + +

결재진행

+
+ <%-- --%> + + <%-- --%> +
+
+ + + + + + + + + + + + + + + + +
결재요청일 +

+
결재대기 +

+ +

+
+
+ + +
+ + + <%-- 반려 이후 제외 --%> + + + + + + + + + + + + + + + + + + + + +
+ +

+

+
+ + + +
+
+
+ +
+
+ <%-- 대결버튼은 현재 결재자 이거나 최고관리자인 경우만 나타나게 --%> + + + + + + <%-- 취하종결 상세보기 --%> + <%-- + + + + --%> + + <%-- 불성립종결, 직권조정, 조정권고 상세보기 --%> + <%-- + + + + + + + + + + + + + + + + + + + + --%> +
+
+ <%-- 최고관리자의 경우 결재, 반려 버튼 미노출 --%> + + + + + + + +
+
+ +
+
+
+
+ + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iop/insteadOfPaymentManageDetail50.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iop/insteadOfPaymentManageDetail50.jsp new file mode 100644 index 00000000..1c812838 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iop/insteadOfPaymentManageDetail50.jsp @@ -0,0 +1,1078 @@ + +<%@ page language="java" contentType="text/html; charset=utf-8" + pageEncoding="utf-8"%> +<%@ page import="kcc.kccadr.cmm.KccadrConstants"%> +<%@ 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="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> +<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> + +<% + /** + * @Class Name : insteadOfPaymentManageDetail50.jsp + * @Description : 결재 및 대결 관리 상세 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2021.08.16 김봉호 최초 생성 + * @author 김봉호 + * @since 2021.08.21 + * @version 1.0 + * @see + * + */ +%> + + +조정결재 + + + + + + + + + +
+ + + + + +
+ +
+ +
+ +
+ + + + + " /> + " /> + " /> + + +
+ + + + + + + + + + + +
+
+ +
+

조정결재상세 -

+
    +
  • +
  • 조정진행관리

  • +
  • 내부결재목록

  • +
  • 조정결재상세
  • +
+
+ + +
+ + + + + + <%--
+

조정번호 : 2021조정054

+

접수일 : 2021-07-15

+

진행현황 : 조정진행

+
--%> + + +

사건 정보

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- 조정기일 통지서요청(205010) 이후 결재 요청일 경우 조정기일 정보 노출_이준호_220222 --%> + <%-- 205010 --%> + + + + + + + + +

조정번호

+ + +

조정건명

이용에 따른 분쟁

신청인

신청인의 대리인

+ + () + +

피신청인

피신청인의 대리인

+ + () + +

접수연월일

+

+ + + () + +

+

종료년월일

조정부

+

+ + + (부장: + + 위원: + + ) + +

+

장소

조정결과

+

+ <%-- --%> + +

+

종결일

조정기일

+

+ +

+

+
+ + + +
+ + +
+ + +

결재진행

+
+ <%-- --%> + + <%-- --%> +
+
+ + + + + + + + + + + + + + + + +
결재요청일 +

+
결재대기 +

+ +

+
+
+ + +
+ + + <%-- 반려 이후 제외 --%> + + + + + + + + + + + + + + + + + + + + +
+ +

+

+
+ + + +
+
+
+ +
+
+ <%-- 대결버튼은 현재 결재자 이거나 최고관리자인 경우만 나타나게 --%> + + + + + + <%-- 취하종결 상세보기 --%> + <%-- + + + + --%> + + <%-- 불성립종결, 직권조정, 조정권고 상세보기 --%> + <%-- + + + + + + + + + + + + + + + + + + + + --%> +
+
+ <%-- 최고관리자의 경우 결재, 반려 버튼 미노출 --%> + + + + + + + +
+
+ +
+
+
+
+ + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iop/insteadOfPaymentManageDetail502030.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iop/insteadOfPaymentManageDetail502030.jsp new file mode 100644 index 00000000..ed9d2dd3 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iop/insteadOfPaymentManageDetail502030.jsp @@ -0,0 +1,1078 @@ + +<%@ page language="java" contentType="text/html; charset=utf-8" + pageEncoding="utf-8"%> +<%@ page import="kcc.kccadr.cmm.KccadrConstants"%> +<%@ 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="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> +<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> + +<% + /** + * @Class Name : insteadOfPaymentManageDetail502030.jsp + * @Description : 결재 및 대결 관리 상세 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2021.08.16 김봉호 최초 생성 + * @author 김봉호 + * @since 2021.08.21 + * @version 1.0 + * @see + * + */ +%> + + +조정결재 + + + + + + + + + +
+ + + + + +
+ +
+ +
+ +
+ + + + + " /> + " /> + " /> + + +
+ + + + + + + + + + + +
+
+ +
+

조정결재상세 -

+
    +
  • +
  • 조정진행관리

  • +
  • 내부결재목록

  • +
  • 조정결재상세
  • +
+
+ + +
+ + + + + + <%--
+

조정번호 : 2021조정054

+

접수일 : 2021-07-15

+

진행현황 : 조정진행

+
--%> + + +

사건 정보

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- 조정기일 통지서요청(205010) 이후 결재 요청일 경우 조정기일 정보 노출_이준호_220222 --%> + <%-- 205010 --%> + + + + + + + + +

조정번호

+ + +

조정건명

이용에 따른 분쟁

신청인

신청인의 대리인

+ + () + +

피신청인

피신청인의 대리인

+ + () + +

접수연월일

+

+ + + () + +

+

종료년월일

조정부

+

+ + + (부장: + + 위원: + + ) + +

+

장소

조정결과

+

+ <%-- --%> + +

+

종결일

조정기일

+

+ +

+

+
+ + + +
+ + +
+ + +

결재진행

+
+ <%-- --%> + + <%-- --%> +
+
+ + + + + + + + + + + + + + + + +
결재요청일 +

+
결재대기 +

+ +

+
+
+ + +
+ + + <%-- 반려 이후 제외 --%> + + + + + + + + + + + + + + + + + + + + +
+ +

+

+
+ + + +
+
+
+ +
+
+ <%-- 대결버튼은 현재 결재자 이거나 최고관리자인 경우만 나타나게 --%> + + + + + + <%-- 취하종결 상세보기 --%> + <%-- + + + + --%> + + <%-- 불성립종결, 직권조정, 조정권고 상세보기 --%> + <%-- + + + + + + + + + + + + + + + + + + + + --%> +
+
+ <%-- 최고관리자의 경우 결재, 반려 버튼 미노출 --%> + + + + + + + +
+
+ +
+
+
+
+ + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iop/insteadOfPaymentManageList.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iop/insteadOfPaymentManageList.jsp index f6c0db8c..2b77c2f4 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iop/insteadOfPaymentManageList.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iop/insteadOfPaymentManageList.jsp @@ -11,7 +11,7 @@ <%@ taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt_rt" %> <% /** - * @Class Name : AdjustDeptManagerList.jsp + * @Class Name : insteadOfPaymentManageList.jsp * @Description : 결재 및 대결 관리 목록 * @Modification Information * @ @@ -30,27 +30,156 @@ -결제 및 대결 관리 목록 +내부결재목록 -
- - " /> - " /> + + + " /> + " /> + + +
@@ -75,46 +204,39 @@