From 46a2800bdd0df5ba31bcfda660a409970cdc73e3 Mon Sep 17 00:00:00 2001 From: hylee Date: Fri, 28 Oct 2022 12:54:16 +0900 Subject: [PATCH 1/9] =?UTF-8?q?feat:=EB=B2=95=EC=9B=90=EC=97=B0=EA=B3=84?= =?UTF-8?q?=20-=20=EB=AA=A9=EB=A1=9D=20(=ED=8E=98=EC=9D=B4=EC=A7=80)=20/?= =?UTF-8?q?=20=EB=93=B1=EB=A1=9D=20(=ED=8E=98=EC=9D=B4=EC=A7=80,=20?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5)=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/AdjCourtCnctnVO.java | 7 ++ .../web/AdjCourtCnctnController.java | 14 ++++ .../spring/com/context-idgen.xml | 4 +- .../adjCourtCnctn/AdjCourtCnctn_SQL_Mysql.xml | 4 +- .../adjCourtCnctn/adjCourtCnctnList.jsp | 4 +- .../adjCourtCnctn/adjCourtCnctnRegist.jsp | 70 +++++++++---------- 6 files changed, 61 insertions(+), 42 deletions(-) diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnVO.java b/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnVO.java index 7e595df6..cff9ad34 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnVO.java +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnVO.java @@ -27,6 +27,7 @@ public class AdjCourtCnctnVO extends ComDefaultVO implements Serializable { private String rprtDe = ""; private String rprtMonth = ""; private String processDay = ""; + private String courtFld = ""; private String reqInfo = ""; private String aplcnInfo = ""; private String rspndInfo = ""; @@ -120,6 +121,12 @@ 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 getReqInfo() { return reqInfo; } diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java b/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java index 77c485f4..59ff4008 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java @@ -21,6 +21,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 { diff --git a/src/main/resources/egovframework/spring/com/context-idgen.xml b/src/main/resources/egovframework/spring/com/context-idgen.xml index 15b9f1fd..09d28f6a 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..001fba0f 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 @@ -20,6 +20,7 @@ , RPRT_DE , RPRT_MONTH , PROCESS_DAY + , COURT_FLD , APLCN_INFO , RSPND_INFO , APLCN_DPTY @@ -48,6 +49,7 @@ ,TO_DATETIME(TO_CHAR(#rprtDe#,'YYYY-MM-DD')) , #rprtMonth# , #processDay# + , #courtFld# , #aplcnInfo# , #rspndInfo# , #aplcnDpty# @@ -62,7 +64,7 @@ , #rmrks# , #useYn# ,NOW() - ,TO_DATETIME(TO_CHAR(#frstRegisterId#,'YYYY-MM-DD')) + ,#frstRegisterId# ) 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..9b043fbe 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnList.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnList.jsp @@ -64,13 +64,13 @@ function fn_goDetail(adrSeq){
-

과거사건목록

+

법원연계조정목록

    • -
  • 과거사건 기록 목록
    • +
  • 법원연계조정 목록
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..950c542a 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,16 @@ 조정종결상세 + + + + + + +
+ + + " /> + " /> + " /> +
+
+ " /> +
+ +
+
+ +
+

법원연계조정상세

+
    +
    • +
  • +

    법원연계조정관리

    +
    • +
  • +

    법원연계조정목록

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

조정 사건

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
번호 + +
결정일자 + + 수령일자 + +
배당일자 + + 배당월 + +
사무처리기한 + +
보고일자 + + 보고월 + +
소요일 + +
본 사건번호 + + 조정 사건번호 + +
분야 + +
신청인 정보 + +
피신청인 정보 + +
원고/
신청인(대리인)		 + +
피고/
피신청인(대리인)		 + +
사건내용 + +
결과 + +
세부결과 + +
조정위원 + + 수당금액 + +
대면기일 + +
지급일자 + + 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 9b043fbe..3f8535b8 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnList.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnList.jsp @@ -44,14 +44,14 @@ function linkPage(pageNo){ 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,8 +59,8 @@ function fn_goDetail(adrSeq){
- - "/> + + "/>
@@ -91,60 +91,35 @@ function fn_goDetail(adrSeq){

구분

- +
  • -

    조정상태

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

    신청일자

    +

    결정일자

    - + - + - + - +
    - +
    ~
    - +
    @@ -189,66 +164,54 @@ function fn_goDetail(adrSeq){
    - - - + + + + - + + - - - - - - - - + + + + + + - ')"> + + + + + + + + + + ')"> - - - - - -<%-- --%> - - - + + + + + + - + @@ -271,7 +234,7 @@ function fn_goDetail(adrSeq){ " 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"%> + + + + +법원연계조정관리 - 수정 + + + + + + +
    + + + " /> + " /> + " /> + + +
    +
    + +
    +

    법원연계조정수정

    +
      +
      • +
    • +

      법원연계조정관리

      +
      • +
    • +

      법원연계조정목록

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

    조정 사건

    +
    +
    번호조정번호신청인피신청인조사관조정부저작물종류조정결과작성여부조정 사건번호분야결과사건번호조정위원결정일자
    - - - - - - - ')" title="상세페이지로 이동"> - - - - - - - - - - - - - 작성중 - - - 작성완료 - - + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    번호 +

    + "/> +

    +
    결정일자 +
    + " 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 26436f56..7a573213 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnRegist.jsp @@ -74,8 +74,7 @@ function fn_regist(){ alert(data.data); if(data.status == 'OK') { - $('#adrSeqHidden').val(data.dataSub); - $('#nextGoPageForm').submit(); + $('#goListForm').submit(); } else if(data.status == 'Unauthorized' || data.status == 'BAD_REQUEST') { @@ -102,7 +101,8 @@ function fn_GoList(){ -
    + + " /> From 42756ed463bcf7eb9edb5a11913fa3982c461403 Mon Sep 17 00:00:00 2001 From: JooYoung Date: Mon, 31 Oct 2022 09:53:15 +0900 Subject: [PATCH 4/9] =?UTF-8?q?=EC=82=AC=EA=B1=B4=EA=B8=B0=EB=A1=9D?= =?UTF-8?q?=EC=97=B4=EB=9E=8C=20=EA=B0=9C=EB=B0=9C=20=EA=B1=B4=20=EB=B3=B5?= =?UTF-8?q?=EA=B5=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ars/web/AdjstReqStatusController.java | 489 +++++++++++++++--- .../kccadr/accdnt/ai/adjstIncidentEndList.jsp | 13 +- .../kccadr/accdnt/ars/tab/docIssReqRegist.jsp | 2 +- 3 files changed, 419 insertions(+), 85 deletions(-) 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..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,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/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..0ca44b18 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 @@ -98,14 +98,21 @@ ); } - function fnDocIssReqLink(){ - location.href = "/web/kccadr/accdnt/ai/docIssReqRegist.do"; + function fnDocIssReqLink(adrNo){ + var docForm = document.docForm ; + docForm.adrNo.value = adrNo; + docForm.action = ""; + docForm.submit(); + } + + + " /> @@ -319,7 +326,7 @@ --%> 열람신청 - + 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..d65f04a9 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 @@ -144,7 +144,7 @@ - + From 5b48bf48079f36af7224fb2a709ac815729a690c Mon Sep 17 00:00:00 2001 From: LJH Date: Mon, 31 Oct 2022 10:43:24 +0900 Subject: [PATCH 5/9] =?UTF-8?q?=EC=9D=B4=EC=A4=80=ED=98=B8=20=EC=A0=84?= =?UTF-8?q?=EC=9E=90=EC=A1=B0=EC=A0=95=EC=8B=9C=EC=8A=A4=ED=85=9C=20?= =?UTF-8?q?=EC=BB=A4=EB=B0=8B=20=20-=20(=EC=82=AC=EC=9A=A9=EC=9E=90)=20?= =?UTF-8?q?=EA=B8=B0=EB=A1=9D=EC=97=B4=EB=9E=8C=EC=8B=A0=EC=B2=AD=20?= =?UTF-8?q?=EC=9B=90=EB=B3=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ars/web/AdjstReqStatusController.java | 489 +++++++++++++++--- .../kccadr/accdnt/ai/adjstIncidentEndList.jsp | 13 +- .../kccadr/accdnt/ars/tab/docIssReqRegist.jsp | 2 +- 3 files changed, 419 insertions(+), 85 deletions(-) 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..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,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/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..0ca44b18 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 @@ -98,14 +98,21 @@ ); } - function fnDocIssReqLink(){ - location.href = "/web/kccadr/accdnt/ai/docIssReqRegist.do"; + function fnDocIssReqLink(adrNo){ + var docForm = document.docForm ; + docForm.adrNo.value = adrNo; + docForm.action = ""; + docForm.submit(); + } +
    + +
    " /> @@ -319,7 +326,7 @@ --%> 열람신청 - + 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..d65f04a9 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 @@ -144,7 +144,7 @@ - + From 154ae346143b530518a03928d9c690d80fee16c3 Mon Sep 17 00:00:00 2001 From: LJH Date: Mon, 31 Oct 2022 12:32:35 +0900 Subject: [PATCH 6/9] =?UTF-8?q?=EC=9D=B4=EC=A4=80=ED=98=B8=20=EC=A0=84?= =?UTF-8?q?=EC=9E=90=EC=A1=B0=EC=A0=95=EC=8B=9C=EC=8A=A4=ED=85=9C=20?= =?UTF-8?q?=EC=BB=A4=EB=B0=8B=20=20-=20=EC=A2=85=EA=B2=B0=20=EC=82=AC?= =?UTF-8?q?=EA=B1=B4=20=EB=AA=A9=EB=A1=9D->=20=EC=82=AC=EA=B1=B4=EC=97=B4?= =?UTF-8?q?=EB=9E=8C=20=EC=8B=A0=EC=B2=AD=20=ED=8E=98=EC=9D=B4=EC=A7=80=20?= =?UTF-8?q?=EB=84=98=EC=96=B4=EC=99=94=EC=9D=84=EA=B2=BD=EC=9A=B0=20?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=84=B0=20set?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ars/web/AdjstReqStatusController.java | 2 +- .../kccadr/accdnt/ai/adjstIncidentEndList.jsp | 133 ++---------------- .../kccadr/accdnt/ars/tab/docIssReqRegist.jsp | 26 +++- 3 files changed, 34 insertions(+), 127 deletions(-) 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 a00752d0..bda1823c 100644 --- a/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java +++ b/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java @@ -526,7 +526,7 @@ public class AdjstReqStatusController { // 대국민 서류 발급 요청 등록 @RequestMapping(value = "/web/kccadr/accdnt/ai/docIssReqRegist.do") - public String docIssReqRegist(ModelMap model) throws Exception { + public String docIssReqRegist(@ModelAttribute("adjstIncidentVO") AdjstIncidentVO adjstIncidentVO, ModelMap model) throws Exception { String auth = EgovUserDetailsHelper.isAuthenticated() ? null : EgovUserDetailsHelper.getAuthenticatedUser().toString(); LoginVO loginVO = "anonymousUser".equals(auth) ? null : (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser(); 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 0ca44b18..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 @@ <%-- --%> -사건진행정보 +기일조서관리 @@ -188,7 +188,7 @@ function fn_goListPage(){
    - +
    diff --git a/src/main/webapp/js/kccadr/adjReqMgrPast/event.js b/src/main/webapp/js/kccadr/adjReqMgrPast/event.js index a978570f..385f2921 100644 --- a/src/main/webapp/js/kccadr/adjReqMgrPast/event.js +++ b/src/main/webapp/js/kccadr/adjReqMgrPast/event.js @@ -33,15 +33,15 @@ function openExampleAdminPop(exmpCd) { $(document).ready(function(){ - $('.progReg').on('click', function(){ + $('#progReg').on('click', function(){ commonPopWindowopenForm("/kccadr/adjReqMgOff/popup/adjReqMgrPastProgRegist.do", '820', '600', "adjReqMgrPastProgRegist", $('#nextGoPageForm')); }); - $('.fileReg').on('click', function(){ + $('#fileReg').on('click', function(){ commonPopWindowopenForm("/kccadr/adjReqMgOff/popup/adjReqMgrPastFileRegist.do", '1250', '600', "adjReqMgrPastFileRegist", $('#nextGoPageForm')); }); - $('.recordReg').on('click', function(){ + $('#recordReg').on('click', function(){ commonPopWindowopenForm("/kccadr/adjReqMgOff/popup/adjReqMgrPastRecordRegist.do", '1250', '600', "adjReqMgrPastRecordRegist", $('#nextGoPageForm')); }); diff --git a/src/main/webapp/js/kccadr/adjReqMgrPast/init.js b/src/main/webapp/js/kccadr/adjReqMgrPast/init.js index bd2fded3..5114210e 100644 --- a/src/main/webapp/js/kccadr/adjReqMgrPast/init.js +++ b/src/main/webapp/js/kccadr/adjReqMgrPast/init.js @@ -2,7 +2,11 @@ $(document).ready(function(){ - + + if($('#adrSeq').val() == '') + { + $(".popBtn").hide(); + } /* 최종결과 선택에 따른 액션 */ $('#detailResult').hide(); diff --git a/src/main/webapp/js/kccadr/adjReqMgrPast/value.js b/src/main/webapp/js/kccadr/adjReqMgrPast/value.js index c56b7d01..c59c5f79 100644 --- a/src/main/webapp/js/kccadr/adjReqMgrPast/value.js +++ b/src/main/webapp/js/kccadr/adjReqMgrPast/value.js @@ -1118,15 +1118,17 @@ alert(data.data); if(data.status == 'OK') { - if($('#adrSeqHidden').val() == null) + if($('#adrSeqHidden').val() == '') { $('#adrSeqHidden').val(data.dataSub); } - if($('#adrSeq').val() == null) + if($('#adrSeq').val() == '') { + $(".popBtn").show(); $('#adrSeq').val(data.dataSub); } - + + $(".popBtn").show(); // $('#nextGoPageForm').submit(); }