From 2c069f45486c19b54f2eeccc4e6bb04ca8ce9981 Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Thu, 17 Aug 2023 14:59:41 +0900
Subject: [PATCH] =?UTF-8?q?=EC=A0=80=EC=9E=A5=20=EC=A0=84=20=ED=99=95?=
 =?UTF-8?q?=EC=9D=B8=20=EC=B0=BD=20=EB=A9=94=EC=8B=9C=EC=A7=80=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xit/fims/crdn/web/Crdn05Controller.java   |  2 +-
 .../xit/fims/cvlc/web/Cvlc01Controller.java   | 23 ++++++++++++--
 .../WEB-INF/jsp/fims/crdn/crdn05030-info.jsp  | 11 +++----
 .../WEB-INF/jsp/fims/crdn/crdn06030-main.jsp  |  2 +-
 .../WEB-INF/jsp/fims/crdn/crdn06050-info.jsp  | 25 ++++++----------
 .../WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp  | 30 ++++++++++---------
 6 files changed, 52 insertions(+), 41 deletions(-)

diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java
index 82f53ee3..04a51c29 100644
--- a/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java
+++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java
@@ -139,7 +139,7 @@ public class Crdn05Controller extends ApplicationController {
 	}
 
 	/**단속 대장을 수기 등록한다.
-	 * @param Crdn 단속 대장 정보
+	 * @param hReq 등록 요청, crdn 단속 대장 정보, newFileList 업로드한 이미지 파일
 	 * @return jsonView
 	 * <pre><code> {
 	 *     "saved": 등록되었으면 true, 그렇지 않으면 false
diff --git a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java
index f8fc80b7..3d290fbf 100644
--- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java
+++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java
@@ -232,14 +232,14 @@ public class Cvlc01Controller extends ApplicationController {
 	}
 
 	/**지정한 민원 초기자료를 수정한다.
-	 * @param crdnId 단속대장 아이디
+	 * @param hReq 수정 요청, crdnCvlcpt 민원 정보, crdn 단속 정보, 추가한 이미지 파일 newFileList, modifyFileList 편집한 이미지 파일
 	 * @return jsonView
 	 * <pre><code> {
 	 *     "affected": 저장된 정보수
 	 *     "saved": 저장되었으면 true, 그렇지 않으면 false
 	 * }</code></pre>
 	 */
