Merge branch 'master' of http://hylee@vcs.iten.co.kr:9999/hylee/kcc_adr_advc_git

src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java

@@ -2,12 +2,12 @@ package kcc.kccadr.accdnt.ars.web;
 
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
 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;
@@ -30,8 +30,12 @@ import kcc.kccadr.accdnt.ai.service.AdjstIncidentService;
 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.dlvinfo.service.DlvinfoService;
+import kcc.kccadr.adjPgrMgr.dlvinfo.service.DlvinfoVO;
 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;
@@ -89,6 +93,16 @@ public class AdjstReqStatusController {
 
     @Resource(name = "ExmpAppManageService")
     private ExmpAppManageService exmpAppManageService;
+    
+    @Resource(name = "dlvinfoService")
+    private DlvinfoService dlvinfoService;
+    
+    @Resource(name = "adjRpplService")
+    private AdjRpplService adjRpplService;
+    
+    
+    
+    
 	/**
 	 * 조정진행 상태 및 관리 목록 화면
 	 */
@@ -220,7 +234,9 @@ public class AdjstReqStatusController {
 	public String adjstReqStatusTabDetail(
 					  @ModelAttribute("adjstReqStatusVO") AdjstReqStatusVO adjstReqStatusVO
 					, @ModelAttribute("adjstIncidentVO") AdjstIncidentVO adjstIncidentVO
-					, ModelMap model) throws Exception {
+					, ModelMap model
+					, HttpServletRequest request
+					, HttpServletResponse response) throws Exception {
 
 		// 조정신청 관련인 조회
 		List<AdjstReqStatusVO> list =  adjstReqStatusService.selectAdjstReqRpplInfo(adjstReqStatusVO);
@@ -278,6 +294,29 @@ 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<DlvinfoVO> dlvinfoList = dlvinfoService.selectAdjustDlvryList(dlvinfoVO);
+		
+		model.addAttribute("dlvinfoList", dlvinfoList);
 		
 		return "/web/kccadr/accdnt/ars/tab/adjstReqStatusTabDetail";
 	}

src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/DlvinfoService.java

@@ -32,6 +32,7 @@ public interface DlvinfoService {
 			
     DlvinfoVO selectDlvryInfo(DlvinfoVO dlvinfoVO) throws Exception;
     
+    List<DlvinfoVO> selectAdjustDlvryList(DlvinfoVO dlvinfoVO) throws Exception;
     
     /*
      * List<Object> getDlvryDocTyList(AdrInfoVO adrInfoVO);

src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/impl/DlvinfoDAO.java

@@ -64,4 +64,9 @@ public class DlvinfoDAO extends EgovAbstractDAO {
         return (DlvinfoVO) select("Dlvinfo.selectDlvryInfo", dlvinfoVO);
     }
     
+    @SuppressWarnings("unchecked")
+	public List<DlvinfoVO> selectAdjustDlvryList(DlvinfoVO dlvinfoVO) throws Exception {
+		return (List<DlvinfoVO>) list("Dlvinfo.selectAdjustDlvryList", dlvinfoVO);
+	}
+
 }

src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/impl/DlvinfoServiceImpl.java

@@ -154,8 +154,13 @@ public class DlvinfoServiceImpl implements DlvinfoService {
         return dlvinfoDAO.selectDlvryInfo(dlvinfoVO);
     }
     
+    @Override
+	public List<DlvinfoVO> selectAdjustDlvryList(DlvinfoVO dlvinfoVO) throws Exception {
+		return dlvinfoDAO.selectAdjustDlvryList(dlvinfoVO);
+	}
 
-    /**
+
+	/**
      * 신청인, 피신청인 복호화
      *
      * @param result

src/main/java/kcc/kccadr/adjRppl/service/AdjRpplService.java

@@ -39,4 +39,6 @@ public interface AdjRpplService {
 	public void deleteXxx2(AdjRpplVO xxxVO) throws Exception;
 	*/
 	public AdjRpplVO selectAdjRpplDetail(AdjRpplVO adjRpplVO) throws Exception;
+	
+	public AdjRpplVO selectAdjRpplInfo(AdjRpplVO adjRpplVO) throws Exception;
 }

src/main/java/kcc/kccadr/adjRppl/service/impl/AdjRpplDAO.java

@@ -61,4 +61,8 @@ public class AdjRpplDAO extends EgovAbstractDAO {
 	public AdjRpplVO selectAdjRpplDetail(AdjRpplVO adjRpplVO) {
 		 return (AdjRpplVO) select("adjRpplDAO.selectAdjRpplDetail", adjRpplVO);
 	}
+	
+	public AdjRpplVO selectAdjRpplInfo(AdjRpplVO adjRpplVO) throws Exception {
+		return (AdjRpplVO) select("adjRpplDAO.selectAdjRpplInfo", adjRpplVO);
+	}
 }

src/main/java/kcc/kccadr/adjRppl/service/impl/AdjRpplServiceImpl.java

@@ -84,4 +84,10 @@ public class AdjRpplServiceImpl  extends EgovAbstractServiceImpl implements AdjR
 	public AdjRpplVO selectAdjRpplDetail(AdjRpplVO adjRpplVO) throws Exception {
 		return adjRpplDAO.selectAdjRpplDetail(adjRpplVO);
 	}
+	@Override
+	public AdjRpplVO selectAdjRpplInfo(AdjRpplVO adjRpplVO) throws Exception {
+		return adjRpplDAO.selectAdjRpplInfo(adjRpplVO);
+	}
+	
+	
 }

src/main/java/kcc/kccadr/kccadrCom/web/KccadrCommonController.java

@@ -236,9 +236,8 @@ public class KccadrCommonController {
 			}
 		}
 		
