자산정보추가, 점검보고서 인쇄 방식 변경

src/main/java/com/urpsys/itmsfront/srm/controller/ReportCheckController.java

@@ -214,6 +214,7 @@ public class ReportCheckController
     	Map<String, Object> returnMap = new LinkedHashMap();
 
     	int inReportSeq = CommonUtil.zeroConvert(reportCheckListVo.getInReportSeq());
+    	String strAssetDtlYn = CommonUtil.getData(request, "assetDtlYn"); // 2025.08.19 나혁제 자산정보 상세여부
 		
     	// Body Setting Start ---------------------------------
 	  	bodyMap.put("inReportSeq", inReportSeq);
@@ -250,6 +251,7 @@ public class ReportCheckController
     	model.addAttribute("privType"        ,  privType       ); // String
     	model.addAttribute("incidentId"      ,  incidentId     ); // String
     	model.addAttribute("approvalReq"     ,  approvalReq    ); // int
+    	model.addAttribute("assetDtlYn"      ,  strAssetDtlYn  ); // 2025.08.19 나혁제 자산정보 상세여부 
     	
     	model.addAttribute("resultReport"     ,  resultReportCheck ); // Map
     	model.addAttribute("resultSharings"   ,  resultSharings    ); // List

src/main/webapp/WEB-INF/jsp/itms/rem/ResourceDetail.jsp

@@ -236,6 +236,25 @@
 					 			,"dialogWidth:1800px;dialogHeight:500px;resizable:yes;center:yes");
 	}
 	
+	//----------------------------------------
+	// 2025.08.18 나혁제 추가 
+	// 그룹조회
+	// ----------------------------------------
+	function fncSelectAuthorGroupPop() 
+	{
+	    window.open("<c:url value='/sys/GroupSearchList.do?resType=P'/>","notice","height=500, width=650, top=50, left=20, scrollbars=no, resizable=no");
+	}
+	
+	//----------------------------------------
+	// 2025.08.18 나혁제 추가 
+	// 그룹조회 후 응답 함수 
+	// ----------------------------------------
+	function resGroupConfirm(strGroupId, strGroupNm)
+	{
+		$('#vcGrpNm').val(strGroupNm);
+		$('#vcGrpId').val(strGroupId);
+	}
+	
 	
 	//----------------------------------------
 	// 서블릿 통신
@@ -493,8 +512,17 @@
 						<td><input type="text" name="vcVersion" id="vcVersion" value="${resultAsset.vcVersion}"/></td>
 						<th>시리얼</th>
 						<td><input type="text" name="vcAssetSerial" id="vcAssetSerial" value="${resultAsset.vcAssetSerial}"/></td>
-						<th></th>
+						<th>관리그룹</th>
-						<td></td>
+						<td>
+							<input type="text" name="vcGrpNm" id="vcGrpNm" value="${resultAsset.vcGrpNm}" style="width:80%;" />
+							
+							<a href="<c:url value='/sys/GroupSearchList.do' />" target="_blank"   title="새 창으로 이동"  onclick="fncSelectAuthorGroupPop();return false;">
+							<img src="<c:url value='/egov/images/egovframework/com/cmm/btn/btn_search.gif' />" alt="조치예정자 검색" title="조치예정자 검색">
+							</a>
+							
+							<input type="hidden" name="vcGrpId" id="vcGrpId" value="${resultAsset.vcGrpId}" >
+							
+						</td>
 					</tr>
 					<tr>
 						<th>호스트명</th>
@@ -504,9 +532,38 @@
 							<input type="text" class="btn_calendar" name="dtEos" id="dtEos" 
 								maxlength="10" value="${resultAsset.dtEos}" title="EOS일" readonly   style="width:80%;" />
 						</td>
+						<%-- 2025.08.18 나혁제 추가  --%>
+						<th>점검대상여부</th>
+						<td>
+							<select name="vcChkTrgYn" id="vcChkTrgYn" style="width:100px;">
+								<option value="N" <c:if test="${resultAsset.vcChkTrgYn ne 'Y'}">selected</c:if> >미대상</option>
+								<option value="Y" <c:if test="${resultAsset.vcChkTrgYn == 'Y'}">selected</c:if> >대상</option>
+							</select>
+						</td>
+					</tr>
+					
+					<!-- 2025.08.19 나혁제 자산정보추가 Start -->
+					<tr>
+						<th>상세 CPU</th>
+						<td><input type="text" name="vcDtlCpu" id="vcHost" value="${resultAsset.vcDtlCpu}" style="width:90%;" /></td>
+						<th>상세 DISK</th>
+						<td><input type="text" name="vcDtlDisk" id="vcHost" value="${resultAsset.vcDtlDisk}" style="width:90%;" /></td>
+						<th>상세 MEM</th>
+						<td><input type="text" name="vcDtlMem" id="vcHost" value="${resultAsset.vcDtlMem}" style="width:90%;" /></td>						
+					</tr>
+					
+					<tr>
+						<th>IP ADDRESS</th>
+						<td><input type="text" name="vcIp" id="vcIp" value="${resultAsset.vcIp}" style="width:90%;" /></td>
+						
+						<th></th>
+						<td></td>
+						
 						<th></th>
 						<td></td>
 					</tr>
