From cbaf11af90a92789ace417e10701524d252eee35 Mon Sep 17 00:00:00 2001
From: tolag3 <tolag3@gmail.com>
Date: Tue, 26 Dec 2023 14:25:48 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A4=80=ED=98=B8=20=EC=A0=84?=
 =?UTF-8?q?=EC=9E=90=EC=A1=B0=EC=A0=95=EC=8B=9C=EC=8A=A4=ED=85=9C=20?=
 =?UTF-8?q?=EC=BB=A4=EB=B0=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 - ocr에서 조정신청서 양식에 맞춰 업로드 했을경우 양식에 맞게 데이터 set
---
 .../kcc/kccadr/textsense/service/TextSenseVO.java  |  9 +++++++++
 .../kccadr/textsense/web/TextSenseController.java  |  2 ++
 .../kccadr/textsense/TextSense_SQL_Mysql.xml       |  3 +++
 .../adjReqMgrOff/popup/adjReqMgrOffOcrPop.jsp      | 14 +++++++++-----
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/main/java/kcc/kccadr/textsense/service/TextSenseVO.java b/src/main/java/kcc/kccadr/textsense/service/TextSenseVO.java
index 6f87714c..27dea780 100644
--- a/src/main/java/kcc/kccadr/textsense/service/TextSenseVO.java
+++ b/src/main/java/kcc/kccadr/textsense/service/TextSenseVO.java
@@ -53,6 +53,8 @@ public class TextSenseVO extends ComDefaultVO implements Serializable{
 	
 	private String filePath;
 	
+	private String useYn;
+	
 	public String getApiUrl() {
 		return apiUrl;
 	}
@@ -257,6 +259,13 @@ public class TextSenseVO extends ComDefaultVO implements Serializable{
 	public void setFilePath(String filePath) {
 		this.filePath = filePath;
 	}
+	public String getUseYn() {
+		return useYn;
+	}
+	public void setUseYn(String useYn) {
+		this.useYn = useYn;
+	}
+	
 	
 	
 }
diff --git a/src/main/java/kcc/kccadr/textsense/web/TextSenseController.java b/src/main/java/kcc/kccadr/textsense/web/TextSenseController.java
index 0fc1ff1c..e63c3a99 100644
--- a/src/main/java/kcc/kccadr/textsense/web/TextSenseController.java
+++ b/src/main/java/kcc/kccadr/textsense/web/TextSenseController.java
@@ -346,6 +346,7 @@ public class TextSenseController {
 			String maxRetryCount = (object.get("maxRetryCount") == null ? "0" : object.get("maxRetryCount").toString());
 			String retryCount = (object.get("retryCount") == null ? "0" : object.get("retryCount").toString());
 			String collectedBy = (object.get("collectedBy") == null ? null : object.get("collectedBy").toString());
+			String useYn = outputUri.contains(".xlsx") ? "N" : "Y"; 
 			
 			TextSenseVO textSenseVO = new TextSenseVO();
 
@@ -365,6 +366,7 @@ public class TextSenseController {
 			textSenseVO.setRetryCount(retryCount);
 			textSenseVO.setCollectedby(collectedBy);
 			textSenseVO.setCallbackUri(callbackUri);
+			textSenseVO.setUseYn(useYn);
 			
 			//callback 결과 내용 디비 업데이터 처리 해주기
 			textSenseService.updateTextSenseCallbackData(textSenseVO);
diff --git a/src/main/resources/egovframework/sqlmap/kccadr/textsense/TextSense_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/textsense/TextSense_SQL_Mysql.xml
index eae2b486..7a1d4577 100644
--- a/src/main/resources/egovframework/sqlmap/kccadr/textsense/TextSense_SQL_Mysql.xml
+++ b/src/main/resources/egovframework/sqlmap/kccadr/textsense/TextSense_SQL_Mysql.xml
@@ -74,6 +74,8 @@
 		SELECT COUNT(A.ID) 
 		  FROM ADR_TEXTSENSE_OCR A
 		  WHERE 1=1 
+		  
+		  AND A.USE_YN = 'Y'
 		  AND A.FRST_REGISTER_ID = #frstRegisterId#
 		  <isNotEmpty property="searchKeyword">
 			<isEqual prepend="AND" property="searchCondition" compareValue="1">
@@ -130,6 +132,7 @@
 			, RETRY_COUNT = #retryCount#
 			, COLLECTEDBY = #collectedby#
 			, EXTERNAL_ID = #externalId#
+			, USE_YN = #useYn#
 		WHERE ID = #id#
 		AND TASK_NAME = #taskName#
 	
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/popup/adjReqMgrOffOcrPop.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/popup/adjReqMgrOffOcrPop.jsp
index 9a31bbd6..044ee2ac 100644
--- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/popup/adjReqMgrOffOcrPop.jsp
+++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/popup/adjReqMgrOffOcrPop.jsp
@@ -111,7 +111,7 @@
 						//신청원인
 						openerId.reqCn2.value = responResult.reason;
 						
-// 						window.close();
+						window.close();
 					}
 					if(cnt > 5){
 						clearInterval(intervalId);
@@ -138,7 +138,6 @@
 		var taskName = a.getFullYear().toString()+a.getMonth().toString()+a.getDay().toString()+a.getHours().toString()+a.getMinutes().toString()+a.getSeconds().toString()+a.getMilliseconds().toString();
 		document.writeForm.taskName.value = taskName;
 		
-		
 		var form = document.writeForm;
 		var data = new FormData(form);
 		//첨부파일 등록 처리
@@ -166,7 +165,7 @@
 						alert("로그인이 필요합니다.");
 						return false;
 					}else if(result == 'success'){
-						alert("OCR 처리요청이 완료되었습니다.");
+// 						alert("OCR 처리요청이 완료되었습니다.");
 						outputFileNm = returnData.outputFileNm;
 					}
 					
@@ -245,12 +244,17 @@
 	    }else{
 	    	  $('body').append('<div id="div_ajax_load_image" style="position:absolute; top:' + top + 'px; left:' + left + 'px; width:' + width + 'px; height:' + height + 'px; z-index:9999; background:#f0f0f0; filter:alpha(opacity=0); opacity:alpha*0.5; margin:auto; padding:0; "><img src="/direct/img/lodingBar.gif"></div>');
 	    }
+	    
+	    //마스크 show
+	    $('.mask').show();
 	}
 
 	function deleteLodingBar(){
 	    if($("#div_ajax_load_image").length != 0) {
 	    	$("#div_ajax_load_image").remove() ;
-	    }    
+	    }
+	  //마스크 show
+	    $('.mask').hide();
 	}
 
 </script>
@@ -270,7 +274,7 @@
 	
 	
 	<input type="hidden" id="taskName" name="taskName" value="">
-
+	<div class="mask"></div>
 		<div class="popup_cont">
 			<tr>
 				<th class="req_text">