-		/*String resultUrl = "https://service.epost.go.kr/trace.RetrieveDomRigiTraceList.comm?sid1=" + sid;*/
+		String resultUrl = "https://service.epost.go.kr/trace.RetrieveDomRigiTraceList.comm?sid1=" + sid;
-		String resultUrl = "https://service.epost.go.kr/trace.RetrieveDomRigiTraceList.comm?sid1=" + "6401780018896";
+		
-//		https://service.epost.go.kr/trace.RetrieveDomRigiTraceList.comm?sid1=6401780018896
 		return "redirect:" + resultUrl;
 	}
 

src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/dlvinfo/Dlvinfo_SQL_Mysql.xml

@@ -388,4 +388,25 @@
 	
 	</select>
 	
+	<select id="Dlvinfo.selectAdjustDlvryList" parameterClass="DlvinfoVO" resultClass="DlvinfoVO">
+	
+		SELECT a.adr_seq           AS adrSeq,
+		       a.adr_sn            AS adrSn,
+		       a.dlvry_seq         AS dlvrySeq,
+		       a.rppl_ty           AS rpplTy,
+		       a.rppl_nm           AS rpplNm,
+		       a.reg_nm            AS regNm,
+		       a.dlvry_doc_ty      AS dlvryDocTy,
+		       a.send_de           AS sendDe,
+		       a.rec_de            AS recDe,
+		       a.frst_regist_pnttm AS frstRegistPnttm,
+		       a.frst_register_id  AS frstRegisterId,
+		       a.last_updt_pnttm   AS lastUpdtPnttm,
+		       a.last_updusr_id    AS lastUpdusrId
+		FROM   adr_dlvry a
+		WHERE  a.adr_seq = #adrSeq#
+		AND    a.rppl_nm = #rpplNm#
+	
+	</select>
+
 </sqlMap>

src/main/resources/egovframework/sqlmap/kccadr/adjrppl/AdjRppl_SQL_Mysql.xml

@@ -61,4 +61,53 @@
 		</isNotEmpty>
 
 	</select>
