feat : 과거사건상세 - 조정사건 일반:신청취지,원인 추가 - 신청정보 이력 정보 추가

src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java

@@ -49,4 +49,6 @@ public interface AdjReqMgrPastService {
 
 	Map<String, Object> selectAdjPastCloseTab0(AdjReqMgrPastVO adjReqMgrPastVO);
 
+	Map<String, Object> selectAdjPastCloseTab2(AdjReqMgrPastVO adjReqMgrPastVO);
+	
 }

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<AdjReqMgrPastVO> selectHstryInfo(AdjReqMgrPastVO adjReqMgrPastVO) {
+		return (List<AdjReqMgrPastVO>) list("adjReqMgrPastDAO.selectHstryInfo", adjReqMgrPastVO);
+	}
+
 	
 }

src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java

@@ -1003,17 +1003,28 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
 		
 		Map<String, Object> map = new HashMap<String, Object>();
 
+		// 신청정보
 		AdjReqMgrPastVO adjReqMgrPastMainVO = adjReqMgrPastDAO.selectMainInfo(adjReqMgrPastVO);
-		List<AdjReqMgrPastVO> adrPrtclMgrInfoVO = adjReqMgrPastDAO.selectAdrPrtclMgrInfo(adjReqMgrPastVO); 
 		
-		adrPrtclMgrInfoVO.forEach(t-> System.out.println("t.getReObRpplNm() :: "+ t.getReObRpplNm()));
+		// 기일조서 정보
+		List<AdjReqMgrPastVO> adrPrtclMgrInfoVO = adjReqMgrPastDAO.selectAdrPrtclMgrInfo(adjReqMgrPastVO); 
 
 		decryptInfomation(adjReqMgrPastMainVO);
 		map.put("adjReqMgrPastMainVO", adjReqMgrPastMainVO);
 		map.put("adrPrtclMgrInfoVO", adrPrtclMgrInfoVO);
 
+		return map;
+	}
 	
 	
+	@Override
+	public Map<String, Object> selectAdjPastCloseTab2(AdjReqMgrPastVO adjReqMgrPastVO) {
+		
+		Map<String, Object> map = new HashMap<String, Object>();
+		
+		// 과거사건 - 신청정보
+//		List<AdjReqMgrPastVO> adjReqMgrPastHstryVO = adjReqMgrPastDAO.selectHstryInfo(adjReqMgrPastVO);
+		map.put("adjReqMgrPastHstryVO", adjReqMgrPastDAO.selectHstryInfo(adjReqMgrPastVO));
 		
 		return map;
 	}

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<String, Object> 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<String, Object> tab2ResultMap = adjReqMgrPastService.selectAdjPastCloseTab2(adjReqMgrPastVO);
+		model.addAttribute("hstryVOList", tab2ResultMap.get("adjReqMgrPastHstryVO"));
+		
 		return "kccadr/adjReqMgrPast/tab/adjCloseTab2";
 	}
 

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#
 	</select>
 	
+	<select id="adjReqMgrPastDAO.selectHstryInfo" parameterClass="AdjReqPastVO" resultClass="AdjReqPastVO">
+	
+		SELECT
+			ADR_SEQ           AS adrSeq           
+			, ADR_SN            AS adrSn            
+			, ADR_HSTRY_SEQ     AS adrHstrySeq    
+			, TO_CHAR(HSTRY_DE, 'YYYY-MM-DD') AS hstryDe   
+			, HSTRY_CN          AS hstryCn          
+			, ATCH_FILE_ID      AS atchFileId      
+			, TO_CHAR(FRST_REGIST_PNTTM, 'YYYY-MM-DD') AS frstRegistPnttm   
+			, FRST_REGISTER_ID  AS frstRegisterId  
+			, TO_CHAR(LAST_UPDT_PNTTM, 'YYYY-MM-DD') AS lastUpdtPnttm   
+			, LAST_UPDUSR_ID    AS lastUpdusrId    
+		FROM ADR_HSTRY
+		WHERE ADR_SEQ = #adrSeq#
+		AND ADR_SN = '1'
+	
+	</select>
 
 	
 	

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';
 		}
 	}
 

src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/tab/adjCloseTab0.jsp

