Commit @24523774caa6832ed6aeb35719185ef702a500ad

itn 2023-08-02

기업회원 PDF뷰어 문구 수정

@24523774caa6832ed6aeb35719185ef702a500ad

9df03b3

2452377

src/main/java/itn/let/mjo/msg/web/MjonMsgController.java

--- src/main/java/itn/let/mjo/msg/web/MjonMsgController.java

+++ src/main/java/itn/let/mjo/msg/web/MjonMsgController.java


 		List<String> imgExtList = new ArrayList<>(Arrays.asList(imgExtArray));
 		
 		if(fvo != null) {
-			if("pdf".equals(fvo.getFileExtsn())) {
+			if("pdf".equals(fvo.getFileExtsn().toLowerCase())) {
 				path = "/cmm/fms/FileDown.do?atchFileId="+ fvo.getAtchFileId() + "&fileSn=" + fvo.getFileSn();
 				fileType = "pdf";
-			} else if(imgExtList.contains(fvo.getFileExtsn())) {
+			} else if(imgExtList.contains(fvo.getFileExtsn().toLowerCase())) {
 				String storePath = fvo.getFileStreCours() + fvo.getStreFileNm();
 				path = "/cmm/fms/FileDowntest.do?fileNm="+ PdfUtil.makeImgPdf(storePath, fvo.getFileExtsn());
 				fileType = "img";

     	return "/uss/ion/msg/pdfView";
     }
 	
-    @RequestMapping(value = {"/uss/ion/msg/pdfViewAjax.do"})
-   	public String pdfViewAjax(FileVO fileVO, ModelMap model) throws Exception {
-    	
-		FileVO fvo = fileService.selectFileInf(fileVO);
-		String path = "";
-		String fileType = "";
-		String[] imgExtArray = {"bmp", "gif", "jpeg", "jpg", "png", "tif", "tiff", "psd", "rle"};
-		List<String> imgExtList = new ArrayList<>(Arrays.asList(imgExtArray));
-		
-		if(fvo != null) {
-			if("pdf".equals(fvo.getFileExtsn())) {
-				path = "/cmm/fms/FileDown.do?atchFileId="+ fvo.getAtchFileId() + "&fileSn=" + fvo.getFileSn();
-				fileType = "pdf";
-			} else if(imgExtList.contains(fvo.getFileExtsn())) {
-				String storePath = fvo.getFileStreCours() + fvo.getStreFileNm();
-				path = "/cmm/fms/FileDowntest.do?fileNm="+ PdfUtil.makeImgPdf(storePath, fvo.getFileExtsn());
-				fileType = "img";
-			} else {
-				String storePath = fvo.getFileStreCours() + fvo.getStreFileNm();
-				path = "/cmm/fms/FileDowntest.do?fileNm="+ PdfUtil.makeImgPdf(storePath, fvo.getFileExtsn());
-				fileType = "etc";
-			}
-		}
-		
-		model.addAttribute("pdfPath", path);
-		model.addAttribute("fileType", fileType);
-    	
-    	return "/uss/ion/msg/pdfView";
-    }	
 	
 }

9df03b3

2452377

src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovMberCmpHstListByType.jsp

--- src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovMberCmpHstListByType.jsp

+++ src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovMberCmpHstListByType.jsp


     document.pdfForm.submit();	
 }
 