+	
+	<select id="adjRpplDAO.selectAdjRpplInfo" parameterClass="AdjRpplVO" resultClass="AdjRpplVO">
+	
+		SELECT a.adr_seq            AS adrSeq ,
+		       a.rppl_seq           AS rpplSeq ,
+		       a.rppl_ty            AS rpplTy ,
+		       a.agnt_yn            AS agntYn ,
+		       a.rppl_usr_ty        AS rpplUsrTy ,
+		       a.adr_ol_yn          AS adrOlYn ,
+		       a.rppl_id            AS rpplId ,
+		       a.rppl_nm            AS rpplNm ,
+		       a.rppl_biz_id        AS rpplBizId ,
+		       a.rppl_biz_nm        AS rpplBizNm ,
+		       a.rppl_biz_no        AS rpplBizNo ,
+		       a.rppl_post          AS rpplPost ,
+		       a.rppl_addr          AS rpplAddr ,
+		       a.rppl_addr_dtl      AS rpplAddrDtl ,
+		       a.rppl_addr_cp_yn    AS rpplAddrCpYn ,
+		       a.rppl_real_post     AS rpplRealPost ,
+		       a.rppl_real_addr     AS rpplRealAddr ,
+		       a.rppl_real_addr_dtl AS rpplRearAddrDtl ,
+		       a.rppl_phone         AS rpplPhone ,
+		       a.rppl_email         AS rpplEmail ,
+		       a.rppl_email_yn      AS rpplEmailYn ,
+		       a.rppl_sms_yn        AS rpplSmsYn ,
+		       a.rppl_class         AS rpplClass ,
+		       a.rppl_grade         AS rpplGrade ,
+		       a.sbmt_yn            AS sbmtYn ,
+		       a.sbmt_de            AS sbmtDe ,
+		       a.usr_ci             AS usrCi ,
+		       a.appr_yn            AS apprYn ,
+		       a.appr_de            AS apprDe ,
+		       a.atch_file_id       AS atchFileId ,
+		       a.frst_regist_pnttm  AS frstRegistPnttm ,
+		       a.frst_register_id   AS frstRegisterId ,
+		       a.last_updt_pnttm    AS lastUpdtPnttm ,
+		       a.last_updusr_id     AS lastUpdusrId ,
+		       a.rppl_relation      AS rpplrelation ,
+		       a.rppl_relation_etc  AS rpplRelationEtc ,
+		       a.rppl_conn_no       AS rpplConnNo ,
+		       a.rppl_rltn_ty       AS rpplRltnTy ,
+		       a.rppl_rltn_cn       AS rpplRltnCn ,
+		       a.rppl_respdd_seq    AS rpplRespddSeq
+		FROM   adr_rppl a
+		WHERE  a.adr_seq = #adrSeq#
+		AND    a.rppl_id = #rpplId#
+	
+	</select>
+	
 </sqlMap>

src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/adjstReqStatusTabDetail.jsp

@@ -5,7 +5,7 @@
 <%@ 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"%>
 <!DOCTYPE html>
 <html lang="ko">
 <head>
@@ -100,8 +100,8 @@
 	
 	//송달정보 조회
 	function fnPostChk(){
-		commonPopWindowopenForm("/web/kccadr/kccadrCom/postCheckLink.do?sid=123", "1200", "1000", "postChkPop", $('#pop'));
+		var regNm = $("#dlvryInfoSelect option:selected").val();
-// 		location.href = "/web/kccadr/kccadrCom/postCheckLink.do?sid=123";
+		commonPopWindowopenForm("/web/kccadr/kccadrCom/postCheckLink.do?sid=" + regNm, "1200", "1000", "postChkPop", $('#pop'));
 	}
 </script>
 <!-- 워크플로우용 스크립트 시작 -->
@@ -189,6 +189,7 @@
 		<input type="hidden" id="adrSeq" name="adrSeq" value="<c:out value="${adjstReqStatusVO.adrSeq}" />" />
 		<input type="hidden" id="adrSn" name="adrSn" value="<c:out value="${adjstReqStatusVO.adrSn}" />" />
 		<input type="hidden" id="memDeptSeq" name="memDeptSeq" value="<c:out value="${master.memDeptSeq}" />" />
+		<input type="hidden" id="regNm" name="regNm" value=""/>
 	</form>
 
 	<%--reqInfo
@@ -318,12 +319,14 @@ resInfo--%>
 					</p>
 				</div>
 			</c:if>
-			
+			<c:if test="${!empty dlvinfoList }">
-			<select class="exp_select" id="dlvryInfoSelect">
+				<select class="exp_select" id="dlvryInfoSelect">
-				<option value="기일통지서">기일통지서</option>
+					<c:forEach var="option" items="${dlvinfoList}" varStatus="status"> 
-				<option value="기일조서">기일조서</option>
+						<option value="${option.regNm}"><kc:code codeId="CC004" code="${option.dlvryDocTy}"/></option>
-			</select>
+					</c:forEach>
-			<button type="button" class="btnType07" onclick="fnPostChk();" style="vertical-align:middle;">송달정보 조회</button>
+				</select>
+				<button type="button" class="btnType07" onclick="fnPostChk();" style="vertical-align:middle;">송달정보 조회</button>
+			</c:if>
 
 			<div class="tb_wrap">
 				<table class="tbType01">