From 9d55db328104009c4733ff301c2dc53d1841cee9 Mon Sep 17 00:00:00 2001
From: eastargh <eastarnv@naver.com>
Date: Thu, 7 May 2026 09:50:49 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=EA=B4=80=EB=A6=AC?=
 =?UTF-8?q?=20-=20=EA=B2=8C=EC=8B=9C=EC=9C=A0=ED=98=95,=20=EA=B3=A0?=
 =?UTF-8?q?=EC=A0=95=EC=97=AC=EB=B6=80=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../onl/apim/portalnotice/portalNoticeMan.jsp | 71 ++++++++++++++--
 .../portalnotice/portalNoticeManDetail.jsp    | 84 ++++++++++++++-----
 .../portalnotice/PortalNoticeService.java     | 14 +++-
 .../portalnotice/PortalNoticeUISearch.java    |  1 +
 .../PortalNoticeManController.java            | 14 ++++
 .../portalnotice/PortalNoticeManService.java  | 10 ++-
 .../onl/apim/portalnotice/PortalNoticeUI.java |  5 ++
 7 files changed, 164 insertions(+), 35 deletions(-)

diff --git a/WebContent/jsp/onl/apim/portalnotice/portalNoticeMan.jsp b/WebContent/jsp/onl/apim/portalnotice/portalNoticeMan.jsp
index 6ec81bb..0980d1c 100644
--- a/WebContent/jsp/onl/apim/portalnotice/portalNoticeMan.jsp
+++ b/WebContent/jsp/onl/apim/portalnotice/portalNoticeMan.jsp
@@ -17,34 +17,75 @@
 	<script language="javascript" >
 		var url      = '<c:url value="/onl/apim/portalnotice/portalNoticeMan.json" />';
 		var url_view = '<c:url value="/onl/apim/portalnotice/portalNoticeMan.view" />';
-
+		var combo;
+		
+		function formatNoticeType(cellvalue, options, rowObject) {
+			var name = "";
+			for (var i = 0; i < combo.noticeTypeList.length; i++) {
+				if (combo.noticeTypeList[i].CODE == cellvalue) {
+					return combo.noticeTypeList[i].NAME;	
+				}
+			}
+			return cellvalue;
+		}
+		
 		function formatuseYn(cellvalue, options, rowObject) {
 			return cellvalue === 'N'
 					? '<span style="color: red;">미사용</span>'
 					: '<span>사용</span>';
 		}
+		
+		function formatFixYn(cellvalue, options, rowObject) {
+			return cellvalue === 'Y'
+					? '고정'
+					: '';
+		}
 
 		function formatFile(cellvalue, options, rowObject) {
 			var iconPath = '${pageContext.request.contextPath}/images/icon_file.png';
 			var icon = rowObject.hasAttachment ? '<img src="' + iconPath + '" alt="File Attached" style="vertical-align: middle; margin-left: 5px; width: 16px; height: 16px;">' : '';
 			return cellvalue + icon;
 		}
