diff --git a/src/main/java/kcc/com/cmm/util/DateUtil.java b/src/main/java/kcc/com/cmm/util/DateUtil.java index f06c48f0..6a44202f 100644 --- a/src/main/java/kcc/com/cmm/util/DateUtil.java +++ b/src/main/java/kcc/com/cmm/util/DateUtil.java @@ -184,7 +184,7 @@ public final class DateUtil { * //month 일 전 cal.add(Calendar.DATE, -day); * * */ - public String AddDate(String strDate, int year, int month, int day) throws Exception { + public static String AddDate(String strDate, int year, int month, int day) throws Exception { SimpleDateFormat dtFormat = new SimpleDateFormat("yyyy-MM-dd"); Calendar cal = Calendar.getInstance(); Date dt = dtFormat.parse(strDate); cal.setTime(dt); 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 69bfac8f..455d5194 100644 --- a/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java +++ b/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java @@ -35,6 +35,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.DateUtil; import kcc.com.cmm.util.IpUtil; import kcc.com.cmm.util.StringUtil; import kcc.com.utl.fcc.service.EgovStringUtil; @@ -547,9 +548,10 @@ public class AdjstReqStatusController { } // 작성단계 셋팅 - adrRecordReadingVO.setFrstRegisterId(userId); // 최초등록자 + adrRecordReadingVO.setFrstRegisterId(userId); // 최초수정자 + adrRecordReadingVO.setLastUpdusrId(userId); // 최초등록자 adrRecordReadingVO.setPrcsnStatCd(KccadrConstants.ADR_RCD_RDNG_PRCSN_STAT_CD_10); //신청완료 상태 - + try { adrRecordReadingService.insertRecordReading(adrRecordReadingVO); modelAndView.addObject("result", "success"); @@ -561,6 +563,70 @@ public class AdjstReqStatusController { } + // 대국민 조정사건 기록열람 신청 상세 + @RequestMapping(value = "/web/kccadr/payment/accdnt/ai/docIssDetail.do") + public String docIssDetail(@ModelAttribute("adrRecordReadingVO") AdrRecordReadingVO adrRecordReadingVO, + ModelMap model, + HttpServletRequest request, + HttpServletResponse response) throws Exception { + + String auth = EgovUserDetailsHelper.isAuthenticated() ? null : EgovUserDetailsHelper.getAuthenticatedUser().toString(); + LoginVO loginVO = "anonymousUser".equals(auth) ? new LoginVO() : (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser(); + + SsoLoginVO ssoLoginVO = (SsoLoginVO) request.getSession().getAttribute("SSOLoginVO"); + + if (loginVO == null) { + + model.addAttribute("msg", "로그인 해주세요."); + return "redirect:/web/user/login/ssoLogin.do"; + } + AdrRecordReadingVO detailVO = adrRecordReadingService.selectDetail(adrRecordReadingVO); + + // 결제 마감일 계산 + // DateUtil.AddDate 더하고싶은 날짜, 년, 월, 일 + detailVO.setPayEndDay(DateUtil.AddDate(detailVO.getFrstRegistPnttm(), 0, 0, 7)); + model.addAttribute("info", detailVO); + + return "/web/kccadr/accdnt/ars/tab/docIssDetail"; + } + + + + // 대국민 조정사건 기록열람 신청 ajax + @RequestMapping(value = "/web/kccadr/payment/accdnt/ai/docIssPrcsnStatCdModifyAjax.do") + public ModelAndView docIssPrcsnStatCdModifyAjax(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.setLastUpdusrId(userId); // 최초등록자 + + // 기존 mapper 사용하기 위한 생성자 + PayVO payVO = new PayVO(); + payVO.setLastUpdusrId(userId); // 수정자 + payVO.setPrcsnStatCd("90"); + payVO.setAsctnTablePk1(adrRecordReadingVO.getRecordReadingSeq()); + adrRecordReadingService.updatePrcsnStatCd(payVO); + + + modelAndView.addObject("result", "success"); + + return modelAndView; + + } + + // 대국민 조정사건 기록열람 신청 목록 @RequestMapping(value = "/web/kccadr/payment/accdnt/ai/docIssReqList.do") public String docIssReqList(@ModelAttribute("adrRecordReadingVO") AdrRecordReadingVO adrRecordReadingVO, @@ -590,11 +656,6 @@ public class AdjstReqStatusController { adrRecordReadingVO.setSearchSortOrd("desc"); } - // 키워드가 있다면 일단 암호화 하여 암호화 컬럼에 셋 - if(StringUtils.isNotBlank(adrRecordReadingVO.getSearchKeyword())){ - adrRecordReadingVO.setSearchEncKeyword(egovCryptoUtil.encrypt(adrRecordReadingVO.getSearchKeyword())); - } - /** paging */ PaginationInfo paginationInfo = new PaginationInfo(); paginationInfo.setCurrentPageNo(adrRecordReadingVO.getPageIndex()); @@ -606,6 +667,13 @@ public class AdjstReqStatusController { adrRecordReadingVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); List list = adrRecordReadingService.selectDocReqList(adrRecordReadingVO); + + list.stream().forEach(t->{ + AdrRecordReadingVO aVO = adrRecordReadingService.selectStatCdAndStatTxt(t); + t.setStatCd(aVO.getStatCd()); + t.setStatTxt(aVO.getStatTxt()); + }); + paginationInfo.setTotalRecordCount(list.size() > 0 ? list.get(0).getTotCnt() : 0); model.addAttribute("paginationInfo", paginationInfo); @@ -802,6 +870,7 @@ public class AdjstReqStatusController { PayVO payVO = payService.selectPayForPk(pk); if("0000".equals(payVO.getResultcode())) { //3. + payVO.setPrcsnStatCd("20"); adrRecordReadingService.updatePrcsnStatCd(payVO); }else { //fail diff --git a/src/main/java/kcc/kccadr/adjst/service/PayVO.java b/src/main/java/kcc/kccadr/adjst/service/PayVO.java index 84f2441a..3b1ee563 100644 --- a/src/main/java/kcc/kccadr/adjst/service/PayVO.java +++ b/src/main/java/kcc/kccadr/adjst/service/PayVO.java @@ -48,6 +48,9 @@ public class PayVO extends ComDefaultVO implements Serializable { private String lastUpdusrId = "" ; //수정자 private String merchantData = ""; //고객사 임의데이터 + private String prcsnStatCd = ""; //고객사 임의데이터 + + public String getPaySeq() { return paySeq; @@ -271,6 +274,12 @@ public class PayVO extends ComDefaultVO implements Serializable { public void setMerchantData(String merchantData) { this.merchantData = merchantData; } + public String getPrcsnStatCd() { + return prcsnStatCd; + } + public void setPrcsnStatCd(String prcsnStatCd) { + this.prcsnStatCd = prcsnStatCd; + } diff --git a/src/main/java/kcc/kccadr/advcRecord/service/AdrRecordReadingService.java b/src/main/java/kcc/kccadr/advcRecord/service/AdrRecordReadingService.java index 6dd2874f..ddcf9f87 100644 --- a/src/main/java/kcc/kccadr/advcRecord/service/AdrRecordReadingService.java +++ b/src/main/java/kcc/kccadr/advcRecord/service/AdrRecordReadingService.java @@ -40,4 +40,7 @@ public interface AdrRecordReadingService { // 결제완료 처리 int updatePrcsnStatCd(PayVO payVO) throws Exception; + + AdrRecordReadingVO selectStatCdAndStatTxt(AdrRecordReadingVO adrRecordReadingVO); + } diff --git a/src/main/java/kcc/kccadr/advcRecord/service/AdrRecordReadingVO.java b/src/main/java/kcc/kccadr/advcRecord/service/AdrRecordReadingVO.java index ad69b3fa..605921ef 100644 --- a/src/main/java/kcc/kccadr/advcRecord/service/AdrRecordReadingVO.java +++ b/src/main/java/kcc/kccadr/advcRecord/service/AdrRecordReadingVO.java @@ -26,6 +26,13 @@ public class AdrRecordReadingVO extends ComDefaultVO implements Serializable { private String recordReadingHstrySeq; //기록열람이력 일련번호 private String cn; //내용-승인번호, 결재 정보 등등 + private String phone; + + private String post; + private String addr; + private String addrDtl; + + private String searchFrstRegisterId; private String searchDocReqCd; @@ -33,6 +40,17 @@ public class AdrRecordReadingVO extends ComDefaultVO implements Serializable { private String resPonDentNm; private String adrNo; private String appliCantNm; + + private String reqDate; + private String reqHours; + private String reqMinutes; + + private String reqDetails; + + private String payEndDay; // 결제 날짜 + + private String statCd; // + private String statTxt; // @@ -120,6 +138,30 @@ public class AdrRecordReadingVO extends ComDefaultVO implements Serializable { public void setCn(String cn) { this.cn = cn; } + public String getPhone() { + return phone; + } + public void setPhone(String phone) { + this.phone = phone; + } + public String getPost() { + return post; + } + public void setPost(String post) { + this.post = post; + } + public String getAddr() { + return addr; + } + public void setAddr(String addr) { + this.addr = addr; + } + public String getAddrDtl() { + return addrDtl; + } + public void setAddrDtl(String addrDtl) { + this.addrDtl = addrDtl; + } public String getSearchFrstRegisterId() { return searchFrstRegisterId; } @@ -156,4 +198,48 @@ public class AdrRecordReadingVO extends ComDefaultVO implements Serializable { public void setRecordReadingFlag(String recordReadingFlag) { this.recordReadingFlag = recordReadingFlag; } + public String getReqDate() { + return reqDate; + } + public void setReqDate(String reqDate) { + this.reqDate = reqDate; + } + public String getReqHours() { + return reqHours; + } + public void setReqHours(String reqHours) { + this.reqHours = reqHours; + } + public String getReqMinutes() { + return reqMinutes; + } + public void setReqMinutes(String reqMinutes) { + this.reqMinutes = reqMinutes; + } + public String getReqDetails() { + return reqDetails; + } + public void setReqDetails(String reqDetails) { + this.reqDetails = reqDetails; + } + public String getPayEndDay() { + return payEndDay; + } + public void setPayEndDay(String payEndDay) { + this.payEndDay = payEndDay; + } + public String getStatCd() { + return statCd; + } + public void setStatCd(String statCd) { + this.statCd = statCd; + } + public String getStatTxt() { + return statTxt; + } + public void setStatTxt(String statTxt) { + this.statTxt = statTxt; + } + + } 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 cf492d46..c2d54b9a 100644 --- a/src/main/java/kcc/kccadr/advcRecord/service/impl/AdrRecordReadingDAO.java +++ b/src/main/java/kcc/kccadr/advcRecord/service/impl/AdrRecordReadingDAO.java @@ -191,5 +191,10 @@ public class AdrRecordReadingDAO extends EgovAbstractDAO { public int updatePrcsnStatCd(PayVO payVO) throws Exception { return update("adrRecordReadingDAO.updatePrcsnStatCd", payVO); } + + public AdrRecordReadingVO selectStatCdAndStatTxt(AdrRecordReadingVO adrRecordReadingVO) { + return (AdrRecordReadingVO) select("AdrRecordReadingDAO.selectStatCdAndStatTxt", 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 acd1c33e..614db300 100644 --- a/src/main/java/kcc/kccadr/advcRecord/service/impl/AdrRecordReadingServiceImpl.java +++ b/src/main/java/kcc/kccadr/advcRecord/service/impl/AdrRecordReadingServiceImpl.java @@ -111,8 +111,12 @@ public class AdrRecordReadingServiceImpl implements AdrRecordReadingService { String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId()); payVO.setLastUpdusrId(userId); - return adrRecordReadingDAO.updatePrcsnStatCd(payVO); } + @Override + public AdrRecordReadingVO selectStatCdAndStatTxt(AdrRecordReadingVO adrRecordReadingVO) { + return adrRecordReadingDAO.selectStatCdAndStatTxt(adrRecordReadingVO); + } + } diff --git a/src/main/resources/egovframework/sqlmap/kccadr/advcRecord/AdrRecordReading_SQL_Cubrid.xml b/src/main/resources/egovframework/sqlmap/kccadr/advcRecord/AdrRecordReading_SQL_Cubrid.xml index 3a0cf893..840b1138 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/advcRecord/AdrRecordReading_SQL_Cubrid.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/advcRecord/AdrRecordReading_SQL_Cubrid.xml @@ -13,65 +13,82 @@ - record_reading_seq, - adr_seq, - req_ty, - myself_is, - docu_ty, - auth_qntty, - prcsn_stat_cd, - prcsn_pnttm, - frst_regist_pnttm, - frst_register_id, - last_updt_pnttm, - last_updusr_id, - record_reading_flag + record_reading_seq + , adr_seq + , req_ty + , record_reading_flag + , docu_ty + , post + , addr + , addr_dtl + , req_date + , req_hours + , req_minutes + , phone + , req_details + , auth_qntty + , prcsn_stat_cd + , prcsn_pnttm + , frst_regist_pnttm + , frst_register_id + , last_updt_pnttm + , last_updusr_id - a.record_reading_seq AS recordReadingSeq, - a.adr_seq AS adrSeq, - a.req_ty AS reqTy, - a.myself_is AS myselfIs, - a.docu_ty AS docuTy, - a.auth_qntty AS authQntty, - a.prcsn_stat_cd AS prcsnStatCd, - a.prcsn_pnttm AS prcsnPnttm, - /* - a.frst_regist_pnttm AS frstRegistPnttm, - */ - DATE_FORMAT(a.frst_regist_pnttm,'%Y-%m-%d %H:%i:%s') AS frstRegistPnttm, - a.frst_register_id AS frstRegisterId, - /* - a.last_updt_pnttm AS lastUpdtPnttm, - */ - DATE_FORMAT(a.last_updt_pnttm,'%Y-%m-%d %H:%i:%s') AS lastUpdtPnttm, - a.last_updusr_id AS lastUpdusrId, - a.record_reading_flag AS recordReadingFlag + a.record_reading_seq AS recordReadingSeq + , a.adr_seq AS adrSeq + , a.req_ty AS reqTy + , a.record_reading_flag AS recordReadingFlag + , a.myself_is AS myselfIs + , a.docu_ty AS docuTy + , a.post AS post + , a.addr AS addr + , a.addr_dtl AS addrDtl + , a.req_date AS reqDate + , a.req_hours AS reqHours + , a.req_minutes AS reqMinutes + , a.phone AS phone + , a.req_details AS reqDetails + , a.auth_qntty AS authQntty + , a.prcsn_stat_cd AS prcsnStatCd + , DATE_FORMAT(a.frst_regist_pnttm,'%Y-%m-%d %H:%i:%s') AS frstRegistPnttm + , a.frst_register_id AS frstRegisterId + , DATE_FORMAT(a.last_updt_pnttm,'%Y-%m-%d %H:%i:%s') AS lastUpdtPnttm + , a.last_updusr_id AS lastUpdusrId + /* AdrRecordReadingDAO.insertRecordReading */ INSERT INTO ( )VALUES( - #recordReadingSeq#, - #adrSeq#, - #reqTy#, - #myselfIs#, - #docuTy#, - #authQntty#, - #prcsnStatCd#, - #prcsnPnttm#, - NOW(), - #frstRegisterId#, - null, - null, - #recordReadingFlag# + #recordReadingSeq# + , #adrSeq# + , #reqTy# + , #recordReadingFlag# + , #docuTy# + , #post# + , #addr# + , #addrDtl# + , #reqDate# + , #reqHours# + , #reqMinutes# + , #phone# + , #reqDetails# + , #authQntty# + , #prcsnStatCd# + , NOW() + , NOW() + , #frstRegisterId# + , NOW() + , #lastUpdusrId# + ) @@ -79,8 +96,11 @@ + + + --%> +<%-- " /> --%> +<%-- " /> --%> +<%-- " /> --%> + + +
+ + +
+ + + + + +
+
+
+

조정사건 기록 열람 신청 상세

+
+ +
+

기록 열람 신청

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

발급구분

+ 		+

+
+

조정번호

+ 		+

+
+

신청인 구분

+ 		+

+
+

연락처

+ 		+

+
+

주소

+

()

+

예약일시

+ 		+ + + +

+ , : +

+
+

서류종류

+ 		+

+
+

발급부수

+ 		+

+
+

요청내용

+ 		+

+

발급상태

 +

+ + + +
+
+

· 기록발급은 신청인만 가능하며, 대리인은 신청이 불가합니다.

+ +

· 사전에 예고없이 방문하지 않을 경우 자동으로 취소됩니다.

+ +
+
+ + +
+
+
+ + + + + +
+
+ + +
+
+ + + + +<%-- --%> + + +
+
+
+

수수료 납부 금액

+
+
+ + + + + + + + + + + + + + + + + + +
어문저작물 목록 : 신청내용, 금액 등 정보제공
신청 내용금액
부 +

원

+
+ + + + + + + + + + + + +
계좌정보 +

국민은행 60519014678208 예금주 : 홍길동

+
결제금액 +

원(납부기간 : , 13:00까지)

+
+ +
+ +
+
+
+
+ + + + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/docIssReqList.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/docIssReqList.jsp index 96d0a7a9..df21188c 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/docIssReqList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/docIssReqList.jsp @@ -108,10 +108,24 @@ form.submit(); } + + function fn_detail(data){ + + var form = document.detailForm; + form.recordReadingSeq.value = data; + form.action=""; + form.submit(); + + } + +
+ +
+
@@ -207,77 +221,86 @@ + + - + 번호 + 발급구분 신청일자 조정번호 - 신청인 - 피신청인 - 신청서류 - 신청유형 - 처리상태 + 발급종류 + 조정 신청인 + 종결상태 + 발급종류 + 발급상태 - - - - - - - - - - - - 신청일자 -

