diff --git a/src/main/java/kcc/com/cmm/util/DateUtil.java b/src/main/java/kcc/com/cmm/util/DateUtil.java index 6e1b2743..2b4ce537 100644 --- a/src/main/java/kcc/com/cmm/util/DateUtil.java +++ b/src/main/java/kcc/com/cmm/util/DateUtil.java @@ -1,5 +1,6 @@ package kcc.com.cmm.util; +import java.text.DateFormat; import java.text.SimpleDateFormat; import java.time.Instant; import java.time.LocalDate; @@ -193,5 +194,29 @@ public final class DateUtil { return dtFormat.format(cal.getTime()); } + + public static String setDiffYear(String searchYear) { + + int yearChar = Integer.parseInt(searchYear); + Calendar cal = Calendar.getInstance(); + cal.setTime(new Date()); + DateFormat df = new SimpleDateFormat("yyyy-MM-dd"); + + cal.add(Calendar.YEAR, -yearChar); + + return df.format(cal.getTime()); + } + + public static String setDiffMonth(String searchMonth) { + + int yearChar = Integer.parseInt(searchMonth); + Calendar cal = Calendar.getInstance(); + cal.setTime(new Date()); + DateFormat df = new SimpleDateFormat("yyyy-MM-dd"); + + cal.add(Calendar.MONTH, -yearChar); + + return df.format(cal.getTime()); + } } 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 1abdd6ce..bda1823c 100644 --- a/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java +++ b/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java @@ -1,5 +1,7 @@ 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.Optional; @@ -7,17 +9,21 @@ import java.util.stream.Collectors; 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; +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; @@ -25,6 +31,7 @@ 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; @@ -32,17 +39,15 @@ 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.dlvinfo.service.DlvinfoService; -import kcc.kccadr.adjPgrMgr.dlvinfo.service.DlvinfoVO; +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.adjRppl.service.AdjRpplService; -import kcc.kccadr.adjRppl.service.AdjRpplVO; 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; @@ -71,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; @@ -97,12 +105,6 @@ public class AdjstReqStatusController { @Resource(name = "ExmpAppManageService") private ExmpAppManageService exmpAppManageService; - @Resource(name = "dlvinfoService") - private DlvinfoService dlvinfoService; - - @Resource(name = "adjRpplService") - private AdjRpplService adjRpplService; - @Resource(name = "pgrCmmService") private PgrCmmService cmmService; @@ -243,9 +245,7 @@ public class AdjstReqStatusController { public String adjstReqStatusTabDetail( @ModelAttribute("adjstReqStatusVO") AdjstReqStatusVO adjstReqStatusVO , @ModelAttribute("adjstIncidentVO") AdjstIncidentVO adjstIncidentVO - , ModelMap model - , HttpServletRequest request - , HttpServletResponse response) throws Exception { + , ModelMap model) throws Exception { // 조정신청 관련인 조회 List list = adjstReqStatusService.selectAdjstReqRpplInfo(adjstReqStatusVO); @@ -303,29 +303,6 @@ public class AdjstReqStatusController { model.addAttribute("list_mgr" , adrHstryMgrService.selectList(adrHstryMgrVO)); //이력값 - 끝 - /* - * 송달정보조회 - * select - * */ - DlvinfoVO dlvinfoVO = new DlvinfoVO(); - dlvinfoVO.setAdrSeq(adjstReqStatusVO.getAdrSeq()); - - //로그인한 사용자 이름으로 등록된 송달 리스트 조회 - LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated() ? (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser() : null; - String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId()); - String rpplNm = ""; - if(!"".equals(userId)) { - AdjRpplVO adjRpplVO = new AdjRpplVO(); - adjRpplVO.setAdrSeq(adjstReqStatusVO.getAdrSeq()); - adjRpplVO.setRpplId(userId); - adjRpplVO = adjRpplService.selectAdjRpplInfo(adjRpplVO); - rpplNm = egovCryptoUtil.decrypt(adjRpplVO.getRpplNm()); - dlvinfoVO.setRpplNm(rpplNm); - } - - List dlvinfoList = dlvinfoService.selectAdjustDlvryList(dlvinfoVO); - - model.addAttribute("dlvinfoList", dlvinfoList); return "/web/kccadr/accdnt/ars/tab/adjstReqStatusTabDetail"; } @@ -432,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(); @@ -475,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)){ @@ -622,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/adjCourtCnctn/service/AdjCourtCnctnService.java b/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnService.java index 510ef7b2..078fb1c8 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnService.java +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnService.java @@ -1,8 +1,21 @@ package kcc.kccadr.adjCourtCnctn.service; +import java.util.List; + +import kcc.kccadr.adjReqMgrOff.service.AdjReqMgrOffLineVO; import kcc.kccadr.cmm.RestResponse; public interface AdjCourtCnctnService { RestResponse insertCourtCnctn(AdjCourtCnctnVO adjCourtCnctnVO); + + int adjCourtCnctnListCount(AdjCourtCnctnVO adjCourtCnctnVO); + + List adjCourtCnctnList(AdjCourtCnctnVO adjCourtCnctnVO); + + AdjCourtCnctnVO findByid(AdjCourtCnctnVO adjCourtCnctnVO); + + RestResponse updateCourtCnctn(AdjCourtCnctnVO adjCourtCnctnVO); + + void updateUseYn(AdjCourtCnctnVO adjCourtCnctnVO); } diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnVO.java b/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnVO.java index 7e595df6..2ac699b4 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnVO.java +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnVO.java @@ -27,6 +27,8 @@ public class AdjCourtCnctnVO extends ComDefaultVO implements Serializable { private String rprtDe = ""; private String rprtMonth = ""; private String processDay = ""; + private String courtFld = ""; + private String accdntCn = ""; private String reqInfo = ""; private String aplcnInfo = ""; private String rspndInfo = ""; @@ -47,6 +49,10 @@ public class AdjCourtCnctnVO extends ComDefaultVO implements Serializable { private String lastUpdusrId = ""; + private String searchCondition2 = ""; + private String diffMonth = ""; + + public String getCourtSeq() { return courtSeq; @@ -120,6 +126,18 @@ public class AdjCourtCnctnVO extends ComDefaultVO implements Serializable { public void setProcessDay(String processDay) { this.processDay = processDay; } + public String getCourtFld() { + return courtFld; + } + public void setCourtFld(String courtFld) { + this.courtFld = courtFld; + } + public String getAccdntCn() { + return accdntCn; + } + public void setAccdntCn(String accdntCn) { + this.accdntCn = accdntCn; + } public String getReqInfo() { return reqInfo; } @@ -228,6 +246,18 @@ public class AdjCourtCnctnVO extends ComDefaultVO implements Serializable { public void setRmrks(String rmrks) { this.rmrks = rmrks; } + public String getSearchCondition2() { + return searchCondition2; + } + public void setSearchCondition2(String searchCondition2) { + this.searchCondition2 = searchCondition2; + } + public String getDiffMonth() { + return diffMonth; + } + public void setDiffMonth(String diffMonth) { + this.diffMonth = diffMonth; + } diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnDAO.java b/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnDAO.java index 798bb02b..522cf68b 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnDAO.java +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnDAO.java @@ -7,6 +7,7 @@ import org.springframework.stereotype.Repository; import egovframework.rte.psl.dataaccess.EgovAbstractDAO; import kcc.kccadr.adjCourtCnctn.service.AdjCourtCnctnVO; import kcc.kccadr.adjReqMgrOff.service.AdjReqMgrOffLineVO; +import kcc.kccadr.adjReqMgrPast.service.AdjReqMgrPastVO; import kcc.kccadr.cmm.RestResponse; @Repository("AdjCourtCnctnDAO") @@ -16,4 +17,25 @@ public class AdjCourtCnctnDAO extends EgovAbstractDAO { insert("adjCourtCnctnDAO.insertCourtCnctn", adjCourtCnctnVO); } + public int selectAdjCourtCnctnListCount(AdjCourtCnctnVO adjCourtCnctnVO) { + return (int) select("adjCourtCnctnDAO.adjCourtCnctnListCount", adjCourtCnctnVO); + } + + public List selectAdjCourtCnctnList(AdjCourtCnctnVO adjCourtCnctnVO) { + return (List) list("adjCourtCnctnDAO.adjCourtCnctnList", adjCourtCnctnVO); + } + + public AdjCourtCnctnVO findByid(AdjCourtCnctnVO adjCourtCnctnVO) { + return (AdjCourtCnctnVO) select("adjCourtCnctnDAO.findByid", adjCourtCnctnVO); + } + + public void updateCourtCnctn(AdjCourtCnctnVO adjCourtCnctnVO) { + update("adjCourtCnctnDAO.updateCourtCnctn", adjCourtCnctnVO); + + } + + public void updateUseYn(AdjCourtCnctnVO adjCourtCnctnVO) { + update("adjCourtCnctnDAO.updateUseYn", adjCourtCnctnVO); + } + } diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnServiceImpl.java b/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnServiceImpl.java index eee3121f..6c3f856c 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnServiceImpl.java @@ -6,12 +6,14 @@ import java.util.List; import javax.annotation.Resource; +import org.apache.commons.lang3.StringUtils; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl; import egovframework.rte.fdl.idgnr.EgovIdGnrService; import kcc.com.cmm.service.CmmnDetailCode; +import kcc.com.cmm.util.DateUtil; import kcc.com.utl.user.service.CheckAdrProcessUtil; import kcc.kccadr.adjCourtCnctn.service.AdjCourtCnctnService; import kcc.kccadr.adjCourtCnctn.service.AdjCourtCnctnVO; @@ -48,6 +50,47 @@ public class AdjCourtCnctnServiceImpl extends EgovAbstractServiceImpl implements } return new RestResponse(HttpStatus.OK, "등록 되었습니다.", LocalDateTime.now()); } + + @Override + public int adjCourtCnctnListCount(AdjCourtCnctnVO adjCourtCnctnVO) { + + if(StringUtils.isNotEmpty(adjCourtCnctnVO.getSearchMonth2()) + && adjCourtCnctnVO.getSearchMonth2() != "99") + adjCourtCnctnVO.setDiffMonth(DateUtil.setDiffMonth(adjCourtCnctnVO.getSearchMonth2())); + + + return adjCourtCnctnDAO.selectAdjCourtCnctnListCount(adjCourtCnctnVO); + } + + @Override + public List adjCourtCnctnList(AdjCourtCnctnVO adjCourtCnctnVO) { + + if(StringUtils.isNotEmpty(adjCourtCnctnVO.getSearchMonth2()) + && adjCourtCnctnVO.getSearchMonth2() != "99") + adjCourtCnctnVO.setDiffMonth(DateUtil.setDiffMonth(adjCourtCnctnVO.getSearchMonth2())); + + return adjCourtCnctnDAO.selectAdjCourtCnctnList(adjCourtCnctnVO); + } + + @Override + public AdjCourtCnctnVO findByid(AdjCourtCnctnVO adjCourtCnctnVO) { + return adjCourtCnctnDAO.findByid(adjCourtCnctnVO); + } + + @Override + public RestResponse updateCourtCnctn(AdjCourtCnctnVO adjCourtCnctnVO) { + try { + adjCourtCnctnDAO.updateCourtCnctn(adjCourtCnctnVO); + } catch (Exception e) { + return new RestResponse(HttpStatus.BAD_REQUEST, "수정에 실패하였습니다.", LocalDateTime.now()); + } + return new RestResponse(HttpStatus.OK, "수정 되었습니다.", LocalDateTime.now()); + } + + @Override + public void updateUseYn(AdjCourtCnctnVO adjCourtCnctnVO) { + adjCourtCnctnDAO.updateUseYn(adjCourtCnctnVO); + } diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java b/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java index 77c485f4..20282a61 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.List; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; @@ -21,6 +22,20 @@ import kcc.kccadr.adjReqMgrOff.service.AdjReqMgrOffLineVO; import kcc.kccadr.adjReqMgrPast.service.AdjReqMgrPastVO; import kcc.kccadr.cmm.RestResponse; +/** + * + * @author : 이호영 + * @fileName : AdjCourtCnctnController.java + * @date : 2022.10.28 + * @description : 법원연계 + * =========================================================== + * DATE AUTHOR NOTE + * ----------------------------------------------------------- * + * 2022.10.28 이호영 최초 생성 + * + * + * + */ @Controller public class AdjCourtCnctnController { @@ -29,20 +44,19 @@ public class AdjCourtCnctnController { private AdjCourtCnctnService adjCourtCnctnService; @RequestMapping("/kccadr/adjCourtCnctn/adjCourtCnctnList.do") - public String adjReqMgrOffList(@ModelAttribute("adjCourtCnctnVO") AdjCourtCnctnVO adjCourtCnctnVO, ModelMap model) throws Exception { + public String adjCourtCnctnList(@ModelAttribute("adjCourtCnctnVO") AdjCourtCnctnVO adjCourtCnctnVO, ModelMap model) throws Exception { if(adjCourtCnctnVO.getPageUnit() != 10) { adjCourtCnctnVO.setPageUnit(adjCourtCnctnVO.getPageUnit()); } -// if("".equals(adjReqMgrOffLineVO.getSearchSortCnd())){ -// adjReqMgrOffLineVO.setSearchSortCnd("RS.ADR_SEQ"); -// adjReqMgrOffLineVO.setSearchSortOrd("desc"); -// } -// if(("3".equals(adjReqMgrOffLineVO.getSearchCondition()) || "4".equals(adjReqMgrOffLineVO.getSearchCondition())) && StringUtils.isNotBlank(adjReqMgrOffLineVO.getSearchKeyword())){ -// adjReqMgrOffLineVO.setSearchKeyword(egovCryptoUtil.encrypt(adjReqMgrOffLineVO.getSearchKeyword())); -// } + if("".equals(adjCourtCnctnVO.getSearchSortCnd())){ + adjCourtCnctnVO.setSearchSortCnd("COURT_SEQ"); + adjCourtCnctnVO.setSearchSortOrd("desc"); + } + System.out.println("searchMonth2 :: "+ adjCourtCnctnVO.getSearchMonth2()); + /** paging */ PaginationInfo paginationInfo = new PaginationInfo(); paginationInfo.setCurrentPageNo(adjCourtCnctnVO.getPageIndex()); @@ -52,31 +66,64 @@ public class AdjCourtCnctnController { adjCourtCnctnVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); adjCourtCnctnVO.setLastIndex(paginationInfo.getLastRecordIndex()); adjCourtCnctnVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); -// paginationInfo.setTotalRecordCount(adjReqMgrOffLineService.adjReqMgrOffListCount(adjReqMgrOffLineVO)); + paginationInfo.setTotalRecordCount(adjCourtCnctnService.adjCourtCnctnListCount(adjCourtCnctnVO)); model.addAttribute("paginationInfo", paginationInfo); -// List list = adjReqMgrOffLineService.adjReqMgrOffList(adjReqMgrOffLineVO); - List list = new ArrayList<>(); + List list = adjCourtCnctnService.adjCourtCnctnList(adjCourtCnctnVO); // 복호화 model.addAttribute("list", list); return "kccadr/adjCourtCnctn/adjCourtCnctnList"; } + + + @RequestMapping("/kccadr/adjCourtCnctn/updateUseYn.do") + public String updateUseYn(@ModelAttribute("adjCourtCnctnVO") AdjCourtCnctnVO adjCourtCnctnVO, HttpServletRequest request, ModelMap model) throws Exception { + + adjCourtCnctnService.updateUseYn(adjCourtCnctnVO); + + return "redirect:" + request.getContextPath() + "/kccadr/adjCourtCnctn/adjCourtCnctnList.do"; + } + + + @RequestMapping("/kccadr/adjCourtCnctn/adjCourtCnctnDetail.do") + public String adjCourtCnctnDetail(@ModelAttribute("adjCourtCnctnVO") AdjCourtCnctnVO CourtVO, ModelMap model) throws Exception { + + AdjCourtCnctnVO adjCourtCnctnVO = adjCourtCnctnService.findByid(CourtVO); + model.addAttribute("courtVO", adjCourtCnctnVO); + return "kccadr/adjCourtCnctn/adjCourtCnctnDetail"; + } + + @RequestMapping("/kccadr/adjCourtCnctn/adjCourtCnctnModify.do") + public String adjCourtCnctnModify(@ModelAttribute("adjCourtCnctnVO") AdjCourtCnctnVO CourtVO, ModelMap model) throws Exception { + + AdjCourtCnctnVO adjCourtCnctnVO = adjCourtCnctnService.findByid(CourtVO); + model.addAttribute("courtVO", adjCourtCnctnVO); + return "kccadr/adjCourtCnctn/adjCourtCnctnModify"; + } @RequestMapping("/kccadr/adjCourtCnctn/adjCourtCnctnRegist.do") public String adjCourtCnctnRegist(@ModelAttribute("adjCourtCnctnVO") AdjCourtCnctnVO adjCourtCnctnVO, ModelMap model) throws Exception { AdjReqMgrPastVO adjReqMgrPastVO = new AdjReqMgrPastVO(); - model.addAttribute("mainVO", adjReqMgrPastVO); + model.addAttribute("courtVO", adjReqMgrPastVO); return "kccadr/adjCourtCnctn/adjCourtCnctnRegist"; } @RequestMapping("/kccadr/adjCourtCnctn/adjCourtCnctnRegistAjax.do") - public ResponseEntity insertExmpAppManager(@ModelAttribute("adjCourtCnctnVO") AdjCourtCnctnVO adjCourtCnctnVO) throws Exception { + public ResponseEntity adjCourtCnctnRegistAjax(@ModelAttribute("adjCourtCnctnVO") AdjCourtCnctnVO adjCourtCnctnVO) throws Exception { LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser(); adjCourtCnctnVO.setFrstRegisterId(loginVO.getUniqId()); return ResponseEntity.ok().body(adjCourtCnctnService.insertCourtCnctn(adjCourtCnctnVO)); } + @RequestMapping("/kccadr/adjCourtCnctn/adjCourtCnctnUpdateAjax.do") + public ResponseEntity adjCourtCnctnUpdateAjax(@ModelAttribute("adjCourtCnctnVO") AdjCourtCnctnVO adjCourtCnctnVO) throws Exception { + + LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser(); + adjCourtCnctnVO.setLastUpdusrId(loginVO.getUniqId()); + return ResponseEntity.ok().body(adjCourtCnctnService.updateCourtCnctn(adjCourtCnctnVO)); + } + } 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 f8140501..51f80855 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java @@ -24,6 +24,7 @@ import org.springframework.stereotype.Service; import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl; import egovframework.rte.fdl.cmmn.exception.FdlException; import egovframework.rte.fdl.idgnr.EgovIdGnrService; +import kcc.com.cmm.util.DateUtil; import kcc.com.cmm.util.StringUtil; import kcc.com.utl.user.service.CheckAdrProcessUtil; import kcc.kccadr.accdnt.adr.service.AdjstDeputyReqVO; @@ -915,7 +916,7 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements // if(StringUtils.isNotEmpty(adjReqMgrPastVO.getSearchYear()) && adjReqMgrPastVO.getSearchYear() != "99") - adjReqMgrPastVO.setDiffYear(this.setDiffYear(adjReqMgrPastVO.getSearchYear())); + adjReqMgrPastVO.setDiffYear(DateUtil.setDiffYear(adjReqMgrPastVO.getSearchYear())); List adjReqMgrPastList = adjReqMgrPastDAO.selectAdjReqMgrPastList(adjReqMgrPastVO); @@ -981,21 +982,11 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements public int selectAdjReqMgrPastListCount(AdjReqMgrPastVO adjReqMgrPastVO) { if(StringUtils.isNotEmpty(adjReqMgrPastVO.getSearchYear()) && adjReqMgrPastVO.getSearchYear() != "99") - adjReqMgrPastVO.setDiffYear(this.setDiffYear(adjReqMgrPastVO.getSearchYear())); + adjReqMgrPastVO.setDiffYear(DateUtil.setDiffYear(adjReqMgrPastVO.getSearchYear())); return adjReqMgrPastDAO.selectAdjReqMgrPastListCount(adjReqMgrPastVO); } - public String setDiffYear(String searchYear) { - int yearChar = Integer.parseInt(searchYear); - Calendar cal = Calendar.getInstance(); - cal.setTime(new Date()); - DateFormat df = new SimpleDateFormat("yyyy-MM-dd"); - - cal.add(Calendar.YEAR, -yearChar); - - return df.format(cal.getTime()); - } @Override diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java index f596f408..265587e2 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java @@ -240,7 +240,7 @@ public class AdjReqMgrPastController { * @return * @throws Exception */ - @RequestMapping("/kccadr/adjReqMgOff/adjReqMgrPastProgRegist.do") + @RequestMapping("/kccadr/adjReqMgOff/popup/adjReqMgrPastProgRegist.do") public String adjReqMgrPastProgRegist(@ModelAttribute("adjReqMgrPastVO") AdjReqMgrPastVO adjReqMgrPastVO, ModelMap model) throws Exception { //TODO 테스트로 인한 seq 코딩 @@ -273,7 +273,7 @@ public class AdjReqMgrPastController { * @return * @throws Exception */ - @RequestMapping("/kccadr/adjReqMgOff/adjReqMgrPastFileRegist.do") + @RequestMapping("/kccadr/adjReqMgOff/popup/adjReqMgrPastFileRegist.do") public String adjReqMgrPastFileRegist(@ModelAttribute("adjReqMgrPastVO") AdjReqMgrPastVO adjReqMgrPastVO, ModelMap model) throws Exception { logger.info(" ++ [{}]", adjReqMgrPastVO.getAdrSeq()); @@ -387,7 +387,7 @@ public class AdjReqMgrPastController { * @return * @throws Exception */ - @RequestMapping("/kccadr/adjReqMgOff/adjReqMgrPastRecordRegist.do") + @RequestMapping("/kccadr/adjReqMgOff/popup/adjReqMgrPastRecordRegist.do") public String adjReqMgrPastRecordRegist(@ModelAttribute("adjReqMgrPastVO") AdjReqMgrPastVO adjReqMgrPastVO, ModelMap model) throws Exception { diff --git a/src/main/resources/egovframework/spring/com/context-idgen.xml b/src/main/resources/egovframework/spring/com/context-idgen.xml index 15b9f1fd..f05e768d 100644 --- a/src/main/resources/egovframework/spring/com/context-idgen.xml +++ b/src/main/resources/egovframework/spring/com/context-idgen.xml @@ -2871,12 +2871,12 @@ - + - + diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjCourtCnctn/AdjCourtCnctn_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjCourtCnctn/AdjCourtCnctn_SQL_Mysql.xml index a93e0516..9171c698 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjCourtCnctn/AdjCourtCnctn_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjCourtCnctn/AdjCourtCnctn_SQL_Mysql.xml @@ -5,7 +5,179 @@ - + + + + + + + + + INSERT INTO ADJ_COURT_CNCTN_MGR ( COURT_SEQ @@ -20,6 +192,8 @@ , RPRT_DE , RPRT_MONTH , PROCESS_DAY + , COURT_FLD + , ACCDNT_CN , APLCN_INFO , RSPND_INFO , APLCN_DPTY @@ -48,6 +222,8 @@ ,TO_DATETIME(TO_CHAR(#rprtDe#,'YYYY-MM-DD')) , #rprtMonth# , #processDay# + , #courtFld# + , #accdntCn# , #aplcnInfo# , #rspndInfo# , #aplcnDpty# @@ -60,11 +236,52 @@ , #pymntDay# , #extns# , #rmrks# - , #useYn# + , 'Y' ,NOW() - ,TO_DATETIME(TO_CHAR(#frstRegisterId#,'YYYY-MM-DD')) + ,#frstRegisterId# ) + + + UPDATE ADJ_COURT_CNCTN_MGR SET + COURT_NUM = #courtNum# + , COURT_ORG_NO = #courtOrgNo# + , COURT_NO = #courtNo# + , DCSN_DE = TO_DATETIME(TO_CHAR(#dcsnDe#,'YYYY-MM-DD')) + , RCV_DE = TO_DATETIME(TO_CHAR(#rcvDe#,'YYYY-MM-DD')) + , ALCTN_DE = TO_DATETIME(TO_CHAR(#alctnDe#,'YYYY-MM-DD')) + , ALCTN_MONTH = #alctnMonth# + , OFFICE_WORK_DE = TO_DATETIME(TO_CHAR(#officeWorkDe#,'YYYY-MM-DD')) + , RPRT_DE = TO_DATETIME(TO_CHAR(#rprtDe#,'YYYY-MM-DD')) + , RPRT_MONTH = #rprtMonth# + , PROCESS_DAY = #processDay# + , COURT_FLD = #courtFld# + , ACCDNT_CN = #accdntCn# + , APLCN_INFO = #aplcnInfo# + , RSPND_INFO = #rspndInfo# + , APLCN_DPTY = #aplcnDpty# + , RSPND_DPTY = #rspndDpty# + , COURT_RSLT = #courtRslt# + , COURT_DETAIL_RSLT = #courtDetailRslt# + , ADJ_CMSNR = #adjCmsnr# + , PAY = #pay# + , APP_DE = #appDe# + , PYMNT_DAY = #pymntDay# + , EXTNS = #extns# + , RMRKS = #rmrks# + , LAST_UPDT_PNTTM = NOW() + , LAST_UPDUSR_ID = #frstRegisterId# + where + COURT_SEQ = #courtSeq# + + + + UPDATE ADJ_COURT_CNCTN_MGR SET + USE_YN = #useYn# + where + COURT_SEQ = #courtSeq# + + 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 7a8f77e7..5e0c946c 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 @@ -951,19 +951,19 @@ /*날짜 검색 - 1년 전까지*/ - + TO_CHAR(amm.FRST_REGIST_PNTTM,'YYYYMMDD') = ]]> REPLACE(#diffYear#, '-' , '') /*날짜 검색 - 3년 전까지*/ - + TO_CHAR(amm.FRST_REGIST_PNTTM,'YYYYMMDD') = ]]> REPLACE(#diffYear#, '-' , '') /*날짜 검색 - 6년 전까지*/ - + TO_CHAR(amm.FRST_REGIST_PNTTM,'YYYYMMDD') = ]]> REPLACE(#diffYear#, '-' , '') diff --git a/src/main/resources/rebel.xml b/src/main/resources/rebel.xml index 0e85c739..fd1249fe 100644 --- a/src/main/resources/rebel.xml +++ b/src/main/resources/rebel.xml @@ -23,4 +23,4 @@ - + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnDetail.jsp new file mode 100644 index 00000000..5dc53d07 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnDetail.jsp @@ -0,0 +1,242 @@ +<%@ 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="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> +<%@ taglib prefix="double-submit" uri="http://www.egovframe.go.kr/tags/double-submit/jsp" %> +<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> + + + + +법원연계조정관리 - 상세 + + + + + + + +
+ + + " /> + " /> + " /> +
+
+ " /> +
+ +
+
+ +
+

법원연계조정상세

+
    +
    • +
  • +

    법원연계조정관리

    +
    • +
  • +

    법원연계조정목록

    +
    • +
  • 법원연계조정상세
    • +
+
+ + + +
+
+ +
+

조정 사건

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
번호 + +
결정일자 + + 수령일자 + +
배당일자 + + 배당월 + +
사무처리기한 + +
보고일자 + + 보고월 + +
소요일 + +
본 사건번호 + + 조정 사건번호 + +
분야 + +
신청인 정보 + +
피신청인 정보 + +
원고/
신청인(대리인)		 + +
피고/
피신청인(대리인)		 + +
사건내용 + +
결과 + +
세부결과 + +
조정위원 + + 수당금액 + +
대면기일 + +
지급일자 + + 1차연장 + +
비고 + +
+
+ +
+
+
+ + +
+
+
+
+
+
+ + + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnList.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnList.jsp index 48710947..8ebba264 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnList.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnList.jsp @@ -28,6 +28,16 @@ $(document).ready(function(){ } }); + + $('.delBtn').click(function(){ + console.log($(this).data('info')); + var thisVal = $(this).data('info'); + + $('#delCourtSeq').val(thisVal); + $('#delForm').submit(); + }); + + }); function fncGoList(){ @@ -37,21 +47,21 @@ function fncGoList(){ function linkPage(pageNo){ var listForm = document.listForm ; listForm.pageIndex.value = pageNo ; - listForm.action = ""; + listForm.action = ""; listForm.submit(); } function fn_Create(){ var goForm = document.goForm; - goForm.adrSeq.value = ""; goForm.submit(); } -function fn_goDetail(adrSeq){ +function fn_goDetail(courtSeq){ var goForm = document.goForm; - goForm.adrSeq.value = adrSeq; + goForm.action = ""; + goForm.courtSeq.value = courtSeq; goForm.submit(); } @@ -59,18 +69,18 @@ function fn_goDetail(adrSeq){
- - "/> + + "/>
-

과거사건목록

+

법원연계조정목록

    • -
  • 과거사건 기록 목록
    • +
  • 법원연계조정 목록
@@ -89,62 +99,40 @@ function fn_goDetail(adrSeq){

  • 구분

    - - - - + + - +
  • -

    조정상태

    -
    - - - - - - checked > - - - - checked > - - - - checked > - - - - checked > - - -
    -
    • -
  • -

    신청일자

    +

    결정일자

    - - + + - - + + - - + + - - + + + + + +
    - +
    ~
    - +

    총 건 입니다.

    -
    - - - - - - - -
    - - - + + + + - + + + - - - - - - - - + + + + + + + - ')"> + + + + + + + + + + + - - - - - -<%-- --%> - - - + + + + + + + - - + +
    번호조정번호신청인피신청인조사관조정부저작물종류조정결과작성여부조정 사건번호분야결과사건번호조정위원결정일자삭제
    - - - - - - - ')" title="상세페이지로 이동"> - - - - - - - - - - - - - 작성중 - - - 작성완료 - - + + + + + + ')">"/>
    @@ -271,7 +238,11 @@ function fn_goDetail(adrSeq){
    " method="post"> - + +
    +
    " method="post"> + +
    \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnModify.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnModify.jsp new file mode 100644 index 00000000..9ec66f83 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnModify.jsp @@ -0,0 +1,358 @@ +<%@ 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="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> +<%@ taglib prefix="double-submit" uri="http://www.egovframe.go.kr/tags/double-submit/jsp" %> +<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> + + + + +법원연계조정관리 - 수정 + + + + + + +
    + + + " /> + " /> + " /> +
    + +
    +
    + +
    +

    법원연계조정수정

    +
      +
      • +
    • +

      법원연계조정관리

      +
      • +
    • +

      법원연계조정목록

      +
      • +
    • 법원연계조정수정
      • +
    +
    + + + +
    + "> +
    + +
    +

    조정 사건

    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    번호 +

    + "/> +

    +
    결정일자 +
    + " data-datecontrol="true"> +
    + + +
    +
    +     		수령일자 +
    + " data-datecontrol="true"> +
    + + +
    +
    +
    배당일자 +
    + " data-datecontrol="true" onchange="test(this);"> +
    + + +
    +
    +     		배당월 + +
    사무처리기한 +
    + " data-datecontrol="true"> +
    + + +
    +
    +
    보고일자 +
    + " data-datecontrol="true"> +
    + + +
    +
    +     		보고월 + + +<%-- --%> +<%-- --%> +<%-- --%> + + " placeholder="보고일자 선택" /> +
    소요일 + " placeholder=""/> +
    본 사건번호 + " /> + 조정 사건번호 + " /> +
    분야 + " /> +
    신청인 정보 + +
    피신청인 정보 + +
    원고/
    신청인(대리인)    		 + +
    피고/
    피신청인(대리인)    		 + +
    사건내용 + +
    결과 + "/> +
    세부결과 + +
    조정위원 + " /> + 수당금액 + " /> +
    대면기일 + " size="98" /> +
    지급일자 + " /> + 1차연장 + " /> +
    비고 + +
    +
    + +
    +
    +
    + + +
    +
    +
    +
    +
    +
    + + + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnRegist.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnRegist.jsp index b6fec8d3..7a573213 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnRegist.jsp @@ -15,20 +15,42 @@ 조정종결상세 -사건진행정보 +기일조서관리 @@ -183,11 +183,12 @@ function fn_goListPage(){
    - +
    - - + + +
    diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastRecordRegist.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastRecordRegist.jsp index 3e9b355f..44e52eda 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastRecordRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastRecordRegist.jsp @@ -220,7 +220,8 @@ $(document).on('click','#regBtn', function(){ console.log('data : ', data); if(data.status == 'OK'){ alert(data.data); - fn_goListPage(); + window.close(); +// fn_goListPage(); // $('#adrSeq').val(data.dataSub); // $('#nextGoPageForm').submit(); } @@ -401,11 +402,11 @@ function fn_goListPage(){
    - +
    - - + +
    diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ai/adjstIncidentEndList.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ai/adjstIncidentEndList.jsp index 55a3cfad..a7203db2 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ai/adjstIncidentEndList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ai/adjstIncidentEndList.jsp @@ -30,13 +30,7 @@ +
    + + + +
    " /> @@ -123,13 +106,6 @@
    - - -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> -
    - ~ + ~
    -
    @@ -190,9 +155,7 @@ -<%-- --%> -<%-- --%> @@ -204,9 +167,7 @@ 피신청인<%----%> 신청내용<%----%> 조정부<%----%> -<%-- 기일 --%> 진행차수<%----%> -<%-- 조정상태 --%> 열람신청 @@ -229,49 +190,6 @@ 조정번호

    -<%-- --%> - -<%-- --%> -<%-- 종결상세 --%> - - -<%-- --%> - - - -<%-- --%> - - - - -<%-- --%> - - - - - -<%-- --%> -<%-- --%> - - -<%-- --%> - - - -<%-- --%> - - - - -<%-- --%> - - - - - -<%-- --%> - -<%-- --%> 신청인 @@ -289,8 +207,6 @@
    -<%-- --%> -<%-- --%> 조정부

    @@ -299,27 +215,9 @@ 기일

    - - -<%--

    ${empty list.adrSn ? '' : '차'}

    --%> - - <%-- - 조정상태 - - - - - - - - -

    -     -     - --%> 열람신청 - + @@ -331,12 +229,6 @@
    - - - - - -
    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 e1e66062..e5cf92e7 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 @@ -19,6 +19,26 @@ <%-- --%>