+		
+		
+		function init(){
+			$.ajax({
+				type : "POST",
+				url:url,
+				dataType:"json",
+				data:{cmd: 'LIST_INIT_COMBO'},
+				success:function(json){
+					console.log('init', json);
+					combo = json;
+					new makeOptions("CODE","NAME").setObj($("select[name=searchNoticeType]")).setNoValueInclude(true).setNoValue('','<%=localeMessage.getString("combo.all")%>').setData(json.noticeTypeList).rendering();
+				
+					putSelectFromParam();
+				},
+				error:function(e){
+					alert(e.responseText);
+				}
+			});
+		}
 
 		$(document).ready(function() {
+						
 			$('#grid').jqGrid({
 				datatype:"json",
 				mtype: 'POST',
 				url: url,
 				postData : { cmd : 'LIST',
+					searchNoticeType: $('select[name=searchNoticeType]').val(),
 					searchUseYn: $('select[name=searchUseYn]').val(),
 					searchNoticeSubject: $('input[name=searchNoticeSubject]').val(),
 					searchNoticeDetail: $('input[name=searchNoticeDetail]').val()
 				},
-				colNames:['id', 'No.', '제목', '사용', '마지막 수정일', '등록일', '등록자', '조회수'],
+				colNames:['id', 'No.', '게시유형', '제목', '고정여부', '사용', '마지막 수정일', '등록일', '등록자', '조회수'],
 				colModel:[
 					{ name : 'id'       	   , align:'center', key:true, hidden:true},
-					{ name : 'rowNum'          , align:'center', width:80 },
-					{ name : 'noticeSubject'   , align:'left'  , width:200 , formatter: formatFile },
+					{ name : 'rowNum'          , align:'center', width:60 },
+					{ name : 'noticeType'  	   , align:'center', width:60, formatter: formatNoticeType  },
+					{ name : 'noticeSubject'   , align:'left'  , width:300, formatter: formatFile },
+					{ name : 'fixYn'           , align:'center', width:60, formatter: formatFixYn },
 					{ name : 'useYn'           , align:'center', width:60, formatter: formatuseYn },
 					{ name : 'lastModifiedDate', align:'center', width:120 , formatter: timeStampFormat},
 					{ name : 'createdDate'     , align:'center', width:120, formatter: timeStampFormat },
@@ -98,6 +139,8 @@
 				}
 			});
 
+			init();
+
 			resizeJqGridWidth('grid','content_middle','1000');
 
 			$("#btn_search").click(function(){
@@ -140,9 +183,25 @@
 		<div class="title">공지사항 목록<span class="tooltip">공지사항을 관리합니다.</span></div>
 		<form id="ajaxForm"  onsubmit="return false;">
 			<table class="search_condition" cellspacing=0;>
+				<colgroup> 
+			        <col style="width:180px;"> 
+			        <col style="width:240px;"> 
+			        <col style="width:180px;"> 
+			        <col style="width:240px;">
+			        <col style="width:180px;"> 
+			        <col style="width:240px;">
+			    </colgroup>
 				<tbody>
 				<tr>
-					<th style="width:180px;">사용여부</th>
+					<th>게시유형</th>
+					<td>
+						<div class="select-style">
+							<select name="searchNoticeType"></select>
+						</div>
+					</td>
+					<th>제목/내용</th>
+					<td><input type="text" name="searchSubjectDetail"></td>
+					<th>사용여부</th>
 					<td>
 						<div class="select-style">
 							<select name="searchUseYn">
@@ -152,8 +211,6 @@
 							</select>
 						</div>
 					</td>
-					<th style="width:180px;">제목/내용</th>
-					<td><input type="text" name="searchSubjectDetail"></td>
 				</tr>
 				</tbody>
 			</table>
diff --git a/WebContent/jsp/onl/apim/portalnotice/portalNoticeManDetail.jsp b/WebContent/jsp/onl/apim/portalnotice/portalNoticeManDetail.jsp
index 0cdfd32..c26dad6 100644
--- a/WebContent/jsp/onl/apim/portalnotice/portalNoticeManDetail.jsp
+++ b/WebContent/jsp/onl/apim/portalnotice/portalNoticeManDetail.jsp
@@ -24,7 +24,36 @@
 	var fileInfo = null;
 
 	function init() {
+		var key = "${param.id}";
+		isDetail = key != "" && key != "null";
+
+		if (isDetail) {
+			$("#title").append(" 수정");
+			buttonControl(true);
+		} else {
+			$("#title").append(" 등록");
+			$("#btn_modify").html('<i class="material-icons">save</i> <%= localeMessage.getString("button.register") %>');
+			buttonControl(false);
+		}
+		
 		// 초기화 로직
+		$.ajax({
+			type : "POST",
+			url:url,
+			dataType:"json",
+			data:{cmd: 'LIST_INIT_COMBO'},
+			success:function(json){
+				combo = json;
+				new makeOptions("CODE","NAME").setObj($("select[name=noticeType]")).setNoValueInclude(false).setData(json.noticeTypeList).rendering();
+				
+				if (key) {
+					detail(key);
+				}
+			},
+			error:function(e){
+				alert(e.responseText);
+			}
+		});
 	}
 
 	function decodeHTMLEntities(text) {
@@ -98,8 +127,10 @@
 			data: {cmd: 'DETAIL', id: key},
 			success: function (data) {
 				$("#id").val(key);
+				$('#noticeType').val(data.noticeType);
 				$("#noticeSubject").val(data.noticeSubject);
 				$("#useYn").prop("checked", data.useYn === "Y");
+				$("#fixYn").prop("checked", data.fixYn === "Y");
 
 				var decodedContent = decodeHTMLEntities(data.noticeDetail);
 				$('#contents').summernote('code', decodedContent);
@@ -123,19 +154,9 @@
 
 	$(document).ready(function () {
 		var returnUrl = getReturnUrlForReturn();
-		var key = "${param.id}";
-		isDetail = key != "" && key != "null";
-
-		if (isDetail) {
-			$("#title").append(" 수정");
-			buttonControl(true);
-		} else {
-			$("#title").append(" 등록");
-			$("#btn_modify").html('<i class="material-icons">save</i> <%= localeMessage.getString("button.register") %>');
-			buttonControl(false);
-		}
-
+		
 		init();
+		
 
 		// Summernote 에디터 초기화 (이미지 붙여넣기 data-uri 방식, 리사이징 지원)
 		initSummernote('#contents', {
@@ -143,9 +164,6 @@
 			height: 300
 		});
 
-		if (key) {
-			detail(key);
-		}
 
 		$('#fileInput').change(function(e) {
 			var file = e.target.files[0];
@@ -175,6 +193,7 @@
 			var formData = new FormData($("#ajaxForm")[0]);
 
 			formData.set("useYn", $("#useYn").is(":checked") ? "Y" : "N");
+			formData.set("fixYn", $("#fixYn").is(":checked") ? "Y" : "N");
 			formData.set("noticeDetail", $('#contents').summernote('code'));
 
 			formData.append("cmd", isDetail ? "UPDATE" : "INSERT");
@@ -244,24 +263,43 @@
 		<form id="ajaxForm" enctype="multipart/form-data" accept-charset="UTF-8">
 			<input type="hidden" name="id" id="id">
 			<table class="table_row" cellspacing="0">
+				<colgroup>
+					<col style="width: 10%"/>
+					<col style="width: 40%"/>
+					<col style="width: 10%"/>
+					<col style="width: 40%"/>
+				</colgroup>
 				<tr>
-					<th style="width:20%;">사용여부</th>
-					<td>
-						<input type="checkbox" name="useYn" id="useYn" value="Y" ${portalNoticeUI.useYn eq 'Y' ? 'checked' : ''}> 사용</td>
+					<th>게시유형</th>
+					<td colspan="3">		
+						<div class="select-style" >
+							<select name="noticeType" id="noticeType"></select>
+						</div>
+					</td>
 				</tr>
 				<tr>
-					<th style="width:20%;">제목 <font color="red">*</font></th>
-					<td><input type="text" id="noticeSubject" name="noticeSubject" style="width:100%" data-required data-warning="제목을 입력하여 주십시오."/></td>
+					<th>제목 <font color="red">*</font></th>
+					<td colspan="3"><input type="text" id="noticeSubject" name="noticeSubject" style="width:100%" data-required data-warning="제목을 입력하여 주십시오."/></td>
 				</tr>
 				<tr>
-					<th style="width:20%;">본문 <font color="red">*</font></th>
+					<th>사용여부</th>
 					<td>
+						<input type="checkbox" name="useYn" id="useYn" value="Y" ${portalNoticeUI.useYn eq 'Y' ? 'checked' : ''}> 사용
+					</td>
+					<th>고정여부</th>
+					<td>
+						<input type="checkbox" name="fixYn" id="fixYn" value="Y" ${portalNoticeUI.fixYn eq 'Y' ? 'checked' : ''}> 고정
+					</td>
+				</tr>
+				<tr>
+					<th>본문 <font color="red">*</font></th>
+					<td colspan="3">
 						<textarea id="contents" name="noticeDetail" style="width:100%;height:300px" data-required data-warning="본문을 입력하여 주십시오."></textarea>
 					</td>
 				</tr>
 				<tr>
-					<th style="width:20%;">첨부파일</th>
-					<td>
+					<th>첨부파일</th>
+					<td colspan="3">
 						<div style="margin: 5px 0px;  display: inline-block;">
 							<input type="file" id="fileInput" name="files" style="display:none;" />
 							<button type="button" id="addFile" class="cssbtn smallBtn">파일 선택</button>
diff --git a/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalnotice/PortalNoticeService.java b/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalnotice/PortalNoticeService.java
index 8ae8b41..be03578 100644
--- a/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalnotice/PortalNoticeService.java
+++ b/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalnotice/PortalNoticeService.java
@@ -10,6 +10,9 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
+
 @Service
 @Transactional(transactionManager = "transactionManagerForEMS")
 public class PortalNoticeService extends AbstractEMSDataSerivce<PortalNotice, String, PortalNoticeRepository> {
@@ -19,6 +22,10 @@ public class PortalNoticeService extends AbstractEMSDataSerivce<PortalNotice, St
 
 		BooleanBuilder predicate = new BooleanBuilder();
 
+		if (StringUtils.isNotBlank(portalNoticeUISearch.getSearchNoticeType())) {
+			predicate.and(qPortalNotice.noticeType.eq(portalNoticeUISearch.getSearchNoticeType()));
+		}
+		
 		if (StringUtils.isNotBlank(portalNoticeUISearch.getSearchUseYn())) {
 			predicate.and(qPortalNotice.useYn.eq(portalNoticeUISearch.getSearchUseYn()));
 		}
@@ -28,7 +35,12 @@ public class PortalNoticeService extends AbstractEMSDataSerivce<PortalNotice, St
 					.or(qPortalNotice.noticeDetail.containsIgnoreCase(portalNoticeUISearch.getSearchSubjectDetail())));
 		}
 
-		return repository.findAll(predicate, pageable);
+		//return repository.findAll(predicate, pageable);
+		
+		Sort fixYnFirst = Sort.by(Sort.Direction.DESC, "fixYn");
+		Sort combinedSort = fixYnFirst.and(pageable.getSort());
+		Pageable fixedPageable = PageRequest.of(pageable.getPageNumber(), pageable.getPageSize(), combinedSort);
+		return repository.findAll(predicate, fixedPageable);
 	}
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalnotice/PortalNoticeUISearch.java b/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalnotice/PortalNoticeUISearch.java
index 865e78c..e53bc46 100644
--- a/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalnotice/PortalNoticeUISearch.java
+++ b/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalnotice/PortalNoticeUISearch.java
@@ -5,6 +5,7 @@ import lombok.Data;
 @Data
 public class PortalNoticeUISearch {
 
+	private String searchNoticeType;
 	private String searchUseYn;
 	private String searchSubjectDetail;
 
diff --git a/src/main/java/com/eactive/eai/rms/onl/apim/portalnotice/PortalNoticeManController.java b/src/main/java/com/eactive/eai/rms/onl/apim/portalnotice/PortalNoticeManController.java
index 8e7286f..3db73dd 100644
--- a/src/main/java/com/eactive/eai/rms/onl/apim/portalnotice/PortalNoticeManController.java
+++ b/src/main/java/com/eactive/eai/rms/onl/apim/portalnotice/PortalNoticeManController.java
@@ -1,6 +1,8 @@
 package com.eactive.eai.rms.onl.apim.portalnotice;
 
 import com.eactive.eai.rms.common.base.BaseAnnotationController;
+import com.eactive.eai.rms.common.combo.ComboService;
+import com.eactive.eai.rms.common.combo.ComboVo;
 import com.eactive.eai.rms.common.login.SessionManager;
 import com.eactive.eai.rms.common.vo.GridResponse;
 import com.eactive.eai.rms.data.entity.onl.apim.portalnotice.PortalNoticeUISearch;
@@ -16,12 +18,16 @@ import org.springframework.web.bind.annotation.PostMapping;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @Controller
 @RequiredArgsConstructor
 public class PortalNoticeManController extends BaseAnnotationController {
 
 	private final PortalNoticeManService portalNoticeManService;
+	private final ComboService comboService;
 
 	@GetMapping(value = "/onl/apim/portalnotice/portalNoticeMan.view")
 	public void view() {
@@ -40,6 +46,14 @@ public class PortalNoticeManController extends BaseAnnotationController {
 		Page<PortalNoticeUI> page = portalNoticeManService.selectList(pageable, portalNoticeUISearch);
 		return ResponseEntity.ok(new GridResponse<>(page));
 	}
+	
+	@PostMapping(value = "/onl/apim/portalnotice/portalNoticeMan.json", params = "cmd=LIST_INIT_COMBO")
+	public ResponseEntity<Map<String, Object>> initCombo() {
+		List<ComboVo> noticeTypeList = comboService.getMonitoringCodeSortedBySeq("NOTICE_TYPE");
+		Map<String, Object> resultMap = new HashMap<>();
+		resultMap.put("noticeTypeList", noticeTypeList);
+		return ResponseEntity.ok(resultMap);
+	}
 
 	@PostMapping(value = "/onl/apim/portalnotice/portalNoticeMan.json", params = "cmd=DETAIL")
 	public ResponseEntity<PortalNoticeUI> selectDetail(String id) {
diff --git a/src/main/java/com/eactive/eai/rms/onl/apim/portalnotice/PortalNoticeManService.java b/src/main/java/com/eactive/eai/rms/onl/apim/portalnotice/PortalNoticeManService.java
index 64ffe55..09bf0ad 100644
--- a/src/main/java/com/eactive/eai/rms/onl/apim/portalnotice/PortalNoticeManService.java
+++ b/src/main/java/com/eactive/eai/rms/onl/apim/portalnotice/PortalNoticeManService.java
@@ -93,8 +93,9 @@ public class PortalNoticeManService extends BaseService {
 	}
 
 	public void insert(PortalNoticeUI portalNoticeUI) throws IOException {
-		portalNoticeUI.setNoticeSubject(decodeString(portalNoticeUI.getNoticeSubject()));
-		portalNoticeUI.setNoticeDetail(decodeString(StringEscapeUtils.unescapeHtml(portalNoticeUI.getNoticeDetail())));
+		//portalNoticeUI.setNoticeSubject(decodeString(portalNoticeUI.getNoticeSubject()));
+		//portalNoticeUI.setNoticeDetail(decodeString(StringEscapeUtils.unescapeHtml(portalNoticeUI.getNoticeDetail())));
+		portalNoticeUI.setNoticeDetail(StringEscapeUtils.unescapeHtml(portalNoticeUI.getNoticeDetail()));
 
 		PortalNotice portalNotice = portalNoticeUIMapper.toEntity(portalNoticeUI);
 		portalNotice.setId(null);
@@ -123,8 +124,9 @@ public class PortalNoticeManService extends BaseService {
 	}
 
 	public void update(PortalNoticeUI portalNoticeUI) throws IOException {
-		portalNoticeUI.setNoticeSubject(decodeString(portalNoticeUI.getNoticeSubject()));
- 		portalNoticeUI.setNoticeDetail(decodeString(StringEscapeUtils.unescapeHtml(portalNoticeUI.getNoticeDetail())));
+		//portalNoticeUI.setNoticeSubject(decodeString(portalNoticeUI.getNoticeSubject()));
+ 		//portalNoticeUI.setNoticeDetail(decodeString(StringEscapeUtils.unescapeHtml(portalNoticeUI.getNoticeDetail())));
+		portalNoticeUI.setNoticeDetail(StringEscapeUtils.unescapeHtml(portalNoticeUI.getNoticeDetail()));
 
 		PortalNotice portalNotice = portalNoticeService.getById(portalNoticeUI.getId());
 
diff --git a/src/main/java/com/eactive/eai/rms/onl/apim/portalnotice/PortalNoticeUI.java b/src/main/java/com/eactive/eai/rms/onl/apim/portalnotice/PortalNoticeUI.java
index c709199..bded835 100644
--- a/src/main/java/com/eactive/eai/rms/onl/apim/portalnotice/PortalNoticeUI.java
+++ b/src/main/java/com/eactive/eai/rms/onl/apim/portalnotice/PortalNoticeUI.java
@@ -32,6 +32,11 @@ public class PortalNoticeUI {
 	private String useYn;
 
 	private String inquirerName;
+	
+	private String fixYn;
+	
+	private String noticeType;
+	
 
 	private String createdBy;