+					<!-- 2025.08.19 나혁제 자산정보추가 End   -->
+					
 					<tr>
 						<th>용도</th>
 						<td colspan="5">

src/main/webapp/WEB-INF/jsp/itms/rem/ResourceInsert.jsp

@@ -154,7 +154,6 @@
 		$('#vcGrpId').val(strGroupId);
 	}
 	
-	
 	// 서블릿 통신
 	var proc = 
 	{
@@ -443,13 +442,14 @@
 						<%-- 2025.08.18 나혁제 추가  --%>
 						<th>점검대상여부</th>
 						<td>
-							<select name="chkTrgYn" id="chkTrgYn" style="width:100px;">
+							<select name="vcChkTrgYn" id="vcChkTrgYn" style="width:100px;">
 								<option value="N" >미대상</option>
 								<option value="Y" selected>대상</option>
 							</select>
 						</td>
 					</tr>
 					
+					<!-- 2025.08.19 나혁제 자산정보추가 Start -->
 					<tr>
 						<th>상세 CPU</th>
 						<td><input type="text" name="vcDtlCpu" id="vcHost" value="" style="width:90%;" /></td>
@@ -469,8 +469,7 @@
 						<th></th>
 						<td></td>
 					</tr>
-					
+					<!-- 2025.08.19 나혁제 자산정보추가 End   -->
-					
 					
 					<tr>
 						<th>용도</th>

src/main/webapp/WEB-INF/jsp/itms/srm/PopAssetDtlYn.jsp

@@ -0,0 +1,124 @@
+<!DOCTYPE html>
+
+<%--
+ /** 
+  * @Class Name : PopAssetDtlYn.jsp
+  * @Description : 자산상세 선택  팝엄 화면
+  * @Modification Information
+  * @
+  * @ 수정일           수정자             수정내용
+  * @ ----------    --------    ---------------------------
+  * @ 2025.08.09    나혁제          최초 생성
+  *
+  *  @author urp 인프라본부 나혁제
+  *  @since 2025.08.09
+  *  @version 1.0
+  *  @see
+  *  
+  */
+--%>
+
+<%@ page contentType="text/html; charset=utf-8" pageEncoding="utf-8"%>
+
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+
+<c:set var="pageTitle"><spring:message code="comCopSecDrm.deptSearchPopup.title"/></c:set>
+
+<title>${pageTitle} <spring:message code="title.list" /></title><!-- 부서조회팝업 목록 -->
+
+<meta http-equiv="content-type" content="text/html; charset=utf-8">
+
+<!-- 시간처리 -->
+<script type="text/javascript" src="${ctx}/js/js-calendar/jquery-ui-timepicker-addon.js"></script>
+<link rel="stylesheet" type="text/css" href="${ctx}/css/jquery-ui-timepicker-addon.css">
+
+<script type="text/javaScript" language="javascript" defer="defer">
+
+	//----------------------------------------
+	// 화면 초기화
+	// ----------------------------------------
+	$(document).ready(function()
+	{
+	});
+
+	//----------------------------------------
+	// 확인
+	// ----------------------------------------	
+	function fncConfirem()
+	{
+		var strAssetDtlYn  = $("input[name='rd_AssetDtlYn']:checked" ).val();
+		parent.fncAssetDtlChoiceCompleted(strAssetDtlYn);
+		parent.$('.ui-dialog-content').dialog('close');
+	}
+	
+	//----------------------------------------
+	// 닫기
+	// ----------------------------------------
+	function fncClose()
+	{
+		parent.$('.ui-dialog-content').dialog('close');
+	}
+	
+	
+	
+
+
+</script>
+
+
+<!-- javascript warning tag  -->
+<noscript class="noScriptTitle"><spring:message code="common.noScriptTitle.msg" /></noscript>
+<form:form name="PopCompleted" action="" method="post">
+	
+	<!-- main title -->
+	<div class="main_titWrap">
+		<h3>보고서 선택</h3>
+	</div>
+
+	<!-- Form 테이블 :start -->
+    <div class="bbs_view">
+    
+    	<!--등록폼 -->
+		<table class="tbl_form" summary="<spring:message code="common.summary.list" arguments="등록" />">
+			<caption>처리완료</caption>
+			<colgroup>
+				<col style="width: 20%;">
+				<col style="width: *%;">
+			</colgroup>
+			<tbody>
+				<tr>
+					<th> 자산상세 인쇄여부  </th>
+					<td>
+						<label class='radio_label'>
+					 	<input class='' type='radio' name='rd_AssetDtlYn' id='rd_AssetDtlYn1' value="Y" checked> 예 
+					 	<span class="radio_icon"></span>
+					 	</label>
+					 	
+					 	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+					 	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+					 	
+					 	<label class='radio_label'>
+					 	<input class='' type='radio' name='rd_AssetDtlYn' id='rd_AssetDtlYn2' value="" > 아니오
+					 	<span class="radio_icon"></span>
+					 	</label>
+					 	 	
+					</td>
+				</tr>
+			</tbody>	
+		</table>
+		
+	</div>
+	
+	<div class="btn_group">
+    	<button type="button" class="btn-function" id="btnConfirm" onclick="javascript:fncConfirem()" title="확인">확인</button>
+		<button type="button" class="btn-cancel"   id="btnCancel"  onclick="javascript:fncClose()" title="닫기">닫기</button>
+    </div>
+		    
+	</div>
+	
+	
+</form:form>

src/main/webapp/WEB-INF/jsp/itms/srm/ReportCheckDetail.jsp

@@ -137,7 +137,7 @@
 		var bYes = confirm("점검보고서 승인/반려 처리를 하시겠습니까?");
 		if(bYes==false) return;
 		
-		// 승인반려 메세지 팝업 open
+		// 승인반려 메세지 팝업 open, CallBack : fncAppRejLast
 		PopupOpen("/srm/PopApprovalReject", 340, 450, '');
 	}
 	