- - - 조정번호 -

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

- - - - - - 처리상태 -

- - -<%-- --%> -<%-- --%> - - -<%-- --%> - - -<%-- 열람완료 --%> -<%-- 발급완료 --%> - - -

- - + + ')" style=" cursor: pointer;"> + + + + + + + + + + 발급구분 +

+ + + 신청일자 +

+ + + 조정번호 +

+ + + 발급종류 +

+ + + 조정 신청인 + + + + 종결상태 + <%-- () --%> + + + 신청서류 +

+ + + 발급상태 + + <%--

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

--%> + + 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 bb1d92a4..5c762c2c 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 @@ -15,82 +15,102 @@ 조정사건 상세 + + + + + + + + + + <%-- --%> - + " /> " /> " /> - +
@@ -147,11 +167,15 @@
-

조정사건 기록열람 신청

+

조정사건 기록 열람 신청

+
+

기록 열람 신청

+
+
- - -

필수입력 항목*

-

주소

- - - - - -
- - - - + + +

필수입력 항목*

+

주소

+ + + + + +
+ + + + +
+ + + + + +

필수입력 항목*

+

예약일시

+ + +
+
+
+ + + +
+ + : +
- - +
+ +

필수입력 항목*

@@ -269,16 +322,20 @@
- +
+
+

· 기록발급은 신청인만 가능하며, 대리인은 신청이 불가합니다.

+ +
- +