@@ -131,10 +131,6 @@ function goToEntDetailNotice(){
 							</td>
 						</tr>
 						<tr>
-<!-- 							<th>신청금액</th> -->
-<!-- 							<td> -->
-<%-- 								<p><c:out value="${mainVO.adrCost}" /></p> --%>
-<!-- 							</td> -->
 							<th>종결상태</th>
 							<td>
 								<p><kc:code codeId="CC013" code="${mainVO.statCd}"/></p>
@@ -147,12 +143,6 @@ function goToEntDetailNotice(){
 									<c:out value="${mainVO.memDeptNm}" />
 								</p>
 							</td>
-<!-- 							<th>조정위원</th> -->
-<!-- 							<td> -->
-<!-- 								<p> -->
-<%-- 									<c:out value="${mainVO.memNames}" /> --%>
-<!-- 								</p> -->
-<!-- 							</td> -->
 						</tr>
 						<tr>
 							<th>조정 조사관</th>
@@ -171,6 +161,62 @@ function goToEntDetailNotice(){
 					</tbody>
 				</table>
 			</div>
+			<!--   -->
+			<!--   -->
+			<!--   -->
+			
+			
+			<!-- 조정정보 -->
+			<div class="tb_tit">
+				<p>신청 정보</p>
+			</div>
+			<div class="tbType02">
+				<table>
+					<colgroup>
+						<col style="width: 210px;">
+						<col style="width: auto;">
+					</colgroup>
+					<tbody>
+						<tr>
+							<th>저작물 종류</th>
+							<td>
+								<kc:code codeId="CC002" code="${mainVO.ccTy}"/> 
+							</td>
+						</tr>
+						<tr style="height: 200px;">
+							<th>신청취지</th>
+							<td>
+								<c:out value="${mainVO.reqCn1 }" />
+							</td>
+						</tr>
+						<tr style="height: 200px;">
+							<th>신청원인</th>
+							<td>
+								<c:out value="${mainVO.reqCn2 }" />
+							</td>
+						</tr>
+					</tbody>
+				</table>
+			</div>
+			
+			
+			
+			
+			
+			
+			
+			<!--   -->
+			<!--   -->
+			<!--   -->
+			<!--   -->
+			<!--   -->
+			
+			
+			
+			
+			
+			
+			
 			
 			
 			<c:forEach var="prtclVO" items="${prtclMgrVO }" varStatus="status" >

src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/tab/adjCloseTab2.jsp

@@ -12,18 +12,17 @@
 <html>
 <head>
 <meta http-equiv="Content-Language" content="ko" >
-<title>조정종결상세</title>
+<title>조정종결상세 - 신청정보</title>
 <script type="text/javaScript" language="javascript">
 
-function fn_egov_downFile(atchFileId, fileSn){
-	window.open("/cmm/fms/FileDown.do?atchFileId="+atchFileId+"&fileSn="+fileSn+"");
-}
+// function fn_egov_downFile(atchFileId, fileSn){
+// 	window.open("/cmm/fms/FileDown.do?atchFileId="+atchFileId+"&fileSn="+fileSn+"");
+// }
 
 </script>
 </head>
 <body>
 <form:form id="tabForm1" onsubmit="return false;" method="post">
-	<input type="hidden" id="adrNo" name="adrNo" value="<c:out value="${info.adrNo}" />" />
 		<!-- //cont_tit -->
 		<div class="tab_cont on">
 			<p class="tb_tit">신청 정보</p>
@@ -31,52 +30,33 @@ function fn_egov_downFile(atchFileId, fileSn){
 				<table>
 					<colgroup>
 						<col style="width: 15%">
-						<col style="width: 15%">
+						<col style="width: 60%">
 						<col style="width: auto;">
-<%-- 						<col style="width: 15%;"> --%>
 					</colgroup>
 
 					<thead>
 						<tr>
-							<th>일자 <button type="button" class="btn_sort">▲</button></th>							
+							<th>일자 </th>							
 							<th>내용</th>
 							<th>비고</th>
 						</tr>
 					</thead>
 
 					<tbody>
-						<c:forEach var="list" items="${list}" varStatus="status">
-							<c:if test="${list.hstryCn ne ''}">
-					        	<tr>
-					                <td>
-					                    <p>${list.hstryDe}</p>
-					                </td>
-					                <td class="td_info">                
-					                	<c:if test="${list.adrDocCn1*1 eq 1}">
-					                		<kc:code codeId="CC013" code="${list.statCd}"/>
-					                	</c:if>
-					                	<c:if test="${list.adrDocCn1*1 eq 2}">
-					                		${list.statCd}
-					                	</c:if>
-					                	<c:if test="${list.adrDocCn1*1 eq 3}">
-					                		${list.hstryDetailCn} ${list.statCd} <kc:code codeId="CC044" code="${list.hstryCn}"/> 제출
-					                	</c:if>
-					                	
-					                    <!--
-					                    <a href="#">${list.hstryCn}</a> 
-					                     -->
-					                </td>
-					                <td> <p>
-					                	<c:if test="${list.adrDocCn1*1 ne 1 and list.adrDocCn1*1 ne 4 and list.adrDocCn1*1 ne 3}">
-					                		${list.hstryCn}
-					                	</c:if>                
-					                
-					                </p></td>
-					            </tr>
-					        </c:if>   
-					        
+						<c:forEach var="list" items="${hstryVOList}" varStatus="status">
+				        	<tr>
+				                <td>
+				                    <p>${list.hstryDe}</p>
+				                </td>
+				                <td>
+									<p>${list.hstryCn}</p>
+				                </td>
+				                <td>
+									<p>${list.hstryDetailCn}</p>
+				                </td>
+				            </tr>
 						</c:forEach>
-						<c:if test="${empty list}">
+						<c:if test="${empty hstryVOList}">
 							<tr><td colspan="3"><spring:message code="common.nodata.msg" /></td></tr>
 						</c:if>
 					</tbody>