-	@RequestMapping(name="민원 정보 수정", value="/020/save.do")
+	@RequestMapping(name="민원 정보 수정", value="/020/update.do")
 	public ModelAndView saveCivilComplaintProcessSe(HttpServletRequest hReq, CrdnCvlcpt crdnCvlcpt, Crdn crdn, MultipartFile[] newFileList, MultipartFile[] modifyFileList) {
 
 		boolean saved = false;
@@ -292,6 +292,25 @@ public class Cvlc01Controller extends ApplicationController {
 			.addObject("saved", saved);
 	}
 
+	/**지정한 민원 자료의 복사본을 생성한다.
+	 * @param crdnId 단속대장 아이디
+	 * @return jsonView
+	 * <pre><code> {
+	 *     "affected": 저장된 정보수
+	 *     "saved": 저장되었으면 true, 그렇지 않으면 false
+	 * }</code></pre>
+	 */
+	@RequestMapping(name="민원 자료 복사", value="/020/create.do")
+	public ModelAndView copyCivilComplaintInfo(String crdnId) {
+
+		boolean saved = false;
+
+		//TODO:민원정보,단속정보 복사
+
+		return new ModelAndView("jsonView")
+			.addObject("saved", saved);
+	}
+
 	/** 민원내역 원본을 한글 파일로 작성한다.
 	 * @return hwp파일
 	 */
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp
index 99d52fb5..d6686219 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp
@@ -392,13 +392,10 @@ $(document).ready(function(){
 			
 		}
 		
-		dialog.alert({
-			content:"현재 단속 정보를 저장하시겠습니까?",
-			onOK:() => {
-				$P.crdnControl.save($P.formFields.get());
-			}
-		});
-
+		if(confirm("현재 단속 정보를 저장하시겠습니까?")){
+			$P.crdnControl.save($P.formFields.get());
+		}
+		
 	};
 
 	$P.videoCallback = (snapshots) => {
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp
index 7a39f543..a0a2d0c7 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp
@@ -278,7 +278,7 @@ $(document).ready(function(){
     	};
 
     	dialog.alert({
-    		content:"현 자료를 장애차량 확인된 자료로 변경하겠습니까?",
+    		content:"현 자료를 장애차량 확인된 자료로 변경하시겠습니까?",
     		onOK:() => {
     			$P.crdnControl.save({ 'crdnId' : $P.crdnControl.getCurrent()["CRDN_ID"] });
     		}
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06050-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06050-info.jsp
index 9c3965e6..616f926c 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06050-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06050-info.jsp
@@ -25,8 +25,8 @@
 <div>
 	<span class="container-page-btn">
 		<span class="container-window-btn-right">
-			<button class="btn btn-primary" id="btnRestore--${pageName}" title="원금 복원">원금 복원</button>
 			<button class="btn btn-primary" id="btnSave--${pageName}" title="금액 수정">금액 수정</button>
+			<button class="btn btn-primary" id="btnRestore--${pageName}" title="원금 복원">원금 복원</button>
 		</span>
 	</span>
 </div>
@@ -103,12 +103,9 @@ $(document).ready(function(){
 			alertMessage = "감액 처리하시겠습니까?";
 		}
 		
-		dialog.alert({
-			content: alertMessage,
-			onOK:() => {
-				$P.crdnControl.save($P.formFields.get());
-			}
-		});	
+		if(confirm(alertMessage)){
+			$P.crdnControl.save($P.formFields.get());
+		}
 	}
 	
 	$P.fnRestore = () => {
@@ -118,15 +115,11 @@ $(document).ready(function(){
 			return;
 		}
 
-		dialog.alert({
-			content: "원금 복원하시겠습니까?",
-			onOK:() => {
-				var info = $P.formFields.get();
-				info.chgAmtSe = "0";
-				$P.crdnControl.save(info);
-			}
-		});	
-		
+		if(confirm("원금 복원하시겠습니까?")){
+			var info = $P.formFields.get();
+			info.chgAmtSe = "0";
+			$P.crdnControl.save(info);
+		}
 	}
 	
 	/**************************************************************************
diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp
index a83c474e..3b981f38 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp
@@ -334,8 +334,8 @@ $(document).ready(function(){
 	    urls : { 
 	    	load : "",
 	    	getInfo : wctx.url("/${taskSeCd}/cvlc/cvlc01/020/info.do"), 
-	    	update : wctx.url("/${taskSeCd}/cvlc/cvlc01/020/save.do"),
-	    	create : ""
+	    	update : wctx.url("/${taskSeCd}/cvlc/cvlc01/020/update.do"),
+	    	create : wctx.url("/${taskSeCd}/cvlc/cvlc01/020/create.do")
 	    },
 	    keymapper:info => info ? info.CRDN_ID : "",
 	    dataGetter:obj => obj.crdnInfo,
@@ -536,12 +536,9 @@ $(document).ready(function(){
 			return;
 		}
 		
-		dialog.alert({
-			content:"현재 단속 정보를 저장하시겠습니까?",
-			onOK:() => {
-				$P.crdnControl.save($P.formFields.get(), true);
-			}
-		});
+		if(confirm("현재 단속 정보를 저장하시겠습니까?")){
+			$P.crdnControl.save($P.formFields.get(), true);
+		}
 
 	};
 
@@ -691,12 +688,17 @@ $(document).ready(function(){
 	$P.fnCopy = () => {
 		var crdnId = $("#crdnId--${pageName}").val();
 		
-		dialog.alert({
-			content : "현 자료의 복사본을 생성하겠습니까?",
-			onOK : () => {
-				//$P.crdnControl.copy($P.formFields.get());
-			}
-		});
+		if(confirm("현 자료의 복사본을 생성하시겠습니까?")){
+			
+			ajax.get({
+				url : $P.crdnControl.urls.create,
+				data : { crdnId : crdnId },
+				success : resp => {	}
+			});
+			
+			
+		}
+		
 	}
 	
 	$P.fnOpenCvlcptOrgnl = () => {