diff --git a/src/main/java/kcc/kccadr/accdnt/ai/service/AdjstIncidentService.java b/src/main/java/kcc/kccadr/accdnt/ai/service/AdjstIncidentService.java index 0ef7e2c5..83a009df 100644 --- a/src/main/java/kcc/kccadr/accdnt/ai/service/AdjstIncidentService.java +++ b/src/main/java/kcc/kccadr/accdnt/ai/service/AdjstIncidentService.java @@ -28,4 +28,8 @@ public interface AdjstIncidentService { AdjstIncidentVO selectApmChgDateInfo(AdjstIncidentVO adjstIncidentVO) throws Exception; + + List selectAdjstIncidentPopList(AdjstIncidentVO adjstIncidentVO) throws Exception; + + int selectAdjstIncidentPopCount(AdjstIncidentVO adjstIncidentVO) throws Exception; } diff --git a/src/main/java/kcc/kccadr/accdnt/ai/service/impl/AdjstIncidentDAO.java b/src/main/java/kcc/kccadr/accdnt/ai/service/impl/AdjstIncidentDAO.java index eee6b5c2..b766e6aa 100644 --- a/src/main/java/kcc/kccadr/accdnt/ai/service/impl/AdjstIncidentDAO.java +++ b/src/main/java/kcc/kccadr/accdnt/ai/service/impl/AdjstIncidentDAO.java @@ -50,4 +50,11 @@ public class AdjstIncidentDAO extends EgovAbstractDAO { return (AdjstIncidentVO) select("adjstIncidentDAO.selectApmChgDateInfo", adjstIncidentVO); } + public int selectAdjstIncidentPopCount(AdjstIncidentVO adjstIncidentVO) throws Exception { + return (Integer) select("adjstIncidentDAO.selectAdjstIncidentPopCount", adjstIncidentVO); + } + + public List selectAdjstIncidentPopList(AdjstIncidentVO adjstIncidentVO) throws Exception { + return (List) list("adjstIncidentDAO.selectAdjstIncidentPopList", adjstIncidentVO); + } } diff --git a/src/main/java/kcc/kccadr/accdnt/ai/service/impl/AdjstIncidentServiceImpl.java b/src/main/java/kcc/kccadr/accdnt/ai/service/impl/AdjstIncidentServiceImpl.java index 469aaa51..96ae89f7 100644 --- a/src/main/java/kcc/kccadr/accdnt/ai/service/impl/AdjstIncidentServiceImpl.java +++ b/src/main/java/kcc/kccadr/accdnt/ai/service/impl/AdjstIncidentServiceImpl.java @@ -63,4 +63,13 @@ public class AdjstIncidentServiceImpl implements AdjstIncidentService { return adjstIncidentDAO.selectApmChgDateInfo(adjstIncidentVO); } + @Override + public List selectAdjstIncidentPopList(AdjstIncidentVO adjstIncidentVO) throws Exception { + return adjstIncidentDAO.selectAdjstIncidentPopList(adjstIncidentVO); + } + + @Override + public int selectAdjstIncidentPopCount(AdjstIncidentVO adjstIncidentVO) throws Exception { + return adjstIncidentDAO.selectAdjstIncidentPopCount(adjstIncidentVO); + } } diff --git a/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java b/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java index 09a4e5fd..a00752d0 100644 --- a/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java +++ b/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java @@ -1,8 +1,9 @@ package kcc.kccadr.accdnt.ars.web; +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.Optional; import java.util.stream.Collectors; @@ -11,31 +12,42 @@ import javax.servlet.http.HttpServletRequest; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.json.simple.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +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.RequestMapping; import org.springframework.web.servlet.ModelAndView; +import org.springframework.web.servlet.mvc.support.RedirectAttributes; + +import com.fasterxml.jackson.core.io.JsonStringEncoder; import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; +import kcc.com.cmm.EgovMessageSource; import kcc.com.cmm.LoginVO; import kcc.com.cmm.service.EgovFileMngService; import kcc.com.cmm.service.FileVO; +import kcc.com.cmm.util.IpUtil; import kcc.com.cmm.util.StringUtil; import kcc.com.utl.fcc.service.EgovStringUtil; import kcc.kccadr.accdnt.ai.service.AdjstIncidentService; import kcc.kccadr.accdnt.ai.service.AdjstIncidentVO; import kcc.kccadr.accdnt.ars.service.AdjstReqStatusService; import kcc.kccadr.accdnt.ars.service.AdjstReqStatusVO; +import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmService; +import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmVO; import kcc.kccadr.adjPgrMgr.exmp.app.service.ExmpAppManageService; import kcc.kccadr.adjPgrMgr.exmp.cmm.ExmpManageVO; import kcc.kccadr.adjclsmgr.service.AdjClsMgrService; import kcc.kccadr.adjclsmgr.service.AdjClsMgrVO; import kcc.kccadr.advc.service.AdrHstryMgrService; import kcc.kccadr.advc.service.AdrHstryMgrVO; +import kcc.kccadr.advcRecord.service.AdrRecordReadingService; +import kcc.kccadr.advcRecord.service.AdrRecordReadingVO; import kcc.kccadr.cmm.KccadrConstants; import kcc.kccadr.kccadrCom.service.KccadrCommonSearchVO; import kcc.kccadr.kccadrCom.service.KccadrCommonService; @@ -64,6 +76,9 @@ public class AdjstReqStatusController { private static final Logger LOGGER = LoggerFactory.getLogger(AdjstReqStatusController.class); + @Value("#{globalSettings['Globals.prod.islocal']}") + private String prodIsLocal; + @Resource(name = "EgovFileMngService") private EgovFileMngService fileService; @@ -89,6 +104,16 @@ public class AdjstReqStatusController { @Resource(name = "ExmpAppManageService") private ExmpAppManageService exmpAppManageService; + + @Resource(name = "pgrCmmService") + private PgrCmmService cmmService; + + @Resource(name = "adrRecordReadingService") + private AdrRecordReadingService adrRecordReadingService; + + // eGov 공통 메세지 + @Resource(name = "egovMessageSource") + EgovMessageSource egovMessageSource; /** * 조정진행 상태 및 관리 목록 화면 */ @@ -384,40 +409,71 @@ public class AdjstReqStatusController { } - // 서류 발급 요청 등록 - @RequestMapping(value = "/web/kccadr/accdnt/ars/tab/docIssReqInsertAjax.do") - public ModelAndView docIssReqInsertAjax(AdjClsMgrVO adjClsMgrVO, ModelMap model) throws Exception { - - ModelAndView modelAndView = new ModelAndView(); - modelAndView.setViewName("jsonView"); - - LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated() ? (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser() : null; - String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId()); - + // 대국민 조정사건 기록열람 신청 ajax + @RequestMapping(value = "/web/kccadr/accdnt/ars/tab/docIssReqInsertAjax.do") + public ModelAndView docIssReqInsertAjax(AdjClsMgrVO adjClsMgrVO, ModelMap model) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated() ? (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser() : null; + String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId()); + if (loginVO == null) { - + modelAndView.addObject("result", "fail"); modelAndView.addObject("message", "로그인 해주세요."); return modelAndView; } - + // 작성단계 셋팅 adjClsMgrVO.setFrstRegisterId(userId); // 최초등록자 adjClsMgrVO.setDocuReqConfirmCd(KccadrConstants.ADR_DOCU_REQ); // 신청상태 - - adjClsMgrService.insertDocIssReq(adjClsMgrVO); - - modelAndView.addObject("result", "success"); - - return modelAndView; - - } - - + + adjClsMgrService.insertDocIssReq(adjClsMgrVO); + + + modelAndView.addObject("result", "success"); + + return modelAndView; - // 대국민 서류 발급 요청 목록 + } + + // 대국민 조정사건 기록열람 신청 등록 + @RequestMapping(value = "/web/kccadr/accdnt/ai/docAdjReqInsertAjax.do") + public ModelAndView docAdjReqInsertAjax(AdrRecordReadingVO adrRecordReadingVO, ModelMap model) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated() ? (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser() : null; + String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId()); + + if (loginVO == null) { + + modelAndView.addObject("result", "fail"); + modelAndView.addObject("message", "로그인 해주세요."); + return modelAndView; + } + + // 작성단계 셋팅 + adrRecordReadingVO.setFrstRegisterId(userId); // 최초등록자 + adrRecordReadingVO.setPrcsnStatCd(KccadrConstants.ADR_RCD_RDNG_PRCSN_STAT_CD_10); //신청완료 상태 + + try { + adrRecordReadingService.insertRecordReading(adrRecordReadingVO); + modelAndView.addObject("result", "success"); + } catch(Exception e) { + modelAndView.addObject("result", "fail"); + } + + return modelAndView; + + } + + // 대국민 조정사건 기록열람 신청 목록 @RequestMapping(value = "/web/kccadr/accdnt/ai/docIssReqList.do") - public String docIssReqList(@ModelAttribute("adjClsMgrVO") AdjClsMgrVO adjClsMgrVO, ModelMap model) throws Exception { + public String docIssReqList(@ModelAttribute("adrRecordReadingVO") AdrRecordReadingVO adrRecordReadingVO, ModelMap model) throws Exception { String auth = EgovUserDetailsHelper.isAuthenticated() ? null : EgovUserDetailsHelper.getAuthenticatedUser().toString(); LoginVO loginVO = "anonymousUser".equals(auth) ? new LoginVO() : (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser(); @@ -427,38 +483,42 @@ public class AdjstReqStatusController { return "redirect:/web/user/login/ssoLogin.do"; } - adjClsMgrVO.setSearchFrstRegisterId(loginVO.getUniqId()); + adrRecordReadingVO.setSearchFrstRegisterId(loginVO.getUniqId()); - if(adjClsMgrVO.getPageUnit() != 10) { - adjClsMgrVO.setPageUnit(adjClsMgrVO.getPageUnit()); + if(adrRecordReadingVO.getPageUnit() != 10) { + adrRecordReadingVO.setPageUnit(adrRecordReadingVO.getPageUnit()); } - if("".equals(adjClsMgrVO.getSearchSortCnd())){ //최초조회시 최신것 조회List - adjClsMgrVO.setSearchSortCnd("a.ADR_SEQ"); - adjClsMgrVO.setSearchSortOrd("desc"); + if("".equals(adrRecordReadingVO.getSearchSortCnd())){ //최초조회시 최신것 조회List + adrRecordReadingVO.setSearchSortCnd("a.record_reading_seq"); + adrRecordReadingVO.setSearchSortOrd("desc"); } // 키워드가 있다면 일단 암호화 하여 암호화 컬럼에 셋 - if(StringUtils.isNotBlank(adjClsMgrVO.getSearchKeyword())){ - adjClsMgrVO.setSearchEncKeyword(egovCryptoUtil.encrypt(adjClsMgrVO.getSearchKeyword())); + if(StringUtils.isNotBlank(adrRecordReadingVO.getSearchKeyword())){ + adrRecordReadingVO.setSearchEncKeyword(egovCryptoUtil.encrypt(adrRecordReadingVO.getSearchKeyword())); } /** paging */ PaginationInfo paginationInfo = new PaginationInfo(); - paginationInfo.setCurrentPageNo(adjClsMgrVO.getPageIndex()); - paginationInfo.setRecordCountPerPage(adjClsMgrVO.getPageUnit()); - paginationInfo.setPageSize(adjClsMgrVO.getPageSize()); + paginationInfo.setCurrentPageNo(adrRecordReadingVO.getPageIndex()); + paginationInfo.setRecordCountPerPage(adrRecordReadingVO.getPageUnit()); + paginationInfo.setPageSize(adrRecordReadingVO.getPageSize()); - adjClsMgrVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); - adjClsMgrVO.setLastIndex(paginationInfo.getLastRecordIndex()); - adjClsMgrVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); - - List list = adjClsMgrService.selectDocIssReqList(adjClsMgrVO); + adrRecordReadingVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); + adrRecordReadingVO.setLastIndex(paginationInfo.getLastRecordIndex()); + adrRecordReadingVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); + List list = adrRecordReadingService.selectDocReqList(adrRecordReadingVO); paginationInfo.setTotalRecordCount(list.size() > 0 ? list.get(0).getTotCnt() : 0); - decryptInfomation2(list, null); - model.addAttribute("paginationInfo", paginationInfo); + + int listSize = list.size(); + for(int i=0; i list = adjstIncidentService.selectAdjstIncidentPopList(adjstIncidentVO); + decryptInfomation2(list, null); + model.addAttribute("list", list); + model.addAttribute("adjstIncidentVO", adjstIncidentVO); + return "/web/kccadr/accdnt/ars/tab/docIssReqRegistPop"; } + /** + * 대국민 서류 발급 요청 삭제 처리 + */ + @RequestMapping("/web/kccadr/accdnt/ai/deletedocIssReq.do") + public String deletedocIssReq(@ModelAttribute("adrRecordReadingVO") AdrRecordReadingVO adrRecordReadingVO, ModelMap model, RedirectAttributes redirectAttributes) throws Exception { + + adrRecordReadingService.deletedocIssReq(adrRecordReadingVO); // 삭제 + redirectAttributes.addFlashAttribute("message", egovMessageSource.getMessage("success.common.delete")); // 공통메세지 + + return "redirect:/web/kccadr/accdnt/ai/docIssReqList.do"; + } + + + /** + * 기일통지서 상세 TODO daenge 기일통지서 오즈리포팅 처리 + * + * @param PgrCmmVO + * @param model + * @return + * @throws Exception + */ + @SuppressWarnings("unchecked") + @RequestMapping(value = "/web/kccadr/accdnt/ai/docReqReportAjax.do") + public String dntReportAjax(PgrCmmVO cmmVO, AdrRecordReadingVO adrRecordReadingVO, HttpServletRequest req, 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"; + } + + adrRecordReadingVO.setLastUpdusrId(loginVO.getUniqId()); + + JSONObject jsDntInfo = new JSONObject(); //조정권고안 정보 + PgrCmmVO result = cmmService.selectPgrCmm(cmmVO); + + jsDntInfo = parseJsonData(result); + JSONObject jsObjData = new JSONObject(); + jsObjData.put("jsDntInfo", jsDntInfo); + + String repStr = jsObjData.toString(); + repStr = StringUtil.getUrlString(jsObjData.toString()); + + //json 데이터 특수문자 치환_220215_이준호 + JsonStringEncoder encoder = JsonStringEncoder.getInstance(); + char[] escapedJson = encoder.quoteAsString(repStr); + System.out.println(escapedJson); // {\"type\":\"BIG\"} + String p_json; + p_json = new String(escapedJson); + p_json = p_json.replace("\\\\\\\\r\\\\\\\\n", "\\\\r\\\\n").replace("\'", "\\'"); + + model.addAttribute("jsObjData", repStr); + + //오즈리포트 서버별 주소 셋팅해주기 + String serverName = req.getServerName(); + String ozServerNm = IpUtil.getOzServerName(serverName); + model.addAttribute("ozServerNm", ozServerNm); + + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + //adr_hstry_mgr에 값 넣기 - 시작 + /* + adrHstryMgrService.insert4Func(result.getAdrSeq() + , "조정진행관리>>조정진행목록>조정진행상세>기일지정상세>출력" //String p_code_desc - CC199 + , "V140" //String p_stat_cd + , result.getFrstRegisterId() + , result.getLastUpdusrId() + + , "" + , "V" + , "ADR_MGR_MASTER" + , "" + + ); + */ + //adr_hstry_mgr에 값 넣기 - 끝 + + adrRecordReadingVO.setPrcsnStatCd(KccadrConstants.ADR_RCD_RDNG_PRCSN_STAT_CD_30); //출력완료 + adrRecordReadingService.updateRecordReadingStatus(adrRecordReadingVO); + + return "/web/kccadr/accdnt/ars/tab/report/adrDocReqReport"; + } + // 종결VO public void decryptInfomation2(List list, AdjClsMgrVO info){ if(CollectionUtils.isNotEmpty(list)){ @@ -574,4 +770,183 @@ public class AdjstReqStatusController { } } + /** + * 오즈 리포트 데이터 Json 생성하기 + * + * @param closeVO + */ + @SuppressWarnings("unchecked") + public JSONObject parseJsonData(PgrCmmVO cmmVO) throws Exception{ + + JSONObject oj = new JSONObject(); + + //String adrSeq = cmmVO.getAdrSeq(); //조정일련번호 + String adrNo = cmmVO.getAdrNo(); //조정번호 + String adrSn = cmmVO.getAdrSn(); //조정회차 + String cctyTx = cmmVO.getCcTyTx(); //저작물유형 명 + String memDeptNm = cmmVO.getMemDeptNm(); //조정부명 + String memName = cmmVO.getMemName(); //조정부장명 + String adrAdmNm = cmmVO.getAdrAdmNm(); //조정조사관명 + String adrAdmOffmTel = cmmVO.getAdrAdmOffmTel();//조정조사관 내선번호 + + + String applicantNm = cmmVO.getAppliCantNm(); //신청인 이름 + String resPonDentNm = cmmVO.getResPonDentNm(); //피신청인 + String resPonDentNmEtc = ""; //피신청인 외 x명 처리 변수 + String[] arrResPon = resPonDentNm.split(","); + int resPonCnt = arrResPon.length; + + //피신청인이 2명 이상인경우 "피신청인 외 x명" 표기 처리 + if(resPonCnt > 1) { + + resPonDentNmEtc = arrResPon[0] + " 외 " + (resPonCnt - 1) + "명"; + + }else { + + resPonDentNmEtc = resPonDentNm; + + } + + String appDeDay = cmmVO.getAppDeDay(); //조정기일 일시 + String appDeTime = cmmVO.getAppDeTime(); //조정기일 시간 + String appDeDate = ""; + //날짜 표시형식 변환 + if(cmmVO.getAppDeDay() != null && cmmVO.getAppDeTime() != null) { + + appDeDate = appDeDay + " " + appDeTime; + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm"); + Date deDay = simpleDateFormat.parse(appDeDate); + + SimpleDateFormat simpleStrFormat = new SimpleDateFormat("yyyy년 MM월 dd일 HH시 mm분"); + + appDeDate = simpleStrFormat.format(deDay); + + } + + String appPlace = cmmVO.getAppPlaceInfo(); //기일 장소명 + String appPlaceAddr = cmmVO.getAppPlaceAddrInfo(); //기일 장소 주소 + + //조정부장의 직인 이미지 불러오기 + cmmVO.setMemGrade("01"); + List resultStampInfo = cmmService.selectAtchFileIdInfo(cmmVO); + + String atchFileId = ""; + + if(StringUtil.isNotEmpty(resultStampInfo.get(0).getAtchFileId())) { + + atchFileId = resultStampInfo.get(0).getAtchFileId(); + + } + + /*if(!adrSeq.equals("")) { + + oj.put("adrSeq", adrSeq); + + }*/ + + if(!adrNo.equals("")) { + + oj.put("adrNo", adrNo); + + } + + if(!adrSn.equals("")) { + + oj.put("adrSn", adrSn); + + } + + if(!cctyTx.equals("")) { + + oj.put("cctyTx", cctyTx); + + } + + if(!memDeptNm.equals("")) { + + oj.put("memDeptNm", memDeptNm); + + } + + if(!memName.equals("")) { + + oj.put("memName", memName); + + } + + if(!adrAdmNm.equals("")) { + + oj.put("adrAdmNm", adrAdmNm); + + } + + if(!adrAdmOffmTel.equals("")) { + + oj.put("adrAdmOffmTel", adrAdmOffmTel); + + } + + if(!applicantNm.equals("")) { + + oj.put("applicantNm", applicantNm); + + } + + if(!resPonDentNm.equals("")) { + + oj.put("resPonDentNm", resPonDentNm); + + } + + if(!resPonDentNmEtc.equals("")) { + + oj.put("resPonDentNmEtc", resPonDentNmEtc); + + } + + /*if(!appDeDay.equals("")) { + + oj.put("appDeDay", appDeDay); + + }*/ + + if(!appDeDate.equals("")) { + + oj.put("appDeDate", appDeDate); + + } + + if(!appPlace.equals("")) { + + oj.put("appPlace", appPlace); + + } + + if(!appPlaceAddr.equals("")) { + + oj.put("appPlaceAddr", appPlaceAddr); + + } + + if(!atchFileId.equals("")) { + + String domain = ""; + + if ("real".equals(prodIsLocal)) { + + domain = "hosts_real"; + + }else { + + domain = "host_dev"; + + } + + String stampPath = domain + "&url&" + atchFileId; + oj.put("stampPath", stampPath); + + } + + return oj; + } } diff --git a/src/main/java/kcc/kccadr/adjclsmgr/service/impl/AdjClsMgrDAO.java b/src/main/java/kcc/kccadr/adjclsmgr/service/impl/AdjClsMgrDAO.java index 09d3194f..3ef5f901 100644 --- a/src/main/java/kcc/kccadr/adjclsmgr/service/impl/AdjClsMgrDAO.java +++ b/src/main/java/kcc/kccadr/adjclsmgr/service/impl/AdjClsMgrDAO.java @@ -82,4 +82,9 @@ public class AdjClsMgrDAO extends EgovAbstractDAO { public int docIssReqUpdate(AdjClsMgrVO adjClsMgrVO) throws Exception { return update("adjClsMgrDAO.docIssReqUpdate", adjClsMgrVO); } + + // 대국민 조정사건 기록열람 신청 + public int insertDocAdjReq(AdjClsMgrVO adjClsMgrVO) throws Exception { + return update("adjClsMgrDAO.insertDocAdjReq", adjClsMgrVO); + } } diff --git a/src/main/java/kcc/kccadr/adjclsmgr/service/impl/AdjClsMgrServiceImpl.java b/src/main/java/kcc/kccadr/adjclsmgr/service/impl/AdjClsMgrServiceImpl.java index 1e677194..4077613f 100644 --- a/src/main/java/kcc/kccadr/adjclsmgr/service/impl/AdjClsMgrServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjclsmgr/service/impl/AdjClsMgrServiceImpl.java @@ -94,5 +94,6 @@ public class AdjClsMgrServiceImpl implements AdjClsMgrService { public void docIssReqUpdate(AdjClsMgrVO adjClsMgrVO) throws Exception { adjClsMgrDAO.docIssReqUpdate(adjClsMgrVO); } + } diff --git a/src/main/java/kcc/kccadr/advcRecord/service/AdrRecordReadingService.java b/src/main/java/kcc/kccadr/advcRecord/service/AdrRecordReadingService.java index 48f05644..53977bcf 100644 --- a/src/main/java/kcc/kccadr/advcRecord/service/AdrRecordReadingService.java +++ b/src/main/java/kcc/kccadr/advcRecord/service/AdrRecordReadingService.java @@ -19,19 +19,19 @@ public interface AdrRecordReadingService { ) throws Exception; //C - void insert(AdrRecordReadingVO adrHstryMgrVO) throws Exception; + void insertRecordReading(AdrRecordReadingVO adrRecordReadingVO) throws Exception; //R AdrRecordReadingVO selectDetail(AdrRecordReadingVO adrHstryMgrVO) throws Exception; //U - int update(AdrRecordReadingVO adrHstryMgrVO) throws Exception; + int updateRecordReadingStatus(AdrRecordReadingVO adrHstryMgrVO) throws Exception; //D - int delete(AdrRecordReadingVO adrHstryMgrVO) throws Exception; + int deletedocIssReq(AdrRecordReadingVO adrHstryMgrVO) throws Exception; //L - List selectList(AdrRecordReadingVO adrHstryMgrVO) throws Exception; + List selectDocReqList(AdrRecordReadingVO adrRecordReadingVO) throws Exception; //L page List selectPagingList(AdrRecordReadingVO adrHstryMgrVO) throws Exception; diff --git a/src/main/java/kcc/kccadr/advcRecord/service/AdrRecordReadingVO.java b/src/main/java/kcc/kccadr/advcRecord/service/AdrRecordReadingVO.java index 3747f611..ad69b3fa 100644 --- a/src/main/java/kcc/kccadr/advcRecord/service/AdrRecordReadingVO.java +++ b/src/main/java/kcc/kccadr/advcRecord/service/AdrRecordReadingVO.java @@ -18,14 +18,22 @@ public class AdrRecordReadingVO extends ComDefaultVO implements Serializable { private String prcsnPnttm; //처리일시 private String frstRegistPnttm; //등록일시 private String frstRegisterId; //등록자 - private String lastUpdtPnttm; //수정일시 private String lastUpdusrId; //수정자 - + private String recordReadingFlag; + private String recordReadingHstrySeq; //기록열람이력 일련번호 private String cn; //내용-승인번호, 결재 정보 등등 + private String searchFrstRegisterId; + private String searchDocReqCd; + + + private String resPonDentNm; + private String adrNo; + private String appliCantNm; + public String getRecordReadingSeq() { @@ -112,4 +120,40 @@ public class AdrRecordReadingVO extends ComDefaultVO implements Serializable { public void setCn(String cn) { this.cn = cn; } + public String getSearchFrstRegisterId() { + return searchFrstRegisterId; + } + public void setSearchFrstRegisterId(String searchFrstRegisterId) { + this.searchFrstRegisterId = searchFrstRegisterId; + } + public String getResPonDentNm() { + return resPonDentNm; + } + public void setResPonDentNm(String resPonDentNm) { + this.resPonDentNm = resPonDentNm; + } + public String getAdrNo() { + return adrNo; + } + public void setAdrNo(String adrNo) { + this.adrNo = adrNo; + } + public String getSearchDocReqCd() { + return searchDocReqCd; + } + public void setSearchDocReqCd(String searchDocReqCd) { + this.searchDocReqCd = searchDocReqCd; + } + public String getAppliCantNm() { + return appliCantNm; + } + public void setAppliCantNm(String appliCantNm) { + this.appliCantNm = appliCantNm; + } + public String getRecordReadingFlag() { + return recordReadingFlag; + } + public void setRecordReadingFlag(String recordReadingFlag) { + this.recordReadingFlag = recordReadingFlag; + } } diff --git a/src/main/java/kcc/kccadr/advcRecord/service/impl/AdrRecordReadingDAO.java b/src/main/java/kcc/kccadr/advcRecord/service/impl/AdrRecordReadingDAO.java index 466f82f3..804ba25f 100644 --- a/src/main/java/kcc/kccadr/advcRecord/service/impl/AdrRecordReadingDAO.java +++ b/src/main/java/kcc/kccadr/advcRecord/service/impl/AdrRecordReadingDAO.java @@ -136,8 +136,8 @@ public class AdrRecordReadingDAO extends EgovAbstractDAO { * @param AdjstChangeDateVO * @throws Exception */ - public void insert(AdrRecordReadingVO adrHstryMgrVO) throws Exception { - insert("AdrHstryMgrDAO.insert", adrHstryMgrVO); + public void insertRecordReading(AdrRecordReadingVO adrRecordReadingVO) throws Exception { + insert("AdrRecordReadingDAO.insertRecordReading", adrRecordReadingVO); } /** @@ -156,23 +156,23 @@ public class AdrRecordReadingDAO extends EgovAbstractDAO { * @return * @throws Exception */ - public int update(AdrRecordReadingVO adrHstryMgrVO) throws Exception { - return update("AdrRecordReadingDAO.update", adrHstryMgrVO); + public int updateRecordReadingStatus(AdrRecordReadingVO adrHstryMgrVO) throws Exception { + return update("AdrRecordReadingDAO.updateRecordReadingStatus", adrHstryMgrVO); } /** * 삭제 - D - * @param addrAgencyVO + * @param adrRecordReadingVO * @return * @throws Exception */ - public int delete(AdrRecordReadingVO adrHstryMgrVO) throws Exception { - return delete("AdrRecordReadingDAO.delete", adrHstryMgrVO); + public int deletedocIssReq(AdrRecordReadingVO adrRecordReadingVO) throws Exception { + return delete("AdrRecordReadingDAO.deletedocIssReq", adrRecordReadingVO); } //L - public List selectList(AdrRecordReadingVO adrHstryMgrVO) throws Exception { - List tlist = (List) list("AdrHstryMgrDAO.selectList", adrHstryMgrVO); + public List selectDocReqList(AdrRecordReadingVO adrRecordReadingVO) throws Exception { + List tlist = (List) list("AdrRecordReadingDAO.selectDocReqList", adrRecordReadingVO); return tlist; } @@ -183,7 +183,7 @@ public class AdrRecordReadingDAO extends EgovAbstractDAO { * @throws Exception */ public List selectPagingList(AdrRecordReadingVO adrHstryMgrVO) throws Exception { - List tlist = (List) list("AdrHstryMgrDAO.selectPagingList", adrHstryMgrVO); + List tlist = (List) list("AdrRecordReadingDAO.selectPagingList", adrHstryMgrVO); return tlist; } } diff --git a/src/main/java/kcc/kccadr/advcRecord/service/impl/AdrRecordReadingHstryServiceImpl.java b/src/main/java/kcc/kccadr/advcRecord/service/impl/AdrRecordReadingHstryServiceImpl.java index 71e6bf04..ab604c51 100644 --- a/src/main/java/kcc/kccadr/advcRecord/service/impl/AdrRecordReadingHstryServiceImpl.java +++ b/src/main/java/kcc/kccadr/advcRecord/service/impl/AdrRecordReadingHstryServiceImpl.java @@ -14,8 +14,8 @@ import kcc.kccadr.advcRecord.service.AdrRecordReadingVO; public class AdrRecordReadingHstryServiceImpl implements AdrRecordReadingHstryService { //이력 - @Resource(name="adrRecordReadingDAO") - private AdrRecordReadingDAO adrRecordReadingDAO; + @Resource(name="adrRecordReadingHstryDAO") + private AdrRecordReadingHstryDAO adrRecordReadingHstryDAO; //이력 상세 //@Resource(name="adrRecordReadingDetailDAO") @@ -48,7 +48,7 @@ public class AdrRecordReadingHstryServiceImpl implements AdrRecordReadingHstrySe , String p_tableName , String p_updateQuery ) throws Exception { - return adrRecordReadingDAO.insert4Func( + return adrRecordReadingHstryDAO.insert4Func( p_adrSeq , p_menuNm , p_menuId @@ -64,33 +64,33 @@ public class AdrRecordReadingHstryServiceImpl implements AdrRecordReadingHstrySe //C public void insert(AdrRecordReadingVO adrRecordReadingVO) throws Exception { - adrRecordReadingDAO.insert(adrRecordReadingVO); + adrRecordReadingHstryDAO.insert(adrRecordReadingVO); } //R public AdrRecordReadingVO selectDetail(AdrRecordReadingVO adrRecordReadingVO) throws Exception { - return adrRecordReadingDAO.selectDetail(adrRecordReadingVO); + return adrRecordReadingHstryDAO.selectDetail(adrRecordReadingVO); } //U public int update(AdrRecordReadingVO adrRecordReadingVO) throws Exception{ - return adrRecordReadingDAO.update(adrRecordReadingVO); + return adrRecordReadingHstryDAO.update(adrRecordReadingVO); } //D public int delete(AdrRecordReadingVO adrRecordReadingVO) throws Exception{ - return adrRecordReadingDAO.delete(adrRecordReadingVO); + return adrRecordReadingHstryDAO.delete(adrRecordReadingVO); } //List public List selectList(AdrRecordReadingVO adrRecordReadingVO) throws Exception{ - return adrRecordReadingDAO.selectList(adrRecordReadingVO); + return adrRecordReadingHstryDAO.selectList(adrRecordReadingVO); } //paging List public List selectPagingList(AdrRecordReadingVO adrRecordReadingVO) throws Exception{ - return adrRecordReadingDAO.selectPagingList(adrRecordReadingVO); + return adrRecordReadingHstryDAO.selectPagingList(adrRecordReadingVO); } } diff --git a/src/main/java/kcc/kccadr/advcRecord/service/impl/AdrRecordReadingServiceImpl.java b/src/main/java/kcc/kccadr/advcRecord/service/impl/AdrRecordReadingServiceImpl.java index 9e893fa5..a87b67dc 100644 --- a/src/main/java/kcc/kccadr/advcRecord/service/impl/AdrRecordReadingServiceImpl.java +++ b/src/main/java/kcc/kccadr/advcRecord/service/impl/AdrRecordReadingServiceImpl.java @@ -7,16 +7,19 @@ import javax.annotation.Resource; import org.springframework.stereotype.Service; +import egovframework.rte.fdl.idgnr.EgovIdGnrService; import kcc.kccadr.advcRecord.service.AdrRecordReadingService; import kcc.kccadr.advcRecord.service.AdrRecordReadingVO; @Service("adrRecordReadingService") public class AdrRecordReadingServiceImpl implements AdrRecordReadingService { - //이력 @Resource(name="adrRecordReadingDAO") private AdrRecordReadingDAO adrRecordReadingDAO; + @Resource(name="recordReadingGnrService") + private EgovIdGnrService idgenService; + //이력 상세 //@Resource(name="adrRecordReadingDetailDAO") //private adrRecordReadingDetailDAO adrRecordReadingDetailDAO; @@ -63,8 +66,12 @@ public class AdrRecordReadingServiceImpl implements AdrRecordReadingService { } //C - public void insert(AdrRecordReadingVO adrRecordReadingVO) throws Exception { - adrRecordReadingDAO.insert(adrRecordReadingVO); + public void insertRecordReading(AdrRecordReadingVO adrRecordReadingVO) throws Exception { + + String recordReadingSeq = idgenService.getNextStringId(); // 고유 번호 생성 + adrRecordReadingVO.setRecordReadingSeq(recordReadingSeq); + + adrRecordReadingDAO.insertRecordReading(adrRecordReadingVO); } //R @@ -73,19 +80,19 @@ public class AdrRecordReadingServiceImpl implements AdrRecordReadingService { } //U - public int update(AdrRecordReadingVO adrRecordReadingVO) throws Exception{ + public int updateRecordReadingStatus(AdrRecordReadingVO adrRecordReadingVO) throws Exception{ - return adrRecordReadingDAO.update(adrRecordReadingVO); + return adrRecordReadingDAO.updateRecordReadingStatus(adrRecordReadingVO); } //D - public int delete(AdrRecordReadingVO adrRecordReadingVO) throws Exception{ - return adrRecordReadingDAO.delete(adrRecordReadingVO); + public int deletedocIssReq(AdrRecordReadingVO adrRecordReadingVO) throws Exception{ + return adrRecordReadingDAO.deletedocIssReq(adrRecordReadingVO); } //List - public List selectList(AdrRecordReadingVO adrRecordReadingVO) throws Exception{ - return adrRecordReadingDAO.selectList(adrRecordReadingVO); + public List selectDocReqList(AdrRecordReadingVO adrRecordReadingVO) throws Exception{ + return adrRecordReadingDAO.selectDocReqList(adrRecordReadingVO); } //paging List diff --git a/src/main/java/kcc/kccadr/cmm/KccadrConstants.java b/src/main/java/kcc/kccadr/cmm/KccadrConstants.java index 9958c023..90a69f15 100644 --- a/src/main/java/kcc/kccadr/cmm/KccadrConstants.java +++ b/src/main/java/kcc/kccadr/cmm/KccadrConstants.java @@ -294,6 +294,20 @@ public class KccadrConstants { public static final String ADR_RPPL_USR_TY2 = "02"; // 법인 public static final String ADR_RPPL_USR_TY3 = "03"; // 개인사업자 - + //ADR_RCD_RDNG : 조정사건기록열람 + //신청인구분 + public static final String ADR_RCD_RDNG_REQ_TY_01 = "01"; // 신청자 + public static final String ADR_RCD_RDNG_REQ_TY_02 = "02"; // 이용자 + //당사자여부 + public static final String ADR_RCD_RDNG_MYSF_IS_10 = "10"; // 신청인 + public static final String ADR_RCD_RDNG_MYSF_IS_30 = "30"; // 신청대리인 + //서류구분 + public static final String ADR_RCD_RDNG_DOCU_TY_10 = "10"; // 기일조서 + public static final String ADR_RCD_RDNG_DOCU_TY_20 = "20"; // 조정조서 + //처리상태 + public static final String ADR_RCD_RDNG_PRCSN_STAT_CD_10 = "10"; // 신청완료 + public static final String ADR_RCD_RDNG_PRCSN_STAT_CD_20 = "20"; // 결제완료 + public static final String ADR_RCD_RDNG_PRCSN_STAT_CD_30 = "30"; // 출력완료 + public static final String ADR_RCD_RDNG_PRCSN_STAT_CD_90 = "90"; // 삭제 } \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/kccadr/accdnt/ai/AdjustIncident_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/accdnt/ai/AdjustIncident_SQL_Mysql.xml index abf8f962..f0234d51 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/accdnt/ai/AdjustIncident_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/accdnt/ai/AdjustIncident_SQL_Mysql.xml @@ -878,5 +878,85 @@ ORDER BY A.adrSn DESC LIMIT 1 + + + + diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjClsMgr/AdjClsMgr_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjClsMgr/AdjClsMgr_SQL_Mysql.xml index 2fa1e52d..8aaa0351 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjClsMgr/AdjClsMgr_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjClsMgr/AdjClsMgr_SQL_Mysql.xml @@ -3,7 +3,7 @@ - + - + UPDATE SET - - last_updt_pnttm = NOW() - , last_updusr_id = #lastUpdusrId# - - - , adr_seq = adrSeq - - - , req_ty = reqTy - - - , myself_is = myselfIs - - - , docu_ty = docuTy - - - , auth_qntty= authQntty - - - , prcsn_stat_cd = prcsnStatCd + last_updt_pnttm = NOW() + , last_updusr_id = #lastUpdusrId# + + , prcsn_stat_cd = #prcsnStatCd# , prcsn_pnttm = NOW() - - - WHERE record_reading_seq = #recordReadingSeq# - - - - + DELETE FROM WHERE @@ -155,38 +129,83 @@ - SELECT COUNT(1) OVER() AS totCnt , + ,( SELECT + CASE + WHEN COUNT(*) 1 + THEN GROUP_CONCAT(RPPL_NM SEPARATOR ',') + ELSE RPPL_NM + || '외' + || (COUNT(*)-1) + || '명' + END RPPL_NMS + FROM ADR_RPPL S1 + WHERE 1 =1 + AND S1.adr_seq = a.adr_seq + AND S1.RPPL_TY = '20' + GROUP BY S1.adr_seq + ORDER BY S1.FRST_REGIST_PNTTM + ) + AS resPonDentNm + , ( SELECT RPPL_NM + FROM ADR_RPPL s1 + WHERE 1=1 + AND S1.adr_seq = a.adr_seq + AND s1.RPPL_TY = '10' + ) + AS appliCantNm + ,c.adr_no AS adrNo FROM a + INNER JOIN + ( SELECT ADR_SEQ, + RPPL_ID, + RPPL_NM, + rppl_ty + FROM ADR_RPPL + WHERE RPPL_ID = #searchFrstRegisterId# + GROUP BY ADR_SEQ, + RPPL_ID + ) + AP + ON A.ADR_SEQ = AP.ADR_SEQ + LEFT OUTER JOIN + ADR_MGR_MASTER c + ON + a.adr_seq = c.adr_seq WHERE 1=1 - - - AND a.record_reading_seq = #recordReadingSeq# - - - - - $selectPagingListQuery$ + + + c.ADR_NO LIKE CONCAT('%' , #searchKeyword#, '%') + - - - - ORDER BY 1=1 - - - , a.record_reading_seq desc - - - , $orderByQuery$ - + + + TO_CHAR(A.FRST_REGIST_PNTTM,'YYYYMMDD') = ]]> REPLACE(#searchStartDt#, '-' , '') + + + TO_CHAR(A.FRST_REGIST_PNTTM,'YYYYMMDD') REPLACE(#searchEndDt#, '-' , '') + + + + A.prcsn_stat_cd LIKE CONCAT('%' , #searchSelStatus#, '%') + + + ORDER BY 1=1 + + ,$searchSortCnd$ + + + $searchSortOrd$ + LIMIT #recordCountPerPage# OFFSET #firstIndex# diff --git a/src/main/webapp/WEB-INF/decorators.xml b/src/main/webapp/WEB-INF/decorators.xml index f6df4ec0..3d17cd83 100644 --- a/src/main/webapp/WEB-INF/decorators.xml +++ b/src/main/webapp/WEB-INF/decorators.xml @@ -118,6 +118,8 @@ /kcc/mail/intSendMailForm.do /web/adminContent.do /web/kccadr/adjst/adjstReqRegistTutorial.do + /web/kccadr/accdnt/ai/docIssReqRegistPop.do + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ai/adjstIncidentList.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ai/adjstIncidentList.jsp index f9f34f66..2cc4b070 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ai/adjstIncidentList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ai/adjstIncidentList.jsp @@ -29,6 +29,13 @@ - - -" /> -" /> -" /> + + +" /> +" /> +" /> + -
-

서류 발급 요청 목록

+

조정사건 기록열람 신청목록

- - <%--
- - - - -
--%>
- + + + -
- - -
- -
- - -
-
- +
- ~
- +
-
- + +
+
+ +
@@ -176,15 +142,10 @@ + - - + - <%-- - - - - --%> @@ -192,71 +153,60 @@ 신청일자 조정번호 신청인 + 피신청인 신청서류 처리상태 - - - + + - - + + 신청일자 -

+

조정번호 - +

신청인 - + + + + 피신청인 + 신청서류 -

+

처리상태 -

+

+ + + + + + + + + + 열람완료 + 발급완료 + + +

- <%-- - 신청 대상자 -

- --%> - <%-- - 신청내용 -

- --%> - <%-- - 신청유형 -

- --%> - <%-- - 종결상태 -

- - - - -

- --%> - <%-- - 진행상태 -

- --%> diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/docIssReqRegist.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/docIssReqRegist.jsp index 0957b615..e1e66062 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/docIssReqRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/docIssReqRegist.jsp @@ -16,11 +16,84 @@ 조정사건 상세 - <%-- --%> @@ -40,6 +113,9 @@ + +
+
@@ -55,7 +131,7 @@

대리인 정보

--> - + @@ -68,7 +144,7 @@ @@ -79,8 +155,8 @@ @@ -91,8 +167,8 @@ @@ -103,8 +179,19 @@ + + + + @@ -114,9 +201,7 @@

발급부수

@@ -125,10 +210,12 @@
- + +
+ diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/docIssReqRegistPop.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/docIssReqRegistPop.jsp index 2bcd35b2..e3a910cf 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/docIssReqRegistPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/docIssReqRegistPop.jsp @@ -15,29 +15,43 @@ @@ -48,54 +62,74 @@ $(document).ready(function(){ " />
-
-

종결 조정사건 목록

-
-
-
- - - -
+
+

종결 조정사건 목록

+
+
+
+ + + +
-
조정사건 기록열람 신청 정보 : 조정번호, 신청인 구분, 조정당사자 여부, 서류종류, 발급부수등의 정보제공조정사건 기록열람 신청 정보 : 조정번호, 신청인 구분, 조정당사자 여부, 서류종류, 열람발급여부 발급부수등의 정보제공
- +
- - + +
- - + +
- - + +
+
+

필수입력 항목*

+

열람/발급여부

+ 		+
+ +
- + 통
- - - - - - - - - - - - - - - - - - - - - - - -
피신청인 이전작성 목록 : 피신청인, 저작물 종류, 선택등의 정보제공
피신청인조정번호선택
-

김길동

- 		-

2021조050

-
- - <%--
- -
--%> - -
- -
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
피신청인 이전작성 목록 : 피신청인, 저작물 종류, 선택등의 정보제공
번호조정번호신청인피신청인선택
+ + + + + + + + + + + + + + +
+ +
+ +
+ +
+ +
+
diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/report/adrDocReqReport.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/report/adrDocReqReport.jsp new file mode 100644 index 00000000..291bb028 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/report/adrDocReqReport.jsp @@ -0,0 +1,82 @@ +<%-- + 대국민 사용자 + Class Name : adrAppSlctReport.jsp + Description : 조정기일통지서 오즈리포팅 전송 화면(오즈리포트 정보 전송) + Modification Information + + 수정일 수정자 수정내용 + ------- -------- --------------------------- + 2021.11.09 우영두 최초생성 + + author : 우영두 + since : 2021.11.09 + +--%> +<%-- 공통 JS 함수 정의 : /jsp/web/com/webLayout.jsp --%> +<%@ page contentType="text/html; charset=utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator"%> + + + + + + + + + + + + + + +
+ + + + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp index 6aa91599..d3fd4ff2 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp @@ -1223,6 +1223,25 @@ var AdjstReq = { , "adjstHostoryPop" ); }, + historyAdjstPopEndList : function(paramObj){ + if(paramObj == undefined || paramObj == ''){ + paramObj = { + pageIndex : 1, + searchKeyword : "", + searchCondition : "", + pageUnit : 5 + }; + } + // 이전신청데이터 팝업 호출.. + commonPopLayeropen( + "/web/kccadr/accdnt/ai/docIssReqRegistPop.do" + , 700 + , 600 + , paramObj + , "N" + , "adjstIncRegistPopEndList" + ); + }, opinionsAdjstPopList : function(paramObj){ if(paramObj == undefined || paramObj == ''){ paramObj = {