From 3150ead21a25a7536d1c68a50cab50d717b35733 Mon Sep 17 00:00:00 2001
From: myname <antelope337@gmail.com>
Date: Mon, 16 Dec 2024 11:00:48 +0900
Subject: [PATCH] # WARNING: head commit changed in the meantime

Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet
---
 .../seed/com/gtm/base/GwBaseController.java   |  4 ++--
 .../_extra/gtm/trublprocessmng/rceptEdit.jsp  | 22 ++++++++++++++-----
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/main/java/seed/com/gtm/base/GwBaseController.java b/src/main/java/seed/com/gtm/base/GwBaseController.java
index ae788c01..9670faab 100644
--- a/src/main/java/seed/com/gtm/base/GwBaseController.java
+++ b/src/main/java/seed/com/gtm/base/GwBaseController.java
@@ -629,9 +629,9 @@ public class GwBaseController {
 				
 				EgovMap paramsCnt = new EgovMap();
 				
-				if ("1".equals(s_jobID))	//소재기 내부보고
+				if ("1".equals(s_jobID))	//소제기 내부보고
 				{
-					paramsCnt.put("docId", "22");
+					paramsCnt.put("docId", "78");
 					
 				}else if ("2".equals(s_jobID))	//당사자 통지
 				{
diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp
index 30dffb24..35d4a328 100644
--- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp
+++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp
@@ -2469,7 +2469,7 @@ function mediationSmall(){
   var url = "";
   $("#type").val("L");
   var param = jQuery('#frm').serialize();
-  url = "/gtm/case/ajax/nanumHisDelSelTmp.do";
+  url = "/gtm/newcase/ajax/nanumHisDelSelTmp.do";
   XHR2(url, param, function(r){	
     $.each(r.data, function(k,v) {
         $('#nanumHisDelSelTmp').append('<option value="'+v.caseNo+'_'+v.docId+'_'+v.result+'">'+v.orginName+'('+v.docId+')('+v.result+')('+v.seqNo+')</option>');
@@ -2483,7 +2483,7 @@ function mediationSmall(){
   var url = "";
   $("#type").val("L");
   var param = jQuery('#frm').serialize();
-  url = "/gtm/case/ajax/nanumHisDelSelProTmp.do";
+  url = "/gtm/newcase/ajax/nanumHisDelSelProTmp.do";
   XHR2(url, param, function(r){	
     $.each(r.data, function(k,v) {
         if (v.codeDepth == 1){
@@ -3247,6 +3247,13 @@ function atendReqPopOpen(caseNo){
   window.open(popUrl, "", popOption);
 }
 
+function fileFirstPopOpen(caseNo){
+	alert('작업중')
+	return;
+	  var popUrl = "/gtm/case/trublprocessmng/dtaPop/jsp/Page.do?caseNo="+caseNo;
+	  var popOption = "width=1024, height=750, resizable=no, scrollbars=no, status=no;";
+	  window.open(popUrl, "", popOption);
+	}
 
 function fileHistoryPopOpen(fileGubun, title){
 
@@ -3950,7 +3957,7 @@ function nanumHisDelProTmp(p_type){
 		$("#caseNoTmp").val($("#caseNo").val());			    
 
 		  var param = jQuery('#callbackFrm').serialize();
-		  url = "/gtm/case/ajax/nanumMasterProcessChg.do";
+		  url = "/gtm/newcase/ajax/nanumMasterProcessChg.do";
 		  XHR2(url, param, function(r){
 			  alert(r.resultMessage);
 			  location.reload();
@@ -4596,6 +4603,7 @@ function clipCallTmp(){
 					<button type="button" class="btn btn_text btn_36 subgray_border btn-default" onclick="atendReqPopOpen('${caseNo}');">출석현황</button>
 					<button type="button" class="btn btn_text btn_36 subgray_border btn-default" onclick="cfrnctrnsferPop();">협의회이관</button>
 					<button type="button" class="btn btn_text btn_36 subgray_border btn-default dayLength">기간연장</button>
+					<button type="button" class="btn btn_text btn_36 subgray_border btn-default"onclick="fileFirstPopOpen('${caseNo}');">요구현황(작업중)</button>
 				</div>
 			</div>
         </c:if>
@@ -4623,6 +4631,7 @@ function clipCallTmp(){
 			         <button type="button" class="btn-default btn btn_text btn_36 gray_border fl" onclick="atendReqPopOpen('${caseNo}');">출석현황</button>
 			         <button type="button" class="btn-default btn btn_text btn_36 gray_border fr" onclick="cfrnctrnsferPop();">협의회이관</button>
 			         <button type="button" class="btn-default btn btn_text btn_36 gray_border fr dayLength">기간연장</button>
+			         <button type="button" class="btn btn_text btn_36 subgray_border btn-default"onclick="fileFirstPopOpen('${caseNo}');">요구현황(작업중)</button>
 		         </div>
 			</div>
         </c:if>
@@ -4636,6 +4645,7 @@ function clipCallTmp(){
 	          <button type="button" class="btn-default btn btn_text btn_36 blue_border fl" id="finalCheckOp" onclick="nanumCall('16', '(피)신청인의 분쟁종료 요청사실 보고');">공정위 선보고용 종료통지</button>
 	          <button type="button" class="btn-default btn btn_text btn_36 gray_border fl" onclick="fileReqPopOpen('${caseNo}');">요구현황</button>
 	          <button type="button" class="btn-default btn btn_text btn_36 gray_border fl" onclick="atendReqPopOpen('${caseNo}');">출석현황</button>
+	          <button type="button" class="btn btn_text btn_36 subgray_border btn-default"onclick="fileFirstPopOpen('${caseNo}');">요구현황(작업중)</button>
 			</div>
         </c:if>
         <c:if test="${masterData.statePro == '0405000000' && (memberPosition == '0912000000' || memberPosition == '0911000000' || memberPosition == '0915000000')}">
@@ -4685,7 +4695,7 @@ function clipCallTmp(){
 	                <c:choose>
 	                  <c:when test="${masterData.statePro == '0406000000'}">
 	                  	<div class="area_left">
-		                    <button type="button" class="btn-default btn btn_text btn_36 blue_border fl" onclick="nanumCallGeneral('1', '소재기 내부보고');">소재기 내부보고</button>
+		                    <button type="button" class="btn-default btn btn_text btn_36 blue_border fl" onclick="nanumCallGeneral('1', '소제기 내부보고');">소제기 내부보고</button>
 		                    <button type="button" class="btn-default btn btn_text btn_36 blue_border fl" onclick="nanumCallGeneral('2', '당사자 통지');">당사자 통지</button>
 		                    <button type="button" class="btn-default btn btn_text btn_36 blue_border fl" onclick="nanumCallGeneral('3', '수소법원 통지');">수소법원 통지</button>	                  	
         				</div>
@@ -4720,7 +4730,7 @@ function clipCallTmp(){
     </c:if>
     
     <!-- 임시 -->
-    <!-- 
+     
     <div class="btn_wrap">
     
 	        <div class="area_left" style="flex-wrap:wrap;">
@@ -4756,7 +4766,7 @@ function clipCallTmp(){
 	        </div>	    
     
     </div>   
-     --> 
+      
     
     <div class="col-table data-table">
       <table>