From 5f43f0086d73a25e9966276800617bb8e56cee87 Mon Sep 17 00:00:00 2001 From: hylee Date: Wed, 26 Oct 2022 21:59:37 +0900 Subject: [PATCH 1/6] =?UTF-8?q?feat:=EC=A1=B0=EC=A0=95=EC=A2=85=EA=B2=B0?= =?UTF-8?q?=EC=83=81=EC=84=B8=20(=EA=B3=BC=EA=B1=B0=EC=82=AC=EA=B1=B4)=20>?= =?UTF-8?q?=20=EC=82=AC=EA=B1=B4=EC=83=81=EC=84=B8=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/AdjReqMgrPastService.java | 3 + .../service/AdjReqMgrPastVO.java | 47 ++ .../service/impl/AdjReqMgrPastDAO.java | 16 + .../impl/AdjReqMgrPastServiceImpl.java | 124 ++- .../web/AdjReqMgrPastController.java | 42 +- .../adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml | 172 +++++ src/main/webapp/WEB-INF/decorators.xml | 1 + .../adjReqMgrPastBasicRegist.jsp | 12 +- .../adjReqMgrPast/adjReqMgrPastDetail.jsp | 169 ++++ .../jsp/kccadr/adjReqMgrPast/drtUpdtPop.jsp | 4 +- .../kccadr/adjReqMgrPast/tab/adjCloseTab0.jsp | 376 +++++++++ .../kccadr/adjReqMgrPast/tab/adjCloseTab1.jsp | 730 ++++++++++++++++++ .../kccadr/adjReqMgrPast/tab/adjCloseTab2.jsp | 98 +++ .../kccadr/adjclsmgr/adjCloseMangeList.jsp | 44 +- 14 files changed, 1805 insertions(+), 33 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastDetail.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/tab/adjCloseTab0.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/tab/adjCloseTab1.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/tab/adjCloseTab2.jsp diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java index c3b2681c..c70f1cfd 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java @@ -1,6 +1,7 @@ package kcc.kccadr.adjReqMgrPast.service; import java.util.List; +import java.util.Map; import org.springframework.http.ResponseEntity; @@ -45,5 +46,7 @@ public interface AdjReqMgrPastService { List selectAdjReqMgrPastList(AdjReqMgrPastVO adjReqMgrPastVO); int selectAdjReqMgrPastListCount(AdjReqMgrPastVO adjReqMgrPastVO); + + Map selectAdjPastCloseTab0(AdjReqMgrPastVO adjReqMgrPastVO); } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastVO.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastVO.java index 62a69da5..88b901d3 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastVO.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastVO.java @@ -222,7 +222,14 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable { private String diffYear; + + /* 상세 */ + private String reRpplNm; /* 피신청인 이름 20*/ + private String reDeRpplNm; /* 피신청 대리인 이름 40*/ + private String deRpplNm; /* 신청인 대리인 이름 30*/ + private String obRpplNm; /* 신청인 대리인 이름 35*/ + private String reObRpplNm; /* 신청인 대리인 이름 45*/ private List searchStatCdList = new ArrayList(); @@ -1444,6 +1451,46 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable { this.diffYear = diffYear; } + public String getReRpplNm() { + return reRpplNm; + } + + public void setReRpplNm(String reRpplNm) { + this.reRpplNm = reRpplNm; + } + + public String getReDeRpplNm() { + return reDeRpplNm; + } + + public void setReDeRpplNm(String reDeRpplNm) { + this.reDeRpplNm = reDeRpplNm; + } + + public String getDeRpplNm() { + return deRpplNm; + } + + public void setDeRpplNm(String deRpplNm) { + this.deRpplNm = deRpplNm; + } + + public String getObRpplNm() { + return obRpplNm; + } + + public void setObRpplNm(String obRpplNm) { + this.obRpplNm = obRpplNm; + } + + public String getReObRpplNm() { + return reObRpplNm; + } + + public void setReObRpplNm(String reObRpplNm) { + this.reObRpplNm = reObRpplNm; + } + // ============================================= diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java index e42a6457..25112d1e 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java @@ -171,5 +171,21 @@ public class AdjReqMgrPastDAO extends EgovAbstractDAO { update("adjReqMgrPastDAO.updateAdrEndDe", adjPastVO); } + public void updateAdrSn(AdjReqMgrPastVO adjReqMgrPastVO) { + update("adjReqMgrPastDAO.updateAdrSn", adjReqMgrPastVO); + } + + public AdjReqMgrPastVO selectMainInfo(AdjReqMgrPastVO adjReqMgrPastVO) { + return (AdjReqMgrPastVO) select("adjReqMgrPastDAO.selectMainInfo", adjReqMgrPastVO); + } + + public List selectAdrPrtclMgrInfo(AdjReqMgrPastVO adjReqMgrPastVO) { + return (List) list("adjReqMgrPastDAO.selectAdrPrtclMgrInfo", adjReqMgrPastVO); + } + + public void insertAdjAss(AdjAssMgrPastVO adjAssMgrPastVO) { + insert("adjReqMgrPastDAO.insertAdjAss", adjAssMgrPastVO ); + } + } 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 49242047..6459781f 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java @@ -6,11 +6,15 @@ import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Calendar; import java.util.Date; +import java.util.HashMap; import java.util.List; +import java.util.Map; import javax.annotation.Resource; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.poi.ddf.EscherColorRef.SysIndexProcedure; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.HttpStatus; @@ -22,6 +26,7 @@ import egovframework.rte.fdl.cmmn.exception.FdlException; import egovframework.rte.fdl.idgnr.EgovIdGnrService; import kcc.com.cmm.util.StringUtil; import kcc.com.utl.user.service.CheckAdrProcessUtil; +import kcc.kccadr.accdnt.adr.service.AdjstDeputyReqVO; import kcc.kccadr.adjReqMgrOff.service.AdjReqMgrOffLineVO; import kcc.kccadr.adjReqMgrPast.service.AdjAssMgrPastVO; import kcc.kccadr.adjReqMgrPast.service.AdjReqMgrPastService; @@ -544,23 +549,18 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements List adjAssMgrPastList = new ArrayList(); - /* 신청인 */ - AdjAssMgrPastVO adjAssMgrPastVO = new AdjAssMgrPastVO(adjPastVO); - String addUsrIdS = adjPastVO.getAddUsrIdList()[0]; - adjAssMgrPastVO.setAssPstSeq(adrAssMgrPstGnrService.getNextStringId()); - adjAssMgrPastVO.setAssPstUsrNm(addUsrIdS.split("\\|")[0]); - adjAssMgrPastVO.setAssPstUsrTy(addUsrIdS.split("\\|")[1]); - adjAssMgrPastVO.setAddYn(addUsrIdS.split("\\|")[2]); - adjAssMgrPastList.add(adjAssMgrPastVO); + /* 신청인 , 피신청인*/ + AdjAssMgrPastVO adjAssMgrPastVO = null; - /* 피신청인 */ - adjAssMgrPastVO = new AdjAssMgrPastVO(adjPastVO); - String addUsrIdP = adjPastVO.getAddUsrIdList()[1]; - adjAssMgrPastVO.setAssPstSeq(adrAssMgrPstGnrService.getNextStringId()); - adjAssMgrPastVO.setAssPstUsrNm(addUsrIdP.split("\\|")[0]); - adjAssMgrPastVO.setAssPstUsrTy(addUsrIdP.split("\\|")[1]); - adjAssMgrPastVO.setAddYn(addUsrIdP.split("\\|")[2]); - adjAssMgrPastList.add(adjAssMgrPastVO); + for(String addUur :adjPastVO.getAddUsrIdList()) { + + adjAssMgrPastVO = new AdjAssMgrPastVO(adjPastVO); + adjAssMgrPastVO.setAssPstSeq(adrAssMgrPstGnrService.getNextStringId()); + adjAssMgrPastVO.setAssPstUsrNm(addUur.split("\\|")[0]); + adjAssMgrPastVO.setAssPstUsrTy(addUur.split("\\|")[1]); + adjAssMgrPastVO.setAddYn(addUur.split("\\|")[2]); + adjAssMgrPastList.add(adjAssMgrPastVO); + } String assPstUsrNmS = adjPastVO.getAddAgntList()[0]; String assPstUsrNmP = adjPastVO.getAddAgntList()[1]; @@ -658,7 +658,15 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements adjAssMgrPastVO.setAssPstUsrTy(addusrList.split("\\|")[1]); adjAssMgrPastVO.setAssPstUsrNm(addusrList.split("\\|")[2]); adjAssMgrPastVO.setAddYn("Y"); - adjReqMgrPastDAO.updateAdjAss(adjAssMgrPastVO); + + System.out.println(" adjAssMgrPastVO.getFrstRegisterId() :: "+adjAssMgrPastVO.getFrstRegisterId()); + if(StringUtils.isEmpty(adjAssMgrPastVO.getAssPstSeq())){ + adjAssMgrPastVO.setAssPstSeq(adrAssMgrPstGnrService.getNextStringId()); + adjAssMgrPastVO.setAddYn("Y"); + adjReqMgrPastDAO.insertAdjAss(adjAssMgrPastVO); + }else { + adjReqMgrPastDAO.updateAdjAss(adjAssMgrPastVO); + } } } @@ -843,7 +851,8 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements // 조사관 수정 adjReqMgrPastDAO.updateAssPstUsrNm(adjReqMgrPastVO); - + + System.out.println("adjReqMgrPastVO.getAdrHstrySeq() :: "+ adjReqMgrPastVO.getAdrHstrySeq()); if(StringUtil.isNotEmpty(adjReqMgrPastVO.getAdrHstrySeq())) { // 최종결과 CODE 수정 @@ -873,8 +882,8 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements * */ if("Y".equals(adjReqMgrPastVO.getAdrSnChgYn())) { - if(prtclRowList.size() > 0) - adjReqMgrPastDAO.deleteAdrPrtclMgrRow(prtclRowList.get(0)); + if(prtclRowList.size() > 0) + adjReqMgrPastDAO.deleteAdrPrtclMgrRow(prtclRowList.get(0)); int adrSn = Integer.parseInt(adjReqMgrPastVO.getAdrSn()); int cnt = 1; while(cnt <= adrSn) @@ -884,6 +893,8 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements adjReqMgrPastDAO.insertAdrSnInit(adjReqMgrPastVO); cnt++; } + adjReqMgrPastDAO.updateAdrSn(adjReqMgrPastVO); + } } @@ -985,6 +996,79 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements return df.format(cal.getTime()); } + + + @Override + public Map selectAdjPastCloseTab0(AdjReqMgrPastVO adjReqMgrPastVO) { + + Map map = new HashMap(); + + AdjReqMgrPastVO adjReqMgrPastMainVO = adjReqMgrPastDAO.selectMainInfo(adjReqMgrPastVO); + List adrPrtclMgrInfoVO = adjReqMgrPastDAO.selectAdrPrtclMgrInfo(adjReqMgrPastVO); + + adrPrtclMgrInfoVO.forEach(t-> System.out.println("t.getReObRpplNm() :: "+ t.getReObRpplNm())); + + decryptInfomation(adjReqMgrPastMainVO); + map.put("adjReqMgrPastMainVO", adjReqMgrPastMainVO); + map.put("adrPrtclMgrInfoVO", adrPrtclMgrInfoVO); + + + + + return map; + } + + public void decryptInfomation(AdjReqMgrPastVO adjReqMgrPastVO){ + + + if(adjReqMgrPastVO != null) + { + /* 신청인 */ + adjReqMgrPastVO.setRpplNm(egovCryptoUtil.decrypt(adjReqMgrPastVO.getRpplNm())); + + String[] arr = null; + + /* 피신청인 */ + if(StringUtils.isNotEmpty(adjReqMgrPastVO.getReRpplNm()) ) + { + arr = adjReqMgrPastVO.getReRpplNm().split("\\,"); + adjReqMgrPastVO.setReRpplNm(decryptArrayEach(arr)); + } + + /* 피신청 대리인 */ + if(StringUtils.isNotEmpty(adjReqMgrPastVO.getReDeRpplNm()) ) + { + arr = adjReqMgrPastVO.getReDeRpplNm().split("\\,"); + adjReqMgrPastVO.setReDeRpplNm(decryptArrayEach(arr)); + } + + /* 신청 대리인 */ + if(StringUtils.isNotEmpty(adjReqMgrPastVO.getDeRpplNm()) ) + { + arr = adjReqMgrPastVO.getDeRpplNm().split("\\,"); + adjReqMgrPastVO.setDeRpplNm(decryptArrayEach(arr)); + } + + } + } + + + + public String decryptArrayEach(String[] arr){ + + String reRpplNmTemp = ""; + for(String a : arr) + { + if(StringUtils.isEmpty(reRpplNmTemp)) + reRpplNmTemp = egovCryptoUtil.decrypt(a); + else + reRpplNmTemp = reRpplNmTemp+","+egovCryptoUtil.decrypt(a); + } + return reRpplNmTemp; + } + + + } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java index d6c26a67..1fd8a016 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java @@ -2,7 +2,9 @@ package kcc.kccadr.adjReqMgrPast.web; import java.time.LocalDateTime; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.Properties; import javax.annotation.Resource; @@ -11,6 +13,7 @@ import javax.servlet.http.HttpServletRequest; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.core.env.SystemEnvironmentPropertySource; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; @@ -146,10 +149,46 @@ public class AdjReqMgrPastController { // 조정부 / 조사관 정보 model.addAttribute("memAss", adjReqMgrPastService.selectMemAss(adjReqMgrPastVO)); model.addAttribute("reqPerTotCnt", reqPerTotCnt); + + return "kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist"; } + + + + + @RequestMapping("/kccadr/adjReqMgOff/adjReqMgrPastDetail.do") + public String adjReqMgrPastDetail(@ModelAttribute("adjReqMgrPastVO") AdjReqMgrPastVO adjReqMgrPastVO, ModelMap model) throws Exception { + + return "kccadr/adjReqMgrPast/adjReqMgrPastDetail"; + } + + @RequestMapping("/kccadr/adjReqMgOff/adjCloseTab0.do") + public String adjCloseTab0(@ModelAttribute("adjReqMgrPastVO") AdjReqMgrPastVO adjReqMgrPastVO, ModelMap model) throws Exception { + + + /* 목록을 가져 온다 */ + Map tab0ResultMap = adjReqMgrPastService.selectAdjPastCloseTab0(adjReqMgrPastVO); + +// model.addAttribute("manualMap", manualMap); + model.addAttribute("mainVO", tab0ResultMap.get("adjReqMgrPastMainVO")); + model.addAttribute("prtclMgrVO", tab0ResultMap.get("adrPrtclMgrInfoVO")); + + return "kccadr/adjReqMgrPast/tab/adjCloseTab0"; + } + + @RequestMapping("/kccadr/adjReqMgOff/adjCloseTab1.do") + public String adjCloseTab1(@ModelAttribute("adjReqMgrPastVO") AdjReqMgrPastVO adjReqMgrPastVO, ModelMap model) throws Exception { + return "kccadr/adjReqMgrPast/tab/adjCloseTab1"; + } + + @RequestMapping("/kccadr/adjReqMgOff/adjCloseTab2.do") + public String adjCloseTab2(@ModelAttribute("adjReqMgrPastVO") AdjReqMgrPastVO adjReqMgrPastVO, ModelMap model) throws Exception { + return "kccadr/adjReqMgrPast/tab/adjCloseTab2"; + } + @RequestMapping("/kccadr/adjReqMgOff/adjReqMgrPastList.do") public String adjReqMgrPastList(@ModelAttribute("adjReqMgrPastVO") AdjReqMgrPastVO adjReqMgrPastVO, ModelMap model) throws Exception { @@ -483,6 +522,7 @@ public class AdjReqMgrPastController { } //사용자 유니크 아이디 받아오기 + adjReqMgrPastVO.setFrstRegisterId(userId); adjReqMgrPastVO.setLastUpdusrId(userId); //조정신청, 대리인, 신청인 등록 처리 @@ -595,7 +635,7 @@ public class AdjReqMgrPastController { * 기존 수정로직 후 기타사항 수정 * 조정부, 조정조사관, 진행된 차수, 최종결과, 조정결과 * */ - adjReqMgrPastService.updateAdjReqMgrEtc(adjReqMgrOffLineVO); + adjReqMgrPastService.updateAdjReqMgrEtc(adjReqMgrOffLineVO); if(resultSts.equals("updateSucc")) { 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 ca51d02e..d4888193 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 @@ -432,6 +432,33 @@ + + + + INSERT INTO ADR_ASS_MGR_PST ( + ADR_SEQ + , ADR_SN + , ASS_PST_SEQ + , ASS_PST_USR_TY + , ASS_PST_USR_NM + , ADD_YN + , ADD_CHG_YN + , FRST_REGIST_PNTTM + , FRST_REGISTER_ID + ) VALUES + ( + #adrSeq# + , #adrSn# + , #assPstSeq# + , #assPstUsrTy# + , #assPstUsrNm# + , 'Y' + , 'N' + , NOW() + , #frstRegisterId# + ) + + @@ -660,6 +687,69 @@ AND STAT_CD IS NOT NULL + + UPDATE ADR_MGR_MASTER SET REQ_CN1 = #reqCn1# @@ -757,6 +847,14 @@ ADR_SEQ = #adrSeq# + + + UPDATE ADR_MGR_DETAIL SET + ADR_SN = #adrSn# + WHERE + ADR_SEQ = #adrSeq# + + + diff --git a/src/main/webapp/WEB-INF/decorators.xml b/src/main/webapp/WEB-INF/decorators.xml index 3d17cd83..f9efd6c6 100644 --- a/src/main/webapp/WEB-INF/decorators.xml +++ b/src/main/webapp/WEB-INF/decorators.xml @@ -61,6 +61,7 @@ */kccadr/adjPgrMgr/**/*Tab* */kccadr/adjclsmgr/*Tab* + */kccadr/adjReqMgOff/*Tab* /web/kccadr/adjPgrMgr/cclt/membDeptDetailPop.do */web/kccadr/pdf/pdfview.do* diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist.jsp index 8eb306d9..0a80eb7c 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist.jsp @@ -414,7 +414,7 @@ function fn_goListPage(){

사업자 등록번호

- + 주소 @@ -576,7 +576,7 @@ function fn_goListPage(){

피신청인 사업자 등록번호

- + @@ -735,7 +735,7 @@ function fn_goListPage(){

피신청인 사업자 등록번호

- + @@ -894,7 +894,7 @@ function fn_goListPage(){

피신청인 사업자 등록번호

- + @@ -1053,7 +1053,7 @@ function fn_goListPage(){

피신청인 사업자 등록번호

- + @@ -1212,7 +1212,7 @@ function fn_goListPage(){

피신청인 사업자 등록번호

- + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastDetail.jsp new file mode 100644 index 00000000..d5f96f2f --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastDetail.jsp @@ -0,0 +1,169 @@ +<%@ 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"%> + + + + +조정종결상세 + + + +
+ + + + " /> + " /> + " /> + " /> + " /> +
+ +
+
+ +
+

조정종결상세

+
    +
    • +
  • +

    조정종결관리

    +
    • +
  • +

    조정종결목록

    +
    • +
  • 조정종결상세
    • +
+
+ + +
+
+ + + +
+
+
+
+
+ + + + + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/drtUpdtPop.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/drtUpdtPop.jsp index 666b7f8e..bc937790 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/drtUpdtPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/drtUpdtPop.jsp @@ -475,8 +475,8 @@ - -   + +   diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/tab/adjCloseTab0.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/tab/adjCloseTab0.jsp new file mode 100644 index 00000000..bf87c0dd --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/tab/adjCloseTab0.jsp @@ -0,0 +1,376 @@ +<%@ 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"%> +<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> + + + + + +조정종결상세 + + + + + +
+ + + + " /> + " /> + " /> + " /> +<%-- " /> --%> + " /> +
+
+ " /> + +
+

조정 사건 일반

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

--%> + + + + + + + + + + +<%-- --%> + + + + + + + + + + + + +
사건 +

+ +

+ 		사건내용 +

+ +<%-- --%> +

+
신청인 +

+ +

+ 		대리인 +

+ +

+
피신청인 +

+ +

+ 		대리인 +

+ +

+
신청일 +

+ +

+ 		조정 종결일 +

+ +

+
종결상태 +

+
조정부 +

+ +

+
조정 조사관 +

+ +

+
조정결과 + +
+
+ + + +

${prtclVO.adrSn }차 기일

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
신청인 +

+ +

+ 		대리인 +

+ +

+
참관대리인 +

+ +

+
피신청인 + + +

+ +

+ + 		대리인 +

+ +

+
참관대리인 +

+ +

+
조정기일 +

+ +

+ 		공개여부 +

+ +

+
장소 +

+ +

+
기일결과 +

+ +

+ 		고지된 다음 기일 +

+ +

+
조정부장 + +
조정위원${status.count } + +
조서내용 + +
+
+ + +
+
+ +<%-- --%> +<%-- --%> +<%-- 조정사건이력(adr_hstry) stat_cd 기일통지서승인(205050)가 있으면 버튼 노출 --%> +<%-- --%> + +<%-- --%> + +<%-- 조정사건이력(adr_hstry) stat_cd 기일변경승인(204050)가 있으면 버튼 노출 --%> +<%-- --%> + +<%-- --%> + +<%-- 조정사건이력(adr_hstry) stat_cd 기일조서 결재완료(302050)가 있으면 버튼 노출 --%> +<%-- --%> + +<%-- --%> + +<%-- 조정사건이력(adr_hstry) stat_cd 조정권고안 결재완료(303050)가 있으면 버튼 노출 --%> +<%-- --%> + +<%-- --%> + +<%-- 조정사건이력(adr_hstry) stat_cd 직권조정결정서 확인완료(306050)가 있으면 버튼 노출 --%> +<%-- --%> + +<%-- --%> + +<%-- 조정사건이력(adr_hstry) stat_cd 조정조서 결재완료(304050)가 있으면 버튼 노출 --%> +<%-- --%> + +<%-- --%> + +<%-- 조정사건이력(adr_hstry) stat_cd 불성립종결통보서 결재완료(307050)가 있으면 버튼 노출 --%> +<%-- --%> + +<%-- --%> + +<%-- 조정사건이력(adr_hstry) stat_cd 취하종결통보서 결재완료(305050)가 있으면 버튼 노출 --%> +<%-- --%> + +<%-- --%> + +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> + <%-- + + + + + + + + + --%> + +
+
+ +
+
+
+
+ + + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/tab/adjCloseTab1.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/tab/adjCloseTab1.jsp new file mode 100644 index 00000000..123b2667 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/tab/adjCloseTab1.jsp @@ -0,0 +1,730 @@ +<%@ 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"%> + + + + + + + + + + + + +조정종결상세 + + + + +
+ + + + + + + +
+
+
+

진행 안내-최대 10분까지 소요될 수 있습니다.

+
+
+
+

문서보기 파일 생성 중 입니다.

+

STEP1/3 - PDF파일로 변환 중 입니다.

+
+ +
+ 로딩중 +

정보를 불러오고 있습니다.

+

잠시만 기다려주십시오

+
+
+
+
+ + + +
+
+
+

진행 안내-최대 10분까지 소요될 수 있습니다.

+
+
+
+

선택다운로드 파일 생성 중 입니다.

+

STEP1/1 - PDF파일로 변환 중 입니다.

+
+ +
+ 로딩중 +

정보를 불러오고 있습니다.

+

잠시만 기다려주십시오

+
+
+
+
+ + + + + " /> + +
+

조정 종결 정보

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + 일자 + + 등록인문건명상대방공개여부
+

+ + + + + + + + +

+ 		+

${list.frstRegistPnttm}

+ 		${list.adrDocTy}

+ + 공개 + 비공개 + ${list.adrDocCn1} + + +

+
+ + +
+
+ + +
+
+ +
+
+
+ + + + + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/tab/adjCloseTab2.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/tab/adjCloseTab2.jsp new file mode 100644 index 00000000..c78f64e0 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/tab/adjCloseTab2.jsp @@ -0,0 +1,98 @@ +<%@ 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"%> + + + + +조정종결상세 + + + + + " /> + +
+

신청 정보

+
+ + + + + +<%-- --%> + + + + + + + + + + + + + + + + + + + + + + + + + +
일자 내용비고
+

${list.hstryDe}

+ 		+ + + + + ${list.statCd} + + + ${list.hstryDetailCn} ${list.statCd} 제출 + + + +

+ + ${list.hstryCn} + + +

+
+ + +
+
+
+
+ +
+
+
+ + + + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjclsmgr/adjCloseMangeList.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjclsmgr/adjCloseMangeList.jsp index 6149fde9..2e8ea62d 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjclsmgr/adjCloseMangeList.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjclsmgr/adjCloseMangeList.jsp @@ -32,6 +32,14 @@ listForm.submit(); } + function fncGoPastDetail(adrSeq, adrSn){ + var listForm = document.listForm ; + listForm.adrSeq.value = adrSeq; + listForm.adrSn.value = adrSn; + listForm.action = ""; + listForm.submit(); + } + @@ -139,17 +147,45 @@

- ${empty list.adrNo ? '-' : list.adrNo} + + + ${empty list.adrNo ? '-' : list.adrNo} + + + ${empty list.adrNo ? '-' : list.adrNo} + + - + + + + + + + + - + + + + + + + + + + <%-- --%> - + + + + + +

From 3e84a85023c7c04be76f1e8d000a0b060f8ae19d Mon Sep 17 00:00:00 2001 From: hylee Date: Thu, 27 Oct 2022 10:13:50 +0900 Subject: [PATCH 2/6] =?UTF-8?q?feat=20:=20=EA=B3=BC=EA=B1=B0=EC=82=AC?= =?UTF-8?q?=EA=B1=B4=EC=83=81=EC=84=B8=20-=20=EC=A1=B0=EC=A0=95=EC=82=AC?= =?UTF-8?q?=EA=B1=B4=20=EC=9D=BC=EB=B0=98:=EC=8B=A0=EC=B2=AD=EC=B7=A8?= =?UTF-8?q?=EC=A7=80,=EC=9B=90=EC=9D=B8=20=EC=B6=94=EA=B0=80=20-=20?= =?UTF-8?q?=EC=8B=A0=EC=B2=AD=EC=A0=95=EB=B3=B4=20=EC=9D=B4=EB=A0=A5=20?= =?UTF-8?q?=EC=A0=95=EB=B3=B4=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/AdjReqMgrPastService.java | 2 + .../service/impl/AdjReqMgrPastDAO.java | 4 ++ .../impl/AdjReqMgrPastServiceImpl.java | 17 ++++- .../web/AdjReqMgrPastController.java | 8 ++- .../adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml | 20 ++++++ .../adjReqMgrPast/adjReqMgrPastDetail.jsp | 4 +- .../kccadr/adjReqMgrPast/tab/adjCloseTab0.jsp | 66 ++++++++++++++++--- .../kccadr/adjReqMgrPast/tab/adjCloseTab2.jsp | 58 ++++++---------- 8 files changed, 123 insertions(+), 56 deletions(-) diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java index c70f1cfd..72f47cef 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java @@ -48,5 +48,7 @@ public interface AdjReqMgrPastService { int selectAdjReqMgrPastListCount(AdjReqMgrPastVO adjReqMgrPastVO); Map selectAdjPastCloseTab0(AdjReqMgrPastVO adjReqMgrPastVO); + + Map selectAdjPastCloseTab2(AdjReqMgrPastVO adjReqMgrPastVO); } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java index 25112d1e..ed793dd9 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java @@ -187,5 +187,9 @@ public class AdjReqMgrPastDAO extends EgovAbstractDAO { insert("adjReqMgrPastDAO.insertAdjAss", adjAssMgrPastVO ); } + public List selectHstryInfo(AdjReqMgrPastVO adjReqMgrPastVO) { + return (List) list("adjReqMgrPastDAO.selectHstryInfo", adjReqMgrPastVO); + } + } 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 6459781f..f8140501 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java @@ -1003,17 +1003,28 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements Map map = new HashMap(); + // 신청정보 AdjReqMgrPastVO adjReqMgrPastMainVO = adjReqMgrPastDAO.selectMainInfo(adjReqMgrPastVO); + + // 기일조서 정보 List adrPrtclMgrInfoVO = adjReqMgrPastDAO.selectAdrPrtclMgrInfo(adjReqMgrPastVO); - adrPrtclMgrInfoVO.forEach(t-> System.out.println("t.getReObRpplNm() :: "+ t.getReObRpplNm())); - decryptInfomation(adjReqMgrPastMainVO); map.put("adjReqMgrPastMainVO", adjReqMgrPastMainVO); map.put("adrPrtclMgrInfoVO", adrPrtclMgrInfoVO); + + return map; + } + + + @Override + public Map selectAdjPastCloseTab2(AdjReqMgrPastVO adjReqMgrPastVO) { + Map map = new HashMap(); - + // 과거사건 - 신청정보 +// List adjReqMgrPastHstryVO = adjReqMgrPastDAO.selectHstryInfo(adjReqMgrPastVO); + map.put("adjReqMgrPastHstryVO", adjReqMgrPastDAO.selectHstryInfo(adjReqMgrPastVO)); return map; } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java index 1fd8a016..47990dd7 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java @@ -168,8 +168,7 @@ public class AdjReqMgrPastController { @RequestMapping("/kccadr/adjReqMgOff/adjCloseTab0.do") public String adjCloseTab0(@ModelAttribute("adjReqMgrPastVO") AdjReqMgrPastVO adjReqMgrPastVO, ModelMap model) throws Exception { - - /* 목록을 가져 온다 */ + /* 조정사건 내용을 가져 온다 */ Map tab0ResultMap = adjReqMgrPastService.selectAdjPastCloseTab0(adjReqMgrPastVO); // model.addAttribute("manualMap", manualMap); @@ -186,6 +185,11 @@ public class AdjReqMgrPastController { @RequestMapping("/kccadr/adjReqMgOff/adjCloseTab2.do") public String adjCloseTab2(@ModelAttribute("adjReqMgrPastVO") AdjReqMgrPastVO adjReqMgrPastVO, ModelMap model) throws Exception { + + /* 조정사건 내용을 가져 온다 */ + Map tab2ResultMap = adjReqMgrPastService.selectAdjPastCloseTab2(adjReqMgrPastVO); + model.addAttribute("hstryVOList", tab2ResultMap.get("adjReqMgrPastHstryVO")); + return "kccadr/adjReqMgrPast/tab/adjCloseTab2"; } 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 d4888193..7a8f77e7 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 @@ -693,6 +693,8 @@ , ma.ADR_NO as adrNo , ma.CC_TY as ccTy , de.pst_cn as pstCn + , ma.req_cn1 as reqCn1 + , ma.req_cn2 as reqCn2 , TO_CHAR(ma.FRST_REGIST_PNTTM, 'YYYY-MM-DD') AS frstRegistPnttm , TO_CHAR(ma.LAST_UPDT_PNTTM, 'YYYY-MM-DD') AS lastUpdtPnttm , ( @@ -1149,6 +1151,24 @@ WHERE ADR_SEQ = #adrSeq# + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastDetail.jsp index d5f96f2f..d7029220 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastDetail.jsp @@ -39,9 +39,9 @@ case 0: return '/kccadr/adjReqMgOff/adjCloseTab0.do'; case 1: - return '/kccadr/adjclsmgr/adjCloseTab1.do'; + return '/kccadr/adjReqMgOff/adjCloseTab1.do'; case 2: - return '/kccadr/adjclsmgr/adjCloseTab2.do'; + return '/kccadr/adjReqMgOff/adjCloseTab2.do'; } } diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/tab/adjCloseTab0.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/tab/adjCloseTab0.jsp index bf87c0dd..d036158c 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/tab/adjCloseTab0.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/tab/adjCloseTab0.jsp @@ -131,10 +131,6 @@ function goToEntDetailNotice(){ - - -<%--

--%> - 종결상태

@@ -147,12 +143,6 @@ function goToEntDetailNotice(){

- - - -<%-- --%> - - 조정 조사관 @@ -171,6 +161,62 @@ function goToEntDetailNotice(){ + + + + + + +
+

신청 정보

+
+
+ + + + + + + + + + + + + + + + + + + +
저작물 종류 + +
신청취지 + +
신청원인 + +
+
+ + + + + + + + + + + + + + + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/tab/adjCloseTab2.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/tab/adjCloseTab2.jsp index c78f64e0..eb805efb 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/tab/adjCloseTab2.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/tab/adjCloseTab2.jsp @@ -12,18 +12,17 @@ -조정종결상세 +조정종결상세 - 신청정보 - " />

신청 정보

@@ -31,52 +30,33 @@ function fn_egov_downFile(atchFileId, fileSn){ - + -<%-- --%> - + - - - - - - - - - + + + + + + - + From 8d6b25958b2f131977b020e96e4c8c5f96e55cb8 Mon Sep 17 00:00:00 2001 From: hylee Date: Thu, 27 Oct 2022 10:18:06 +0900 Subject: [PATCH 3/6] =?UTF-8?q?refactor:=EC=A4=84=20=EB=A7=9E=EC=B6=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kccadr/adjReqMgrPast/tab/adjCloseTab0.jsp | 155 +++++------------- 1 file changed, 37 insertions(+), 118 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/tab/adjCloseTab0.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/tab/adjCloseTab0.jsp index d036158c..2a9eb297 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/tab/adjCloseTab0.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/tab/adjCloseTab0.jsp @@ -199,26 +199,6 @@ function goToEntDetailNotice(){
일자 일자 내용 비고
-

${list.hstryDe}

- 		- - - - - ${list.statCd} - - - ${list.hstryDetailCn} ${list.statCd} 제출 - - - -

- - ${list.hstryCn} - - -

+

${list.hstryDe}

+ 		+

${list.hstryCn}

+ 		+

${list.hstryDetailCn}

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

${prtclVO.adrSn }차 기일

@@ -230,62 +210,62 @@ function goToEntDetailNotice(){ - - 신청인 - + + 신청인 +

- - - 대리인 - + + + 대리인 +

- - - - - - - 참관대리인 - + + + + + + + 참관대리인 +

- - - - - 피신청인 - + + + + + 피신청인 +

- - - 대리인 - + + + 대리인 +

- - - - + + + + - 참관대리인 - + 참관대리인 +

- - - + + + 조정기일 @@ -350,70 +330,9 @@ function goToEntDetailNotice(){
-
-
- -<%-- --%> -<%-- --%> -<%-- 조정사건이력(adr_hstry) stat_cd 기일통지서승인(205050)가 있으면 버튼 노출 --%> -<%-- --%> - -<%-- --%> - -<%-- 조정사건이력(adr_hstry) stat_cd 기일변경승인(204050)가 있으면 버튼 노출 --%> -<%-- --%> - -<%-- --%> - -<%-- 조정사건이력(adr_hstry) stat_cd 기일조서 결재완료(302050)가 있으면 버튼 노출 --%> -<%-- --%> - -<%-- --%> - -<%-- 조정사건이력(adr_hstry) stat_cd 조정권고안 결재완료(303050)가 있으면 버튼 노출 --%> -<%-- --%> - -<%-- --%> - -<%-- 조정사건이력(adr_hstry) stat_cd 직권조정결정서 확인완료(306050)가 있으면 버튼 노출 --%> -<%-- --%> - -<%-- --%> - -<%-- 조정사건이력(adr_hstry) stat_cd 조정조서 결재완료(304050)가 있으면 버튼 노출 --%> -<%-- --%> - -<%-- --%> - -<%-- 조정사건이력(adr_hstry) stat_cd 불성립종결통보서 결재완료(307050)가 있으면 버튼 노출 --%> -<%-- --%> - -<%-- --%> - -<%-- 조정사건이력(adr_hstry) stat_cd 취하종결통보서 결재완료(305050)가 있으면 버튼 노출 --%> -<%-- --%> - -<%-- --%> - -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> - <%-- - - - - - - - - - --%> - -
-
- -
+
+ +
From 7a0fac1f97bb0568eb115c41c96e966d3698a859 Mon Sep 17 00:00:00 2001 From: LJH Date: Thu, 27 Oct 2022 16:29:30 +0900 Subject: [PATCH 4/6] =?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?=EA=B3=A0=EB=8F=84=ED=99=94=20=EC=BB=A4=EB=B0=8B=20=20-=20(?= =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90)=20=EC=86=A1=EB=8B=AC=EC=84=9C?= =?UTF-8?q?=EB=A5=98=20=EC=86=8C=EC=85=9C=EB=A1=9C=EA=B7=B8=EC=9D=B8?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=ED=99=95=EC=9D=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dlvinfo/service/DlvinfoService.java | 4 ++- .../service/impl/DlvinfoServiceImpl.java | 13 ++++++-- .../dlvinfo/web/DlvinfoController.java | 9 ++++-- .../kccadr/certDoc/web/CertDocController.java | 4 +-- .../let/utl/fcc/service/EgovCryptoUtil.java | 2 +- .../jsp/web/kccadr/login/SsoLoginUsrSns.jsp | 30 +++++++++++++++++-- 6 files changed, 51 insertions(+), 11 deletions(-) diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/DlvinfoService.java b/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/DlvinfoService.java index 86f18399..15381227 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/DlvinfoService.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/DlvinfoService.java @@ -2,6 +2,8 @@ package kcc.kccadr.adjPgrMgr.dlvinfo.service; import java.util.List; +import javax.servlet.http.HttpServletRequest; + public interface DlvinfoService { List selectAdjustDeliveryInfoList(DlvinfoVO dlvinfoVO) throws Exception; @@ -24,7 +26,7 @@ public interface DlvinfoService { DlvinfoVO selectAdjustDeliveryLatestInfo(DlvinfoVO dlvinfoVO) throws Exception; - public void insertAdjustDeliverySocialInfo(DlvinfoDetailVO dlvinfoDetailVO) throws Exception; + public void insertAdjustDeliverySocialInfo(DlvinfoDetailVO dlvinfoDetailVO, HttpServletRequest request) throws Exception; int updateAdjustDeliverySocialInfo(DlvinfoDetailVO dlvinfoDetailVO) throws Exception; diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/impl/DlvinfoServiceImpl.java b/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/impl/DlvinfoServiceImpl.java index e990ad92..b9e591f7 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/impl/DlvinfoServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/impl/DlvinfoServiceImpl.java @@ -3,6 +3,7 @@ package kcc.kccadr.adjPgrMgr.dlvinfo.service.impl; import java.util.List; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; import org.springframework.stereotype.Repository; @@ -126,12 +127,20 @@ public class DlvinfoServiceImpl implements DlvinfoService { } @Override - public void insertAdjustDeliverySocialInfo(DlvinfoDetailVO dlvinfoDetailVO) throws Exception { + public void insertAdjustDeliverySocialInfo(DlvinfoDetailVO dlvinfoDetailVO, HttpServletRequest request) throws Exception { + String serverNm = request.getServerName(); + String serverPort = String.valueOf(request.getServerPort()); + String serverScheme = request.getScheme(); + if("80".equals(serverPort)) { + serverPort = ""; + }else { + serverPort = ":" + serverPort; + } for(String target : dlvinfoDetailVO.getRpplSeqs()) { dlvinfoDetailVO.setRpplSeq(target); - dlvinfoDetailVO.setUrl("http://localhost:8089/web/kccadr/certDoc/snsLoginPage.do?rpplSeq="+dlvinfoDetailVO.getRpplSeq()+"&dlvrySeq="+dlvinfoDetailVO.getDlvrySeq()); + dlvinfoDetailVO.setUrl(serverScheme + "://" + serverNm + serverPort + "/web/kccadr/certDoc/snsLoginPage.do?rpplSeq="+dlvinfoDetailVO.getRpplSeq()+"&dlvrySeq="+dlvinfoDetailVO.getDlvrySeq()); dlvinfoDAO.insertAdjustDeliverySocialInfo(dlvinfoDetailVO); } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/web/DlvinfoController.java b/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/web/DlvinfoController.java index 01f306da..ed9b25ff 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/web/DlvinfoController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/web/DlvinfoController.java @@ -8,6 +8,7 @@ import java.util.List; import java.util.Locale; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; import org.apache.commons.lang.time.DateFormatUtils; import org.apache.commons.lang.time.DateUtils; @@ -421,7 +422,11 @@ public class DlvinfoController { * @throws Exception */ @RequestMapping("dlvinfoUrlInsertAjax.do") - public ModelAndView dlvinfoUrlInsertAjax(@ModelAttribute("dlvinfoDetailVO") DlvinfoDetailVO dlvinfoDetailVO, ModelMap model, RedirectAttributes redirectAttributes, final MultipartHttpServletRequest multiRequest) throws Exception { + public ModelAndView dlvinfoUrlInsertAjax(@ModelAttribute("dlvinfoDetailVO") DlvinfoDetailVO dlvinfoDetailVO + , ModelMap model + , RedirectAttributes redirectAttributes + , final MultipartHttpServletRequest multiRequest + , HttpServletRequest request) throws Exception { // 로그인 정보 불러오기 LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated() ? (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser() : null; @@ -434,7 +439,7 @@ public class DlvinfoController { modelAndView.setViewName("jsonView"); try { - dlvinfoService.insertAdjustDeliverySocialInfo(dlvinfoDetailVO); + dlvinfoService.insertAdjustDeliverySocialInfo(dlvinfoDetailVO, request); modelAndView.addObject("result", "success"); }catch (Exception e) { modelAndView.addObject("message", "다시 시도 부탁드립니다."); diff --git a/src/main/java/kcc/kccadr/certDoc/web/CertDocController.java b/src/main/java/kcc/kccadr/certDoc/web/CertDocController.java index 5a0890d5..6cc2b6b4 100644 --- a/src/main/java/kcc/kccadr/certDoc/web/CertDocController.java +++ b/src/main/java/kcc/kccadr/certDoc/web/CertDocController.java @@ -125,7 +125,7 @@ public class CertDocController { rpplVO = adjRpplService.selectAdjRpplDetail(rpplVO); - String encEmail = egovCryptoUtil.encrypt(dlvinfoVO.getEmail()); + String encEmail = egovCryptoUtil.encrypt(dlvinfoVO.getEmail()).trim(); String returnUrl = ""; @@ -134,7 +134,7 @@ public class CertDocController { if(!encEmail.equals(rpplVO.getRpplEmail())){ rs.addFlashAttribute("returnMsg", "신청정보(이메일)가 일치하지 않습니다."); - + rs.addFlashAttribute("logout", "Y"); returnUrl = dlvinfoVO.getUrl(); return "redirect:" + returnUrl; diff --git a/src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java b/src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java index 0cd0adee..cd0f2928 100644 --- a/src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java +++ b/src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java @@ -57,7 +57,7 @@ public class EgovCryptoUtil { //System.out.println(cryptoService.getCyptoAlgorithmKey()); //System.out.println(cryptoService.getCyptoAlgorithmKey()); //return cryptoService.encrypt(encrypt); // Handles URLEncoding. - return cryptoService.encryptNone(encrypt); // Does not handle URLEncoding. + return cryptoService.encryptNone(encrypt).trim(); // Does not handle URLEncoding. } catch(IllegalArgumentException e) { LOGGER.error("[IllegalArgumentException] Try/Catch...usingParameters Runing : "+ e.getMessage()); } catch (Exception e) { diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsrSns.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsrSns.jsp index 6da63646..ea2a165a 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsrSns.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsrSns.jsp @@ -30,8 +30,8 @@ @@ -56,7 +56,10 @@ $(document).ready(function() { alert(""); } - + var logoutYn = ""; + if(logoutYn == 'Y'){ + kakaoLogout(); + } }); $(document).on("click", "#naverLogin", function(){ var btnNaverLogin = document.getElementById("naverIdLogin").firstChild; @@ -117,4 +120,25 @@ $(document).on("click", "#naverLogin", function(){ snsLoginForm.submit(); } + + function kakaoLogout() { + if (Kakao.Auth.getAccessToken()) { + //토큰이 있으면 + Kakao.API.request({ + //로그아웃하고 + url: '/v1/user/unlink', + success: function (response) { + //console.log(response) + }, + fail: function (error) { + console.log(error) + }, + }) + //토큰도 삭제 + Kakao.Auth.setAccessToken(undefined) + //유저정보도 삭제 + const userinfoElem = document.querySelector('#userinfo') + if(userinfoElem) userinfoElem.value = '' + } + } From 2a84101c8e602cc9f18a0c6484190892cd6a85d4 Mon Sep 17 00:00:00 2001 From: JooYoung Date: Fri, 28 Oct 2022 11:06:58 +0900 Subject: [PATCH 5/6] =?UTF-8?q?=EC=A1=B0=EC=A0=95=EC=9C=84=EC=9B=90=20?= =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=20=ED=99=94=EB=A9=B4=20=EA=B2=80?= =?UTF-8?q?=EC=83=89=EC=9E=90,=20=EB=B2=84=ED=8A=BC=20=EB=85=B8=EC=B6=9C,?= =?UTF-8?q?=20=ED=85=8C=EC=9D=B4=EB=B8=94=20=EB=A0=88=EC=9D=B4=EC=95=84?= =?UTF-8?q?=EC=9B=83=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adjcclt/AdjustConciliator_SQL_Mysql.xml | 23 ++++++++----------- .../adjstRecommendationCommentList.jsp | 2 +- .../adjcclt/tab/adjstConciliatorTabDocs.jsp | 2 +- .../adjcclt/tab/adjstConciliatorTabInfo.jsp | 2 +- 4 files changed, 13 insertions(+), 16 deletions(-) diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjcclt/AdjustConciliator_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjcclt/AdjustConciliator_SQL_Mysql.xml index 5cd4f169..003ea6b1 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjcclt/AdjustConciliator_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjcclt/AdjustConciliator_SQL_Mysql.xml @@ -207,10 +207,7 @@ ) - RS.ADR_SEQ LIKE CONCAT('%' , #searchKeyword#, '%') - - - TO_CHAR(RS.SBMT_DE,'YYYY-MM-DD') = #searchKeyword# + RS.ADR_NO LIKE CONCAT('%' , #searchKeyword#, '%') RS.APPLI_CANT_NM LIKE CONCAT('%' , #searchKeyword#, '%') @@ -229,15 +226,15 @@ RS.STAT_CD = #searchStatus# - - - TO_CHAR(RS.FRST_REGIST_PNTTM,'YYYYMMDD') = ]]> REPLACE(#searchStartDt#, '-' , '') - - - - TO_CHAR(RS.FRST_REGIST_PNTTM,'YYYYMMDD') REPLACE(#searchEndDt#, '-' , '') - - + + + TO_CHAR(RS.SBMT_DE,'YYYYMMDD') = ]]> REPLACE(#searchStartDt#, '-' , '') + + + + TO_CHAR(RS.SBMT_DE,'YYYYMMDD') REPLACE(#searchEndDt#, '-' , '') + + ORDER BY 1=1 ,$searchSortCnd$ diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/comment/adjstRecommendationCommentList.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/comment/adjstRecommendationCommentList.jsp index c84b8e84..8e172607 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/comment/adjstRecommendationCommentList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/comment/adjstRecommendationCommentList.jsp @@ -158,7 +158,7 @@ - +

조회된 의견이 없습니다.

diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/tab/adjstConciliatorTabDocs.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/tab/adjstConciliatorTabDocs.jsp index 2e010df9..c8da0829 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/tab/adjstConciliatorTabDocs.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/tab/adjstConciliatorTabDocs.jsp @@ -150,7 +150,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/tab/adjstConciliatorTabInfo.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/tab/adjstConciliatorTabInfo.jsp index fe8171aa..6bb35523 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/tab/adjstConciliatorTabInfo.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/tab/adjstConciliatorTabInfo.jsp @@ -233,7 +233,7 @@
-

피신청인 정보

+

피신청인 정보

From 0add79bee8f893f6112655d84135137103fb90fe Mon Sep 17 00:00:00 2001 From: hylee Date: Fri, 28 Oct 2022 12:07:07 +0900 Subject: [PATCH 6/6] =?UTF-8?q?refactor:=EB=B2=95=EC=9B=90=EC=97=B0?= =?UTF-8?q?=EA=B3=84=EC=A1=B0=EC=A0=95=EB=AA=A9=EB=A1=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/AdjCourtCnctnService.java | 8 + .../service/AdjCourtCnctnVO.java | 239 +++++++++++++ .../service/impl/AdjCourtCnctnDAO.java | 19 + .../impl/AdjCourtCnctnServiceImpl.java | 54 +++ .../web/AdjCourtCnctnController.java | 82 +++++ .../web/AdjReqMgrPastController.java | 1 - .../spring/com/context-idgen.xml | 23 +- ...-map-config-mysql-kccadr-adjcourtcnctn.xml | 7 + .../adjCourtCnctn/AdjCourtCnctn_SQL_Mysql.xml | 70 ++++ .../adjCourtCnctn/adjCourtCnctnList.jsp | 277 +++++++++++++++ .../adjCourtCnctn/adjCourtCnctnRegist.jsp | 326 ++++++++++++++++++ .../kccadr/adjReqMgrPast/tab/adjCloseTab0.jsp | 8 +- 12 files changed, 1109 insertions(+), 5 deletions(-) create mode 100644 src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnService.java create mode 100644 src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnVO.java create mode 100644 src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnDAO.java create mode 100644 src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnServiceImpl.java create mode 100644 src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java create mode 100644 src/main/resources/egovframework/sqlmap/config/mysql/sql-map-config-mysql-kccadr-adjcourtcnctn.xml create mode 100644 src/main/resources/egovframework/sqlmap/kccadr/adjCourtCnctn/AdjCourtCnctn_SQL_Mysql.xml create mode 100644 src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnList.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnRegist.jsp diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnService.java b/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnService.java new file mode 100644 index 00000000..510ef7b2 --- /dev/null +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnService.java @@ -0,0 +1,8 @@ +package kcc.kccadr.adjCourtCnctn.service; + +import kcc.kccadr.cmm.RestResponse; + +public interface AdjCourtCnctnService { + + RestResponse insertCourtCnctn(AdjCourtCnctnVO adjCourtCnctnVO); +} diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnVO.java b/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnVO.java new file mode 100644 index 00000000..7e595df6 --- /dev/null +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnVO.java @@ -0,0 +1,239 @@ +package kcc.kccadr.adjCourtCnctn.service; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +import kcc.com.cmm.ComDefaultVO; +import kcc.kccadr.adjreqmgr.service.AdjReqMgrVO; + +public class AdjCourtCnctnVO extends ComDefaultVO implements Serializable { + + /** + * + */ + private static final long serialVersionUID = -1111076331699607617L; + + + private String courtSeq = ""; + private String courtNum = ""; + private String courtOrgNo = ""; + private String courtNo = ""; + private String dcsnDe = ""; + private String rcvDe = ""; + private String alctnDe = ""; + private String alctnMonth = ""; + private String officeWorkDe = ""; + private String rprtDe = ""; + private String rprtMonth = ""; + private String processDay = ""; + private String reqInfo = ""; + private String aplcnInfo = ""; + private String rspndInfo = ""; + private String aplcnDpty = ""; + private String rspndDpty = ""; + private String courtRslt = ""; + private String courtDetailRslt = ""; + private String adjCmsnr = ""; + private String pay = ""; + private String appDe = ""; + private String pymntDay = ""; + private String extns = ""; + private String useYn = ""; + private String rmrks = ""; + private String frstRegistPnttm = ""; + private String frstRegisterId = ""; + private String lastUpdtPnttm = ""; + private String lastUpdusrId = ""; + + + + public String getCourtSeq() { + return courtSeq; + } + public void setCourtSeq(String courtSeq) { + this.courtSeq = courtSeq; + } + public String getCourtNum() { + return courtNum; + } + public void setCourtNum(String courtNum) { + this.courtNum = courtNum; + } + public String getCourtOrgNo() { + return courtOrgNo; + } + public void setCourtOrgNo(String courtOrgNo) { + this.courtOrgNo = courtOrgNo; + } + public String getCourtNo() { + return courtNo; + } + public void setCourtNo(String courtNo) { + this.courtNo = courtNo; + } + public String getDcsnDe() { + return dcsnDe; + } + public void setDcsnDe(String dcsnDe) { + this.dcsnDe = dcsnDe; + } + public String getRcvDe() { + return rcvDe; + } + public void setRcvDe(String rcvDe) { + this.rcvDe = rcvDe; + } + public String getAlctnDe() { + return alctnDe; + } + public void setAlctnDe(String alctnDe) { + this.alctnDe = alctnDe; + } + public String getAlctnMonth() { + return alctnMonth; + } + public void setAlctnMonth(String alctnMonth) { + this.alctnMonth = alctnMonth; + } + public String getOfficeWorkDe() { + return officeWorkDe; + } + public void setOfficeWorkDe(String officeWorkDe) { + this.officeWorkDe = officeWorkDe; + } + public String getRprtDe() { + return rprtDe; + } + public void setRprtDe(String rprtDe) { + this.rprtDe = rprtDe; + } + public String getRprtMonth() { + return rprtMonth; + } + public void setRprtMonth(String rprtMonth) { + this.rprtMonth = rprtMonth; + } + public String getProcessDay() { + return processDay; + } + public void setProcessDay(String processDay) { + this.processDay = processDay; + } + public String getReqInfo() { + return reqInfo; + } + public void setReqInfo(String reqInfo) { + this.reqInfo = reqInfo; + } + public String getAplcnInfo() { + return aplcnInfo; + } + public void setAplcnInfo(String aplcnInfo) { + this.aplcnInfo = aplcnInfo; + } + public String getRspndInfo() { + return rspndInfo; + } + public void setRspndInfo(String rspndInfo) { + this.rspndInfo = rspndInfo; + } + public String getAplcnDpty() { + return aplcnDpty; + } + public void setAplcnDpty(String aplcnDpty) { + this.aplcnDpty = aplcnDpty; + } + public String getRspndDpty() { + return rspndDpty; + } + public void setRspndDpty(String rspndDpty) { + this.rspndDpty = rspndDpty; + } + public String getCourtRslt() { + return courtRslt; + } + public void setCourtRslt(String courtRslt) { + this.courtRslt = courtRslt; + } + public String getCourtDetailRslt() { + return courtDetailRslt; + } + public void setCourtDetailRslt(String courtDetailRslt) { + this.courtDetailRslt = courtDetailRslt; + } + public String getAdjCmsnr() { + return adjCmsnr; + } + public void setAdjCmsnr(String adjCmsnr) { + this.adjCmsnr = adjCmsnr; + } + public String getPay() { + return pay; + } + public void setPay(String pay) { + this.pay = pay; + } + public String getAppDe() { + return appDe; + } + public void setAppDe(String appDe) { + this.appDe = appDe; + } + public String getPymntDay() { + return pymntDay; + } + public void setPymntDay(String pymntDay) { + this.pymntDay = pymntDay; + } + public String getExtns() { + return extns; + } + public void setExtns(String extns) { + this.extns = extns; + } + public String getUseYn() { + return useYn; + } + public void setUseYn(String useYn) { + this.useYn = useYn; + } + public String getFrstRegistPnttm() { + return frstRegistPnttm; + } + public void setFrstRegistPnttm(String frstRegistPnttm) { + this.frstRegistPnttm = frstRegistPnttm; + } + public String getFrstRegisterId() { + return frstRegisterId; + } + public void setFrstRegisterId(String frstRegisterId) { + this.frstRegisterId = frstRegisterId; + } + public String getLastUpdtPnttm() { + return lastUpdtPnttm; + } + public void setLastUpdtPnttm(String lastUpdtPnttm) { + this.lastUpdtPnttm = lastUpdtPnttm; + } + public String getLastUpdusrId() { + return lastUpdusrId; + } + public void setLastUpdusrId(String lastUpdusrId) { + this.lastUpdusrId = lastUpdusrId; + } + public String getRmrks() { + return rmrks; + } + public void setRmrks(String rmrks) { + this.rmrks = rmrks; + } + + + + + + + + +} diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnDAO.java b/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnDAO.java new file mode 100644 index 00000000..798bb02b --- /dev/null +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnDAO.java @@ -0,0 +1,19 @@ +package kcc.kccadr.adjCourtCnctn.service.impl; + +import java.util.List; + +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.cmm.RestResponse; + +@Repository("AdjCourtCnctnDAO") +public class AdjCourtCnctnDAO extends EgovAbstractDAO { + + public void insertCourtCnctn(AdjCourtCnctnVO adjCourtCnctnVO) { + insert("adjCourtCnctnDAO.insertCourtCnctn", 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 new file mode 100644 index 00000000..eee3121f --- /dev/null +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnServiceImpl.java @@ -0,0 +1,54 @@ +package kcc.kccadr.adjCourtCnctn.service.impl; + +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; + +import javax.annotation.Resource; + +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.utl.user.service.CheckAdrProcessUtil; +import kcc.kccadr.adjCourtCnctn.service.AdjCourtCnctnService; +import kcc.kccadr.adjCourtCnctn.service.AdjCourtCnctnVO; +import kcc.kccadr.adjReqMgrOff.service.AdjReqMgrOffLineService; +import kcc.kccadr.adjReqMgrOff.service.AdjReqMgrOffLineVO; +import kcc.kccadr.adjreqmgr.service.AdjReqMgrVO; +import kcc.kccadr.adjreqmgr.service.impl.AdjReqMgrDAO; +import kcc.kccadr.adjst.service.AdjstReqVO; +import kcc.kccadr.adjst.service.impl.AdjstReqDAO; +import kcc.kccadr.advc.service.impl.AdrHstryMgrDAO; +import kcc.kccadr.cmm.KccadrConstants; +import kcc.kccadr.cmm.RestResponse; +import kcc.let.sym.ccm.cde.service.CmmnDetailCodeVO; +import kcc.let.sym.ccm.cde.service.EgovCcmCmmnDetailCodeManageService; +import kcc.let.utl.fcc.service.EgovCryptoUtil; + +@Service("AdjCourtCnctnService") +public class AdjCourtCnctnServiceImpl extends EgovAbstractServiceImpl implements AdjCourtCnctnService { + + // 조정신청 DAO + @Resource(name = "AdjCourtCnctnDAO") + private AdjCourtCnctnDAO adjCourtCnctnDAO; + + @Resource(name="courtCnctnGnrService") + private EgovIdGnrService courtCnctnGnrService; + + @Override + public RestResponse insertCourtCnctn(AdjCourtCnctnVO adjCourtCnctnVO) { + try { + adjCourtCnctnVO.setCourtSeq(courtCnctnGnrService.getNextStringId()); + adjCourtCnctnDAO.insertCourtCnctn(adjCourtCnctnVO); + } catch (Exception e) { + return new RestResponse(HttpStatus.BAD_REQUEST, "등록에 실패하였습니다.", LocalDateTime.now()); + } + return new RestResponse(HttpStatus.OK, "등록 되었습니다.", LocalDateTime.now()); + } + + + +} diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java b/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java new file mode 100644 index 00000000..77c485f4 --- /dev/null +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java @@ -0,0 +1,82 @@ +package kcc.kccadr.adjCourtCnctn.web; + +import java.util.ArrayList; +import java.util.List; + +import javax.annotation.Resource; + +import org.springframework.http.ResponseEntity; +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 egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; +import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; +import kcc.com.cmm.LoginVO; +import kcc.kccadr.adjCourtCnctn.service.AdjCourtCnctnService; +import kcc.kccadr.adjCourtCnctn.service.AdjCourtCnctnVO; +import kcc.kccadr.adjPgrMgr.exmp.cmm.ExmpManageVO; +import kcc.kccadr.adjReqMgrOff.service.AdjReqMgrOffLineVO; +import kcc.kccadr.adjReqMgrPast.service.AdjReqMgrPastVO; +import kcc.kccadr.cmm.RestResponse; + +@Controller +public class AdjCourtCnctnController { + + // 조정신청 서비스단 + @Resource(name = "AdjCourtCnctnService") + private AdjCourtCnctnService adjCourtCnctnService; + + @RequestMapping("/kccadr/adjCourtCnctn/adjCourtCnctnList.do") + public String adjReqMgrOffList(@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())); +// } + + /** paging */ + PaginationInfo paginationInfo = new PaginationInfo(); + paginationInfo.setCurrentPageNo(adjCourtCnctnVO.getPageIndex()); + paginationInfo.setRecordCountPerPage(adjCourtCnctnVO.getPageUnit()); + paginationInfo.setPageSize(adjCourtCnctnVO.getPageSize()); + + adjCourtCnctnVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); + adjCourtCnctnVO.setLastIndex(paginationInfo.getLastRecordIndex()); + adjCourtCnctnVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); +// paginationInfo.setTotalRecordCount(adjReqMgrOffLineService.adjReqMgrOffListCount(adjReqMgrOffLineVO)); + model.addAttribute("paginationInfo", paginationInfo); +// List list = adjReqMgrOffLineService.adjReqMgrOffList(adjReqMgrOffLineVO); + List list = new ArrayList<>(); + // 복호화 + model.addAttribute("list", list); + + + return "kccadr/adjCourtCnctn/adjCourtCnctnList"; + } + + @RequestMapping("/kccadr/adjCourtCnctn/adjCourtCnctnRegist.do") + public String adjCourtCnctnRegist(@ModelAttribute("adjCourtCnctnVO") AdjCourtCnctnVO adjCourtCnctnVO, ModelMap model) throws Exception { + + AdjReqMgrPastVO adjReqMgrPastVO = new AdjReqMgrPastVO(); + model.addAttribute("mainVO", adjReqMgrPastVO); + return "kccadr/adjCourtCnctn/adjCourtCnctnRegist"; + } + + @RequestMapping("/kccadr/adjCourtCnctn/adjCourtCnctnRegistAjax.do") + public ResponseEntity insertExmpAppManager(@ModelAttribute("adjCourtCnctnVO") AdjCourtCnctnVO adjCourtCnctnVO) throws Exception { + + LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser(); + adjCourtCnctnVO.setFrstRegisterId(loginVO.getUniqId()); + return ResponseEntity.ok().body(adjCourtCnctnService.insertCourtCnctn(adjCourtCnctnVO)); + } + +} diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java index 47990dd7..f596f408 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java @@ -171,7 +171,6 @@ public class AdjReqMgrPastController { /* 조정사건 내용을 가져 온다 */ Map tab0ResultMap = adjReqMgrPastService.selectAdjPastCloseTab0(adjReqMgrPastVO); -// model.addAttribute("manualMap", manualMap); model.addAttribute("mainVO", tab0ResultMap.get("adjReqMgrPastMainVO")); model.addAttribute("prtclMgrVO", tab0ResultMap.get("adrPrtclMgrInfoVO")); diff --git a/src/main/resources/egovframework/spring/com/context-idgen.xml b/src/main/resources/egovframework/spring/com/context-idgen.xml index dcb1e449..15b9f1fd 100644 --- a/src/main/resources/egovframework/spring/com/context-idgen.xml +++ b/src/main/resources/egovframework/spring/com/context-idgen.xml @@ -2844,7 +2844,8 @@ - + + @@ -2861,4 +2862,24 @@ + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/egovframework/sqlmap/config/mysql/sql-map-config-mysql-kccadr-adjcourtcnctn.xml b/src/main/resources/egovframework/sqlmap/config/mysql/sql-map-config-mysql-kccadr-adjcourtcnctn.xml new file mode 100644 index 00000000..2c803e97 --- /dev/null +++ b/src/main/resources/egovframework/sqlmap/config/mysql/sql-map-config-mysql-kccadr-adjcourtcnctn.xml @@ -0,0 +1,7 @@ + + + + + + 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 new file mode 100644 index 00000000..a93e0516 --- /dev/null +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjCourtCnctn/AdjCourtCnctn_SQL_Mysql.xml @@ -0,0 +1,70 @@ + + + + + + + + + + INSERT INTO ADJ_COURT_CNCTN_MGR ( + COURT_SEQ + , COURT_NUM + , COURT_ORG_NO + , COURT_NO + , DCSN_DE + , RCV_DE + , ALCTN_DE + , ALCTN_MONTH + , OFFICE_WORK_DE + , RPRT_DE + , RPRT_MONTH + , PROCESS_DAY + , APLCN_INFO + , RSPND_INFO + , APLCN_DPTY + , RSPND_DPTY + , COURT_RSLT + , COURT_DETAIL_RSLT + , ADJ_CMSNR + , PAY + , APP_DE + , PYMNT_DAY + , EXTNS + , RMRKS + , USE_YN + , FRST_REGIST_PNTTM + , FRST_REGISTER_ID + ) VALUES ( + #courtSeq# + , #courtNum# + , #courtOrgNo# + , #courtNo# + ,TO_DATETIME(TO_CHAR(#dcsnDe#,'YYYY-MM-DD')) + ,TO_DATETIME(TO_CHAR(#rcvDe#,'YYYY-MM-DD')) + ,TO_DATETIME(TO_CHAR(#alctnDe#,'YYYY-MM-DD')) + , #alctnMonth# + ,TO_DATETIME(TO_CHAR(#officeWorkDe#,'YYYY-MM-DD')) + ,TO_DATETIME(TO_CHAR(#rprtDe#,'YYYY-MM-DD')) + , #rprtMonth# + , #processDay# + , #aplcnInfo# + , #rspndInfo# + , #aplcnDpty# + , #rspndDpty# + , #courtRslt# + , #courtDetailRslt# + , #adjCmsnr# + , #pay# + , #appDe# + , #pymntDay# + , #extns# + , #rmrks# + , #useYn# + ,NOW() + ,TO_DATETIME(TO_CHAR(#frstRegisterId#,'YYYY-MM-DD')) + ) + + + + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnList.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnList.jsp new file mode 100644 index 00000000..48710947 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnList.jsp @@ -0,0 +1,277 @@ +<%@ page contentType="text/html; charset=utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> + + + +의견정보 + + + + +
+ + "/> +
+
+
+

과거사건목록

+
    +
    • + + + +
  • 과거사건 기록 목록
    • +
+
+ +
+ + + +
+ <%--

총 건수 : 건

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

    구분

    + + + +
    • +
  • +

    조정상태

    +
    + + + + + + checked > + + + + checked > + + + + checked > + + + + checked > + + +
    +
    • +
  • +

    신청일자

    +
    + + + + + + + + + + + + + + + + +
    +
    + +
    + + +
    +
    + ~ +
    + +
    + + +
    +
    +
    +
    +
    • +
+
+
+
+
+

총 건 입니다.

+
+ + + + + + + +
+
+ +
+
피신청인 정보 : 피신청인 분류, 피신청인 이름, 주소, 이메일, 연락처등의 정보제공
+ + + + + + + + + + + + + + + + + + + + + + + ')"> + + + + + + +<%-- --%> + + + + + + + + + +
번호조정번호신청인피신청인조사관조정부저작물종류조정결과작성여부
+ + + + + + + ')" title="상세페이지로 이동"> + + + - + + + + + + + + + 작성중 + + + 작성완료 + + +
+
+ + + +
+ +
+ + +
+ +
+ +
+
+ + +
" method="post"> + +
+ + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnRegist.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnRegist.jsp new file mode 100644 index 00000000..b6fec8d3 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnRegist.jsp @@ -0,0 +1,326 @@ +<%@ 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/adjReqMgrPast/tab/adjCloseTab0.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/tab/adjCloseTab0.jsp index 2a9eb297..7cf2eea1 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/tab/adjCloseTab0.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/tab/adjCloseTab0.jsp @@ -330,9 +330,11 @@ function goToEntDetailNotice(){
-
- -
+
+
+
+ +