From 156dc6b988cf6d89ebb330dce33dd84b5635e2e4 Mon Sep 17 00:00:00 2001 From: hylee Date: Tue, 31 Oct 2023 12:45:45 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20-=20=EA=B8=B0?= =?UTF-8?q?=EB=A1=9D=EC=97=B4=EB=9E=8C=20=EA=B2=80=EC=83=89=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/AdrRecordReadingVO.java | 53 ++++- .../web/ViewRecordsController.java | 80 +++++++ .../AdrRecordReading_SQL_Cubrid.xml | 13 +- .../jsp/kccadr/viewRecords/applyDetail.jsp | 86 ++++++- .../jsp/kccadr/viewRecords/applyList.jsp | 215 ++++++++++++------ .../kccadr/accdnt/ars/tab/docIssDetail.jsp | 37 ++- 6 files changed, 394 insertions(+), 90 deletions(-) diff --git a/src/main/java/kcc/kccadr/advcRecord/service/AdrRecordReadingVO.java b/src/main/java/kcc/kccadr/advcRecord/service/AdrRecordReadingVO.java index a1001112..47ab05d1 100644 --- a/src/main/java/kcc/kccadr/advcRecord/service/AdrRecordReadingVO.java +++ b/src/main/java/kcc/kccadr/advcRecord/service/AdrRecordReadingVO.java @@ -1,6 +1,7 @@ package kcc.kccadr.advcRecord.service; import java.io.Serializable; +import java.util.List; import kcc.com.cmm.ComDefaultVO; @@ -53,8 +54,22 @@ public class AdrRecordReadingVO extends ComDefaultVO implements Serializable { private String statTxt; // private String mberNm; // - private String expense; // 발급 비용 + + private String expense; // 검색조건 발급종류 + + private List readList; // 검색조건 발급종류 + + private List ckStsList; // 검색조건 발급상태 + private String whereRead; // 검색조건 발급종류 + private String readListAll; // 검색조건 발급종류 + + + private String whereCkSts; // 검색조건 발급상태 + private String ckStsListAll; // 검색조건 발급상태 + + + public String getRecordReadingSeq() { @@ -255,6 +270,42 @@ public class AdrRecordReadingVO extends ComDefaultVO implements Serializable { public void setExpense(String expense) { this.expense = expense; } + public List getReadList() { + return readList; + } + public void setReadList(List readList) { + this.readList = readList; + } + public List getCkStsList() { + return ckStsList; + } + public void setCkStsList(List ckStsList) { + this.ckStsList = ckStsList; + } + public String getWhereRead() { + return whereRead; + } + public void setWhereRead(String whereRead) { + this.whereRead = whereRead; + } + public String getWhereCkSts() { + return whereCkSts; + } + public void setWhereCkSts(String whereCkSts) { + this.whereCkSts = whereCkSts; + } + public String getReadListAll() { + return readListAll; + } + public void setReadListAll(String readListAll) { + this.readListAll = readListAll; + } + public String getCkStsListAll() { + return ckStsListAll; + } + public void setCkStsListAll(String ckStsListAll) { + this.ckStsListAll = ckStsListAll; + } } diff --git a/src/main/java/kcc/kccadr/viewRecords/web/ViewRecordsController.java b/src/main/java/kcc/kccadr/viewRecords/web/ViewRecordsController.java index 5cf51bd3..1831c852 100644 --- a/src/main/java/kcc/kccadr/viewRecords/web/ViewRecordsController.java +++ b/src/main/java/kcc/kccadr/viewRecords/web/ViewRecordsController.java @@ -1,6 +1,7 @@ package kcc.kccadr.viewRecords.web; import java.util.List; +import java.util.stream.Collectors; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; @@ -258,6 +259,41 @@ public class ViewRecordsController { adrRecordReadingVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); adrRecordReadingVO.setFrstRegisterId(user.getId()); + // 발급종류 where + List readList = adrRecordReadingVO.getReadList(); + String whereRead = ""; + if (readList != null && !readList.isEmpty()) + { + + whereRead = readList.stream() + .map(readStat -> "'" + readStat + "'") + .collect(Collectors.joining(", ", " AND a.docu_ty IN (", ")")); + + // 만약 readList가 비어있을 경우에 대한 처리 + if (readList.isEmpty()) { + whereRead = ""; // + } + } + adrRecordReadingVO.setWhereRead(whereRead); + + // 발급상태 where + List ckStsList = adrRecordReadingVO.getCkStsList(); + String whereCkSts = ""; + if (ckStsList != null && !ckStsList.isEmpty()) + { + + whereCkSts = ckStsList.stream() + .map(t -> "'" + t + "'") + .collect(Collectors.joining(", ", " AND a.prcsn_stat_cd IN (", ")")); + + // 만약 readList가 비어있을 경우에 대한 처리 + if (ckStsList.isEmpty()) { + whereCkSts = ""; // + } + } + adrRecordReadingVO.setWhereCkSts(whereCkSts); + + List list = adrRecordReadingService.selectDocReqList(adrRecordReadingVO); list.stream().forEach(t->{ @@ -467,5 +503,49 @@ public class ViewRecordsController { } + @RequestMapping(value = "/kccadr/viewRecords/updatePrcsnStatCdjAjax.do") + public ModelAndView updatePrcsnStatCdjAjax(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(loginVO.getUniqId()); + + try { + + // 기존 mapper 사용하기 위한 생성자 + PayVO payVO = new PayVO(); + payVO.setLastUpdusrId(userId); // 수정자 + payVO.setPrcsnStatCd(adrRecordReadingVO.getPrcsnStatCd()); + payVO.setAsctnTablePk1(adrRecordReadingVO.getRecordReadingSeq()); + adrRecordReadingService.updatePrcsnStatCd(payVO); + + + // history 영역 + adrRecordReadingVO.setFrstRegisterId(userId); + adrRecordReadingVO.setRecordReadingHstrySeq(recordReadingHstryGnrService.getNextStringId()); + adrRecordReadingService.insertRecordReadingHist(adrRecordReadingVO); + + + modelAndView.addObject("result", "success"); + } catch(Exception e) { + modelAndView.addObject("result", "fail"); + } + + + return modelAndView; + + } + } 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 12f981de..edf89cc8 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 @@ -97,14 +97,19 @@ @@ -217,6 +222,12 @@ on a.frst_register_id = lm.mber_id WHERE 1=1 + + $whereRead$ + + + $whereCkSts$ + c.ADR_NO LIKE CONCAT('%' , #searchKeyword#, '%') diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/viewRecords/applyDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/viewRecords/applyDetail.jsp index 662c62d0..d7500d0f 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/viewRecords/applyDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/viewRecords/applyDetail.jsp @@ -53,18 +53,57 @@ function rejPopOpen(){ openPopupAndSubmitForm('payPopup', 'popupForm', 500, 380); } -/* - * - popOpen('/kccadrPb/adm/popup_fee03.html','수수료 등록', '380','300') - openPopupAndSubmitForm(p_name, p_formId, p_width, p_height) + + + +function fn_prcsnStatCdAjax(data){ + + + var form = document.cdUpdateForm ; + form.prcsnStatCd.value=data; + + if (!confirm("승인 처리 하시겠습니까?")) return; + + var data = new FormData(form); + + $.ajax({ + type : "POST", + url : "/kccadr/viewRecords/updatePrcsnStatCdjAjax.do", + data : data, + dataType : 'json', + async : false, + processData : false, + contentType : false, + cache : false, + success : function(returnData, status) { + if (returnData.result == 'success') { + alert("완료되었습니다."); + location.reload(); + } else { + alert("오류가 발생하였습니다."); + } + + }, + error : function(e) { + alert("오류가 발생하였습니다."); + console.log("ERROR : ", e); + } + }); + + +} + - */ +
+ + +
@@ -149,9 +188,9 @@ function rejPopOpen(){ - +

- , : + , :

@@ -191,24 +230,49 @@ function rejPopOpen(){ 발급비용

+ + + + + +

반려사유

+ + +

+ + + + + + +

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

- - + + - + + - + + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/viewRecords/applyList.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/viewRecords/applyList.jsp index 9b7eaf1d..661901ee 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/viewRecords/applyList.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/viewRecords/applyList.jsp @@ -17,10 +17,77 @@ @@ -40,6 +120,7 @@ " /> " /> " /> + @@ -70,98 +151,84 @@
  • -

    구분

    - - <%-- --%> - - -
    • -
  • - -

    조정상태

    +<%-- --%> +

    발급종류

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

    발급상태

    + +
    + + - "> - + + - "> - + + - "> - + + - "> - - - - - - + + - - + + - "> - + +
    • - <%--
  • style="display:none;"> --%> -
  • -

    조정조사관 조회

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

  • 신청일자

    - - - - - - - - - - - - - - - - + + + +
    @@ -169,17 +236,17 @@ -
    - ~ +
    ~
+
@@ -285,7 +352,7 @@ - + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/docIssDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/docIssDetail.jsp index fb6ebb16..fe9cbe07 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/docIssDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/docIssDetail.jsp @@ -298,9 +298,15 @@

발급상태

- + + - + + + + + + @@ -319,7 +325,7 @@
- +
@@ -385,6 +391,31 @@
+ +
+
+
+

반려사유

+
+
+ + + + + + + +
반려사유 + +
+
+ +
+
+
+
+