민원 원본 내역 한글파일 다운로드 수정

src/main/java/cokr/xit/fims/cvlc/service/CrdnCvlcptService.java

@@ -41,7 +41,7 @@ public interface CrdnCvlcptService {
 	 *     <li>fileName: 다운로드 파일명</li>
 	 * </ul>
 	 */
-	Map<String, String> makeFileFromHwpFormat(CrdnQuery query);
+	Map<String, Object> makeFileFromHwpFormat(CrdnQuery query);
 
 	/** 민원 자료에 대해 반송(회수)처리한다.
 	 * @param crdnID 단속ID

src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java

@@ -145,7 +145,7 @@ public class CrdnCvlcptServiceBean extends AbstractServiceBean implements CrdnCv
 	}
 
 	@Override
-	public Map<String, String> makeFileFromHwpFormat(CrdnQuery query) {
+	public Map<String, Object> makeFileFromHwpFormat(CrdnQuery query) {
 		String baseFormatFilePath = ("template/hwp/cvlcptOrgnl_text.hwp");
 		String attachFormatFilePath = ("template/hwp/cvlcptOrgnl_photo.hwp");
 
@@ -250,6 +250,7 @@ public class CrdnCvlcptServiceBean extends AbstractServiceBean implements CrdnCv
 						if(i+3 < photoCnt)
 							InsertingImageCell.IMPL_InsertPicture(attachFormatFile, "오른쪽아래사진", fileInfoList.get(i+3).string("URL"));
 						AddUtil.appendToLast(attachFormatFile, resultFile);
+
 					}
 
 					HWPWriter.toFile(resultFile, resultHwpPath);
@@ -257,9 +258,10 @@ public class CrdnCvlcptServiceBean extends AbstractServiceBean implements CrdnCv
 			}
 
 			String downlaodFileName = "민원내역원본_" + currentTime + ".hwp";
-			Map<String, String> result = Map.of(
+			Map<String, Object> result = Map.of(
+				"filename", downlaodFileName,
 				"filePath", resultHwpPath,
-				"fileName", downlaodFileName
+				"file", new File(resultHwpPath)
 			);
 
 			return result;

src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java

@@ -189,9 +189,9 @@ public class Cvlc01Controller extends ApplicationController {
 	 * @return hwp파일
 	 */
 	public ModelAndView makeFileFromHwpFormat(CrdnQuery query) {
+		ModelAndView mav = new ModelAndView("downloadView");
+		Map<String, Object> result = crdnCvlcptService.makeFileFromHwpFormat(query);
 
-		Map<String,String> result = crdnCvlcptService.makeFileFromHwpFormat(query);
-		ModelAndView mav = new ModelAndView("jsonView");
 		mav.addAllObjects(result);
 		return mav;
 	}

src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp

@@ -651,7 +651,7 @@ $(document).ready(function(){
 					content : resp,
 					size : "xl",
 					init : () => {
-
+						setDialogZindex();
 					}
 				});
 			}

src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01050-info.jsp

@@ -174,21 +174,10 @@ $(document).ready(function() {
 	}
 	
 	$P.fnMakeHwp = () => {
+		var url = wctx.url("/"+$P.taskSeCd+"/cvlc/cvlc01/050/makeFileFromHwpFormat.do");
+		var parameter = toQuery({ crdnId : $("#crdnId--${pageName}").val() });
 		
-		ajax.post({
+		document.location.href = url + "?" + parameter;
-			url : wctx.url("/"+$P.taskSeCd+"/cvlc/cvlc01/050/makeFileFromHwpFormat.do"),
-			data : { crdnId : $("#crdnId--${pageName}").val() },
-			success : (resp) => {
-				
-		        var a = document.createElement("a");
-	            a.href = resp.filePath;
-	            a.download = resp.fileName;
-	            document.getElementById("tempArea--${pageName}").appendChild(a);
-	            a.click();
-	            document.getElementById("tempArea--${pageName}").removeChild(a);
-	            
-			}
-		});
 	}
 	
 	/**************************************************************************