@@ -188,11 +188,32 @@
 	}
 	
 	//----------------------------------------
-	// 인쇄 팝업 오픈  
+	// 2025.08.19 나혁제 
+	// 인쇄 (자산상세여부 확인)
 	// ----------------------------------------
 	function fncReportCheckPrint(inReportSeq)
 	{
-		var strUrl = "/srm/getReportWithBodyCheckPrint.do?inReportSeq="+inReportSeq;
+		// 자산상세인쇄 여부 메세지 팝업 open, CallBack : fncAssetDtlChoiceCompleted
+		PopupOpen("/srm/PopAssetDtlYn", 340, 450, '');
+	}
+	
+	//----------------------------------------
+	// 2025.08.19 나혁제 
+	// 자상상세여부 팝업 콜백함수 
+	// ----------------------------------------
+	function fncAssetDtlChoiceCompleted(strAssetDtlYn)
+	{
+		fncReportCheckPrintReal(strAssetDtlYn, $('#inReportSeq').val());
+	}
+	
+	//----------------------------------------
+	// 인쇄 팝업 오픈
+	// ----------------------------------------
+	function fncReportCheckPrintReal(strAssetDtlYn, inReportSeq)
+	{
+		var strUrl = "/srm/getReportWithBodyCheckPrint.do"+"?inReportSeq="+inReportSeq
+		                                                  +"&assetDtlYn=" +strAssetDtlYn
+				;
 		
 		var arrParam = new Array(6);
 		arrParam[0] = window;

src/main/webapp/WEB-INF/jsp/itms/srm/ReportCheckPrintPop.jsp

@@ -199,6 +199,36 @@
 		<!-- 자산 영역 -->
 		<div class="tbl_list">
 			<!-- 목록영역 -->
+			<c:if test="${ assetDtlYn == 'Y'}">
+				<c:forEach var="assets" items="${resultAssets}" varStatus="status">
+				<table class="table" summary="" id="table_asset" >
+					<caption>연결자산정보  <spring:message code="title.list" /></caption>
+					<colgroup>
+						<col style="width: 25%;">
+						<col style="width: 25%;">
+						<col style="width: 25%;">
+						<col style="width: 25%;">
+					</colgroup>
+					<tbody>
+						
+						<tr>
+							<th> 구분 </th>
+							<td>
+								${assets.vcCate3}
+							</td>
+							<th>제품영</th>
+							<td></td>
+						</tr>
+						
+						
+					</tbody>
+					
+				</table>
+				</c:forEach>
+			</c:if>
+			
+			<!-- 목록영역 -->
+			<c:if test="${ assetDtlYn ne 'Y'}">
 			<table class="table" summary="" id="table_asset" >
 				<caption>연결자산정보  <spring:message code="title.list" /></caption>
 				<colgroup>
@@ -228,6 +258,9 @@
 				</tbody>
 				
 			</table>
+			</c:if>
+			
+			
 		</div>
 		
 		<textarea id="serviceBody" name="serviceBody" ></textarea>

src/main/webapp/WEB-INF/jsp/itms/srm/SvcDeskDetail.jsp

@@ -221,8 +221,9 @@
 	//  점검보고서 등록 화면 이동  
 	// ----------------------------------------
 	function fncReportRegist()
-	{
+	{ㅌ
 		// 보고서 선택 화면 메세지 팝업 open
+		// CallBack : fncReportChoiceCompleted
 		PopupOpen("/srm/PopReportChoice", 300, 450, '');
 	}