Merge branch 'tolag3'

src/main/java/kcc/kccadr/accdnt/ars/service/AdjstReqStatusVO.java

@@ -42,6 +42,8 @@ public class AdjstReqStatusVO extends AdjstIncidentVO {
     private String adrAdmNm;
     
     private String docTy;
+    
+    private String rpplUsrTyNm;
 
     public String getAdrSn() {
         return adrSn;
@@ -232,6 +234,16 @@ public class AdjstReqStatusVO extends AdjstIncidentVO {
 	public void setDocTy(String docTy) {
 		this.docTy = docTy;
 	}
+
+	public String getRpplUsrTyNm() {
+		return rpplUsrTyNm;
+	}
+
+	public void setRpplUsrTyNm(String rpplUsrTyNm) {
+		this.rpplUsrTyNm = rpplUsrTyNm;
+	}
+	
+	
 	
 	
 }

src/main/resources/egovframework/sqlmap/kccadr/accdnt/ars/AdjustReqStatus_SQL_Mysql.xml

@@ -179,6 +179,12 @@
 			,FRST_REGISTER_ID AS frstRegisterId
 			,LAST_UPDT_PNTTM AS lastUpdtPnttm
 			,LAST_UPDUSR_ID AS lastUpdusrId
+			,( SELECT CODE_NM
+		       FROM    LETTCCMMNDETAILCODE
+		       WHERE   CODE_ID = 'CC001'
+		       AND     CODE    = RPPL_USR_TY
+		       )
+		       AS RPPL_USR_TY_NM
 		FROM ADR_RPPL
 		WHERE 1=1
 		AND ADR_SEQ = #adrSeq#

src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovUserManage.jsp

@@ -194,7 +194,7 @@ function userListExcelDownload(){
 							<col style="width: 10%">
 							<col style="width: 10%">
 							<col style="width: 10%">
-							<col style="width: 10%">
+							<%-- <col style="width: 10%"> --%>
 							<col style="width: 10%">
 							<col style="width: 10%">
 							<col style="width: 10%">
@@ -208,11 +208,11 @@ function userListExcelDownload(){
 								<th scope="col">권한<button class="sort sortBtn" id="sort_authorCodeTxt">▲</button></th>
 								<th scope="col">아이디<button class="sort sortBtn" id="sort_userId">▲</button></th>
 								<th scope="col">성명<button class="sort sortBtn" id="sort_userNm">▲</button></th>
-								<th scope="col">소속<button class="sort sortBtn" id="sort_partIdxTxt">▲</button></th>
+								<!-- <th scope="col">소속<button class="sort sortBtn" id="sort_partIdxTxt">▲</button></th> -->
 								<th scope="col">직책<button class="sort sortBtn" id="sort_ofcpsNm">▲</button></th>
 								<th scope="col">전화번호<button class="sort sortBtn" id="sort_offmTelno">▲</button></th>
-								<th scope="col">전화번호<button class="sort sortBtn" id="sort_offmTelno">▲</button></th>
 								<th scope="col">팩스번호<button class="sort sortBtn" id="sort_fxNum">▲</button></th>
+								<th scope="col">담당업무<!-- <button class="sort sortBtn" id="sort_fxNum">▲</button> --></th>
 								<th scope="col">등록일<button class="sort sortBtn" id="sort_sbscrbDe">▲</button></th>
 							</tr>
 						</thead>
@@ -248,9 +248,9 @@ function userListExcelDownload(){
 									<span class="privateInfo"><c:out value="${result.userNm}"/></span>
 								</td>
 								
-								<td>
+								<%-- <td>
 									<span><c:out value="${result.partIdxTxt}"/></span>
-			                    </td>
+			                    </td> --%>
 			                    
 			                    <td>
 			                    	<c:set var="ofcpsNm" value="" />

src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageDetail.jsp

@@ -796,6 +796,8 @@
 <input type="hidden" name="adrSn" id="adrSn" value="<c:out value='${info.adrSn}'/>"/>
 <input type="hidden" name="sbmtSeq" id="sbmtSeq" value="<c:out value='${info.sbmtSeq}'/>"/>
 <input type="hidden" name="sbmtTy" id="sbmtTy" value="<c:out value='${info.sbmtTy}'/>"/>
+<!-- 오프라인/온라인 구분 -->
+<input type="hidden" name="reqOlCd" id="reqOlCd" value="<c:out value='${info.reqOlCd}'/>"/>
 
 <div class="cont_wrap">
 	<div class="box">

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

@@ -224,18 +224,71 @@ resInfo--%>
 			<tbody>
 				<tr>
 					<th scope="row">
-						<p>신청인123</p>
+						<p>신청인</p>
 					</th>
 					<td>
 						<p><c:out value='${reqInfo.rpplNm}' /></p>
 					</td>
-					<th scope="row">
+					<%-- <th scope="row">
 						<p>주소</p>
 					</th>
 					<td>
 						<p>(<c:out value='${reqInfo.rpplPost}' />) <c:out value='${reqInfo.rpplAddr}' /> <c:out value='${reqInfo.rpplAddrDtl}' /></p>
+					</td> --%>
+					<th scope="row">
+						<p>신청인 분류</p>
+					</th>
+					<td>
+						<p><c:out value='${reqInfo.rpplUsrTyNm}'/></p>
 					</td>
+					
 				</tr>
+				<c:forEach var="List" items="${resInfo}" varStatus="status">
+					<c:if test="${status.count eq 1}">
+						<th scope="row" class="">
+							<p>피신청인 1</p>
+						</th>
+						<td>
+							<p><c:out value="${List.rpplNm}"/></p>
+						</td>
+					</c:if>
+					<c:if test="${status.count eq 2}">
+						<th scope="row" class="">
+							<p>피신청인 2</p>
+						</th>
+						<td>
+							<p><c:out value="${List.rpplNm}"/></p>
+						</td>
+					</c:if>
+					<c:if test="${status.count eq 3}">
+						</tr>
+						<tr>
+				     		<th scope="row" class="">
+					            <p>피신청인 3</p>
+					        </th>
+					        <td>
+					        	<p><c:out value="${List.rpplNm}"/></p>
+				        	</td>
+				     </c:if>
+				     <c:if test="${status.count eq 4}">
+			     		<th scope="row" class="">
+				            <p>피신청인 4</p>
+				        </th>
+				        <td>
+				        	<p><c:out value="${List.rpplNm}"/></p>
+			        	</td>
+		     		</c:if>
+		     		<c:if test="${status.count eq 5}">
+			     		<tr>
+				     		<th scope="row" class="">
+					            <p>피신청인 5</p>
+					        </th>
+					        <td>
+					        	<p><c:out value="${List.rpplNm}"/></p>
+				        	</td>
+			        	</tr>
+		     		</c:if>
+			    </c:forEach>
 			</tbody>
 		</table>