-// 첨부파일 PdfView
-function pdfViewPop2(atchFileId) {
-	$.ajax({
-        type: "POST",
-        url: "/uss/ion/msg/pdfViewAjax.do",
-        data: {"atchFileId" : atchFileId, "fileSn" : "0"},
-        dataType:'html',
-        async: true,
-        success: function (data) {
-        	alert(data);
-		},
-        error: function (e) { 
-        	//alert("ERROR : " + JSON.stringify(e)); 
-        }
-    });	
-}	
-
 function fnChkAll() {
 	if($("#chkAll").is(':checked') ){
 	  $("input[name=chkSttusY]").prop("checked", true);

9df03b3

2452377

src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp

--- src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp

+++ src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp


 			<table class="tbType1">
 				<colgroup>
 					<col style="width: *%">
+					<col style="width: 12%">
 					<col style="width: 15%">
 					<col style="width: 15%">
-					<col style="width: 15%">
-					<col style="width: 15%">
+					<col style="width: 12%">
+					<col style="width: 10%">
 				</colgroup>
 				<thead>
 					<tr>

 						<th>대표자</th>
 						<th>담당자</th>
 						<th>휴대폰</th>
+						<th>다운로드</th>
 					</tr>
 				</thead>
 				<tbody>

 						<td title="${ceoNm}">${ceoNm}</td>
 						<td title="${hstManagerNm}">${hstManagerNm}</td>
 						<td title="${hstMbtlNum}">${hstMbtlNum}</td>
+						<td>
+			           		<c:import url="/cmm/fms/selectMberFileInfs.do" charEncoding="utf-8">
+								<c:param name="param_atchFileId" value="${atchFileId}" />
+							</c:import>											
+						</td>
 					</tr>
 				</tbody>
 			</table>	

 		
 		<c:if test="${fileType eq 'etc'}">
 			<div style="width: 100%; text-align: center; margin: 30px 0 30px 0; color: red;">
-				PDF 뷰어에서 지원하지 않는 형식의 파일입니다. 첨부파일 다운로드후 확인해주세요. &nbsp;
-           		<c:import url="/cmm/fms/selectMberFileInfs.do" charEncoding="utf-8">
-					<c:param name="param_atchFileId" value="${atchFileId}" />
-				</c:import>					
+				PDF 뷰어에서 지원하지 않는 형식의 파일입니다. 첨부파일 다운로드후 확인해주세요.
 			</div>
 		</c:if>		
 		<canvas id="the-canvas" name="the-canvas" style="min-width: 600px; max-width: 1000px; margin-top: 25px; margin-bottom: 25px;"></canvas>

Add a comment

Open 0
Closed 0

List

...	...	@@ -5054,10 +5054,10 @@
5054	5054	List<String> imgExtList = new ArrayList<>(Arrays.asList(imgExtArray));
5055	5055
5056	5056	if(fvo != null) {
5057		- if("pdf".equals(fvo.getFileExtsn())) {
	5057	+ if("pdf".equals(fvo.getFileExtsn().toLowerCase())) {
5058	5058	path = "/cmm/fms/FileDown.do?atchFileId="+ fvo.getAtchFileId() + "&fileSn=" + fvo.getFileSn();
5059	5059	fileType = "pdf";
5060		- } else if(imgExtList.contains(fvo.getFileExtsn())) {
	5060	+ } else if(imgExtList.contains(fvo.getFileExtsn().toLowerCase())) {
5061	5061	String storePath = fvo.getFileStreCours() + fvo.getStreFileNm();
5062	5062	path = "/cmm/fms/FileDowntest.do?fileNm="+ PdfUtil.makeImgPdf(storePath, fvo.getFileExtsn());
5063	5063	fileType = "img";
...	...	@@ -5086,34 +5086,5 @@
5086	5086	return "/uss/ion/msg/pdfView";
5087	5087	}
5088	5088
5089		- @RequestMapping(value = {"/uss/ion/msg/pdfViewAjax.do"})
5090		- public String pdfViewAjax(FileVO fileVO, ModelMap model) throws Exception {
5091		-
5092		- FileVO fvo = fileService.selectFileInf(fileVO);
5093		- String path = "";
5094		- String fileType = "";
5095		- String[] imgExtArray = {"bmp", "gif", "jpeg", "jpg", "png", "tif", "tiff", "psd", "rle"};
5096		- List<String> imgExtList = new ArrayList<>(Arrays.asList(imgExtArray));
5097		-
5098		- if(fvo != null) {
5099		- if("pdf".equals(fvo.getFileExtsn())) {
5100		- path = "/cmm/fms/FileDown.do?atchFileId="+ fvo.getAtchFileId() + "&fileSn=" + fvo.getFileSn();
5101		- fileType = "pdf";
5102		- } else if(imgExtList.contains(fvo.getFileExtsn())) {
5103		- String storePath = fvo.getFileStreCours() + fvo.getStreFileNm();
5104		- path = "/cmm/fms/FileDowntest.do?fileNm="+ PdfUtil.makeImgPdf(storePath, fvo.getFileExtsn());
5105		- fileType = "img";
5106		- } else {
5107		- String storePath = fvo.getFileStreCours() + fvo.getStreFileNm();
5108		- path = "/cmm/fms/FileDowntest.do?fileNm="+ PdfUtil.makeImgPdf(storePath, fvo.getFileExtsn());
5109		- fileType = "etc";
5110		- }
5111		- }
5112		-
5113		- model.addAttribute("pdfPath", path);
5114		- model.addAttribute("fileType", fileType);
5115		-
5116		- return "/uss/ion/msg/pdfView";
5117		- }
5118	5089
5119	5090	} (No newline at end of file)

...	...	@@ -52,10 +52,11 @@
52	52	<table class="tbType1">
53	53	<colgroup>
54	54	<col style="width: *%">
	55	+ <col style="width: 12%">
55	56	<col style="width: 15%">
56	57	<col style="width: 15%">
57		- <col style="width: 15%">
58		- <col style="width: 15%">
	58	+ <col style="width: 12%">
	59	+ <col style="width: 10%">
59	60	</colgroup>
60	61	<thead>
61	62	<tr>
...	...	@@ -64,6 +65,7 @@
64	65	<th>대표자</th>
65	66	<th>담당자</th>
66	67	<th>휴대폰</th>
	68	+ <th>다운로드</th>
67	69	</tr>
68	70	</thead>
69	71	<tbody>
...	...	@@ -73,6 +75,11 @@
73	75	<td title="${ceoNm}">${ceoNm}</td>
74	76	<td title="${hstManagerNm}">${hstManagerNm}</td>
75	77	<td title="${hstMbtlNum}">${hstMbtlNum}</td>
	78	+ <td>
	79	+ <c:import url="/cmm/fms/selectMberFileInfs.do" charEncoding="utf-8">
	80	+ <c:param name="param_atchFileId" value="${atchFileId}" />
	81	+ </c:import>
	82	+ </td>
76	83	</tr>
77	84	</tbody>
78	85	</table>
...	...	@@ -80,10 +87,7 @@
80	87
81	88	<c:if test="${fileType eq 'etc'}">
82	89	<div style="width: 100%; text-align: center; margin: 30px 0 30px 0; color: red;">
83		- PDF 뷰어에서 지원하지 않는 형식의 파일입니다. 첨부파일 다운로드후 확인해주세요.
84		- <c:import url="/cmm/fms/selectMberFileInfs.do" charEncoding="utf-8">
85		- <c:param name="param_atchFileId" value="${atchFileId}" />
86		- </c:import>
	90	+ PDF 뷰어에서 지원하지 않는 형식의 파일입니다. 첨부파일 다운로드후 확인해주세요.
87	91	</div>
88	92	</c:if>
89	93	<canvas id="the-canvas" name="the-canvas" style="min-width: 600px; max-width: 1000px; margin-top: 25px; margin-bottom: 25px;"></canvas>

...	...	@@ -36,23 +36,6 @@
36	36	document.pdfForm.submit();
37	37	}
38	38
39		-// 첨부파일 PdfView
40		-function pdfViewPop2(atchFileId) {
41		- $.ajax({
42		- type: "POST",
43		- url: "/uss/ion/msg/pdfViewAjax.do",
44		- data: {"atchFileId" : atchFileId, "fileSn" : "0"},
45		- dataType:'html',
46		- async: true,
47		- success: function (data) {
48		- alert(data);
49		- },
50		- error: function (e) {
51		- //alert("ERROR : " + JSON.stringify(e));
52		- }
53		- });
54		-}
55		-
56	39	function fnChkAll() {
57	40	if($("#chkAll").is(':checked') ){
58	41	$("input[name=chkSttusY]").prop("checked", true);

Delete comment