From ea68e40e6e5f3ef4c560f3c69086cd3826d09d5b Mon Sep 17 00:00:00 2001 From: KNKIM Date: Tue, 19 Oct 2021 09:37:44 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B2=A8=EB=B6=80=ED=8C=8C=EC=9D=BC=20DB=20?= =?UTF-8?q?=ED=85=8C=EC=9D=B4=EB=B8=94=20=EB=B0=8F=20=EB=B0=A9=EC=8B=9D=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=20-=20=EA=B3=B5=EC=A7=80=EC=82=AC=ED=95=AD,?= =?UTF-8?q?=20faq,=20qna?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/AttachFileServiceImpl.java | 2 +- .../cmm/fileupload/FileUploadController.java | 7 ++-- .../mapper/nlib/bbs/AncmntDAO_SQL.xml | 7 +++- .../mapper/nlib/bbs/AttachFileDAO_SQL.xml | 6 +-- .../mapper/nlib/bbs/FaqDAO_SQL.xml | 25 +++++------ .../mapper/nlib/bbs/QnaDAO_SQL.xml | 21 +++++----- .../webapp/WEB-INF/jsp/nlib/bbs/listFaqs.jsp | 41 +++++++++---------- .../webapp/WEB-INF/jsp/nlib/bbs/listQnas.jsp | 37 ----------------- .../jsp/nlib/bbs/selectAncmntArticle.jsp | 36 ++++++++-------- 9 files changed, 72 insertions(+), 110 deletions(-) diff --git a/src/main/java/nlib/bbs/service/impl/AttachFileServiceImpl.java b/src/main/java/nlib/bbs/service/impl/AttachFileServiceImpl.java index 4ca37942..e6482807 100644 --- a/src/main/java/nlib/bbs/service/impl/AttachFileServiceImpl.java +++ b/src/main/java/nlib/bbs/service/impl/AttachFileServiceImpl.java @@ -115,7 +115,7 @@ public class AttachFileServiceImpl implements AttachFileService if(attachFileVO == null) return null; if(StringUtil.isEmpty(attachFileVO.getAttachFileId())) return null; - if(attachFileVO.getFileSn() < 1) return null; + if(attachFileVO.getFileSn() < 0) return null; return attachFileDAO.selectAttachFile(attachFileVO); } diff --git a/src/main/java/nlib/cmm/fileupload/FileUploadController.java b/src/main/java/nlib/cmm/fileupload/FileUploadController.java index 306bbcbf..80119409 100644 --- a/src/main/java/nlib/cmm/fileupload/FileUploadController.java +++ b/src/main/java/nlib/cmm/fileupload/FileUploadController.java @@ -149,9 +149,7 @@ public class FileUploadController { Iterator> itr = files.entrySet().iterator(); MultipartFile file; String filePath = ""; - FileVO fvo; AttachFileVO atvo; - String fileId = UUID.getNewFileId(); // 첨브파일그룹ID if(StringUtil.isEmpty(attachFileId)) { @@ -274,14 +272,15 @@ public class FileUploadController { File file = new File(FileUtil.filePathBlackList(fullPath)); if(!file.isFile()) { - throw new Exception("파일 정보가 부적합합니다. 관리자에게 문의하여 주시기 바랍니다."); + throw new Exception("해당 파일이 존재하지 않습니다. 관리자에게 문의하여 주시기 바랍니다."); } mv.setViewName("downloadView"); // dispatcher-servlet.xml내 BeanNameViewResolver 정의 mv.addObject("downloadFile", file); - mv.addObject("fname", attachFileVO.getOrignlFileNm()); + mv.addObject("fname", retAttachFileVO.getOrignlFileNm()); return mv; } + } diff --git a/src/main/resources/egovframework/mapper/nlib/bbs/AncmntDAO_SQL.xml b/src/main/resources/egovframework/mapper/nlib/bbs/AncmntDAO_SQL.xml index 5c3f0e6a..31cfc980 100644 --- a/src/main/resources/egovframework/mapper/nlib/bbs/AncmntDAO_SQL.xml +++ b/src/main/resources/egovframework/mapper/nlib/bbs/AncmntDAO_SQL.xml @@ -21,7 +21,7 @@ AND S.MNG_ORG_CD IN (#{mngOrgCd}, 'KCCF') - + AND IFNULL(S.DELETE_YN, 'N') = 'N' @@ -86,6 +87,7 @@ LEFT OUTER JOIN SM_USER C ON A.REG_ID = C.USER_ID WHERE A.ANCMNT_ID = #{articleId} + AND IFNULL(A.DELETE_YN, 'N') = 'N' ]]> @@ -94,6 +96,7 @@ UPDATE BD_NLIB_ANCMNT SET VIEW_CNT = VIEW_CNT + 1 WHERE ANCMNT_ID = #{articleId} + AND IFNULL(DELETE_YN, 'N') = 'N' ]]> diff --git a/src/main/resources/egovframework/mapper/nlib/bbs/AttachFileDAO_SQL.xml b/src/main/resources/egovframework/mapper/nlib/bbs/AttachFileDAO_SQL.xml index 8165eb8a..9610799e 100644 --- a/src/main/resources/egovframework/mapper/nlib/bbs/AttachFileDAO_SQL.xml +++ b/src/main/resources/egovframework/mapper/nlib/bbs/AttachFileDAO_SQL.xml @@ -46,19 +46,19 @@ WHERE BD_TYPE = 'QNA' AND BD_ATTACH_FILE_ID = #{attachFileId} AND (SECRET_YN = 'N' OR REG_ID = #{mbInfoId}) - AND USE_YN = 'Y' + AND IFNULL(USE_YN,'Y') = 'Y' FROM BD_NLIB_QNA WHERE BD_TYPE = UPPER('FAQ') AND BD_ATTACH_FILE_ID = #{attachFileId} - AND USE_YN = 'Y' + AND IFNULL(USE_YN,'Y') = 'Y' FROM BD_NLIB_ANCMNT WHERE BD_ATTACH_FILE_ID = #{attachFileId} AND OPEN_YN = 'Y' - AND DELETE_YN = 'N' + AND IFNULL(DELETE_YN, 'N') = 'N' AND DATE_FORMAT(NOW(), '%Y%m%d') BETWEEN IFNULL(POST_START_DATE,'00010101') AND IFNULL(POST_END_DATE, '99991231') diff --git a/src/main/resources/egovframework/mapper/nlib/bbs/FaqDAO_SQL.xml b/src/main/resources/egovframework/mapper/nlib/bbs/FaqDAO_SQL.xml index b072db22..ff244ce8 100644 --- a/src/main/resources/egovframework/mapper/nlib/bbs/FaqDAO_SQL.xml +++ b/src/main/resources/egovframework/mapper/nlib/bbs/FaqDAO_SQL.xml @@ -5,9 +5,9 @@ @@ -35,14 +35,14 @@ , A.QUESTION_TYPE , D.S_CODE_NM AS QUESTION_TYPE_NAME , A.TITLE - , A.ANSWER_YN - , A.USE_YN + , IFNULL(A.ANSWER_YN, 'N') AS ANSWER_YN + , IFNULL(A.USE_YN,'Y') AS USE_YN , A.VIEW_CNT , CASE WHEN A.BD_ATTACH_FILE_ID IS NULL OR A.BD_ATTACH_FILE_ID = '' THEN 'N' ELSE 'Y' END AS ATTACH_YN , DATE_FORMAT(A.REG_DD, '%Y-%m-%d') AS REG_DD , A2.RNO , C.USER_NM AS REG_NM - FROM BD_QNA A + FROM BD_NLIB_QNA A INNER JOIN ( SELECT QNA_ID, RNO FROM ( @@ -61,7 +61,7 @@ LEFT OUTER JOIN SM_CODE_S D ON A.QUESTION_TYPE = D.S_CODE_ID WHERE D.L_CODE_ID = 'FAQ_TYPE_CD' - AND D.USE_YN = 'Y' + AND IFNULL(D.USE_YN, 'Y') = 'Y' ORDER BY RNO DESC @@ -80,15 +80,15 @@ , D.S_CODE_NM AS QUESTION_TYPE_NAME , A.TITLE , A.CONTENT - , A.ANSWER_YN + , IFNULL(A.ANSWER_YN, 'N') AS ANSWER_YN , A.ANSWER - , A.USE_YN + , IFNULL(A.USE_YN, 'Y') AS USE_YN , A.VIEW_CNT , A.BD_ATTACH_FILE_ID , CASE WHEN A.BD_ATTACH_FILE_ID IS NULL OR A.BD_ATTACH_FILE_ID = '' THEN 'N' ELSE 'Y' END AS ATTACH_YN , DATE_FORMAT(A.REG_DD, '%Y-%m-%d') AS REG_DD , C.USER_NM AS REG_NM - FROM BD_QNA A + FROM BD_NLIB_QNA A LEFT OUTER JOIN SM_DEPT B ON B.ORG_CD = A.MNG_ORG_CD LEFT OUTER JOIN SM_USER C @@ -97,16 +97,17 @@ ON A.QUESTION_TYPE = D.S_CODE_ID WHERE A.QNA_ID = #{articleId} AND D.L_CODE_ID = 'FAQ_TYPE_CD' - AND D.USE_YN = 'Y' + AND IFNULL(D.USE_YN, 'Y') = 'Y' ORDER BY A.REG_DD DESC ]]> diff --git a/src/main/resources/egovframework/mapper/nlib/bbs/QnaDAO_SQL.xml b/src/main/resources/egovframework/mapper/nlib/bbs/QnaDAO_SQL.xml index e57170d3..c5b0e634 100644 --- a/src/main/resources/egovframework/mapper/nlib/bbs/QnaDAO_SQL.xml +++ b/src/main/resources/egovframework/mapper/nlib/bbs/QnaDAO_SQL.xml @@ -6,7 +6,7 @@ @@ -33,8 +33,8 @@ , B.DEPT_NM AS MNG_ORG_NM , A.QUESTION_TYPE , A.TITLE - , A.ANSWER_YN - , A.USE_YN + , IFNULL(A.ANSWER_YN, 'N') AS ANSWER_YN + , IFNULL(A.USE_YN, 'Y') AS USE_YN , IFNULL(A.SECRET_YN, 'N') AS SECRET_YN , A.VIEW_CNT , CASE WHEN A.BD_ATTACH_FILE_ID IS NULL OR A.BD_ATTACH_FILE_ID = '' THEN 'N' ELSE 'Y' END AS ATTACH_YN @@ -86,9 +86,9 @@ , A.QUESTION_TYPE , A.TITLE , A.CONTENT - , A.ANSWER_YN + , IFNULL(A.ANSWER_YN, 'N') AS ANSWER_YN , A.ANSWER - , A.USE_YN + , IFNULL(A.USE_YN, 'Y') AS USE_YN , IFNULL(A.SECRET_YN, 'N') AS SECRET_YN , A.VIEW_CNT , A.BD_ATTACH_FILE_ID @@ -113,6 +113,7 @@ FROM MB_INFO ) C ON A.REG_ID = C.USER_ID WHERE A.QNA_ID = #{articleId} + AND IFNULL(A.USE_YN, 'Y') = 'Y' ORDER BY A.REG_DD DESC ]]> @@ -123,7 +124,7 @@ SET VIEW_CNT = VIEW_CNT + 1 WHERE QNA_ID = #{articleId} AND BD_TYPE = 'QNA' - AND USE_YN = 'Y' + AND IFNULL(USE_YN, 'Y') = 'Y' ]]> @@ -179,8 +180,8 @@ , MOD_DD = NOW() WHERE QNA_ID = #{articleId} AND BD_TYPE = 'QNA' - AND ANSWER_YN = 'N' - AND USE_YN = 'Y' + AND IFNULL(ANSWER_YN, 'N') = 'N' + AND IFNULL(USE_YN, 'Y') = 'Y' ]]> @@ -193,8 +194,8 @@ , MOD_DD = NOW() WHERE QNA_ID = #{articleId} AND BD_TYPE = 'QNA' - AND ANSWER_YN = 'N' - AND USE_YN = 'Y' + AND IFNULL(ANSWER_YN, 'N') = 'N' + AND IFNULL(USE_YN, 'Y') = 'Y' ]]> diff --git a/src/main/webapp/WEB-INF/jsp/nlib/bbs/listFaqs.jsp b/src/main/webapp/WEB-INF/jsp/nlib/bbs/listFaqs.jsp index 2031acec..8df3e915 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/bbs/listFaqs.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/bbs/listFaqs.jsp @@ -186,10 +186,9 @@ answerHtml += "
[첨부파일]
"; for(var i=0; i" + - jsonObj.data.attachFiles[i].fileName + " (" + + jsonObj.data.attachFiles[i].attachFileId + "', " + + jsonObj.data.attachFiles[i].fileSn + ")\">" + + jsonObj.data.attachFiles[i].orignlFileNm + " (" + jsonObj.data.attachFiles[i].fileSize + " byte(s))
"; } } @@ -213,30 +212,26 @@ } + //파일 다운로드 -function fn_downloadFile(fileId, fileSeq, fileName) { - - if(fileId == null || fileId.trim().length < 1) { +function fn_downloadFile(attachFileId, fileSn) { + + if(attachFileId == null || attachFileId.trim().length < 1) { alert("파일정보를 확인해 주시기 바랍니다.[1]"); return; } - - if(fileSeq < 1) { - alert("파일정보를 확인해 주시기 바랍니다.[2]"); - return; - } - if(fileName == null || fileName.trim().length < 1) { + if(fileSn == null) { alert("파일정보를 확인해 주시기 바랍니다.[3]"); return; } - - $("#fileId").val(fileId); - $("#fileSeq").val(fileSeq); - $("#fileName").val(fileName); + + $("#attachFileId").val(attachFileId); + $("#fileSn").val(fileSn); + $("#downloadFileForm").submit(); -} +} function fn_changeQuestionType(searchQuestionType) { $("#searchQuestionType").val(searchQuestionType); @@ -303,10 +298,12 @@ function fn_changeQuestionType(searchQuestionType) {
- - - - + + + + + +
diff --git a/src/main/webapp/WEB-INF/jsp/nlib/bbs/listQnas.jsp b/src/main/webapp/WEB-INF/jsp/nlib/bbs/listQnas.jsp index d43a8ca5..67452d7f 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/bbs/listQnas.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/bbs/listQnas.jsp @@ -190,32 +190,6 @@ ); } - -//파일 다운로드 -function fn_downloadFile(fileId, fileSeq, fileName) { - - if(fileId == null || fileId.trim().length < 1) { - alert("파일정보를 확인해 주시기 바랍니다.[1]"); - return; - } - - if(fileSeq < 1) { - alert("파일정보를 확인해 주시기 바랍니다.[2]"); - return; - } - - if(fileName == null || fileName.trim().length < 1) { - alert("파일정보를 확인해 주시기 바랍니다.[3]"); - return; - } - - $("#fileId").val(fileId); - $("#fileSeq").val(fileSeq); - $("#fileName").val(fileName); - $("#downloadFileForm").submit(); - -} - function fn_changeQuestionType(searchQuestionType) { $("#searchQuestionType").val(searchQuestionType); fn_searchArticle($("#pageSize").val(), 1); @@ -287,17 +261,6 @@ function fn_newArticle() { - - -
- - - - -
- diff --git a/src/main/webapp/WEB-INF/jsp/nlib/bbs/selectAncmntArticle.jsp b/src/main/webapp/WEB-INF/jsp/nlib/bbs/selectAncmntArticle.jsp index 074abf7f..aab7f196 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/bbs/selectAncmntArticle.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/bbs/selectAncmntArticle.jsp @@ -45,30 +45,26 @@ function fn_list() { $("#articleForm").submit(); } + // 파일 다운로드 -function fn_downloadFile(fileId, fileSeq, fileName) { - - if(fileId == null || fileId.trim().length < 1) { +function fn_downloadFile(attachFileId, fileSn) { + + if(attachFileId == null || attachFileId.trim().length < 1) { alert("파일정보를 확인해 주시기 바랍니다.[1]"); return; } - - if(fileSeq < 1) { - alert("파일정보를 확인해 주시기 바랍니다.[2]"); - return; - } - if(fileName == null || fileName.trim().length < 1) { + if(fileSn == null) { alert("파일정보를 확인해 주시기 바랍니다.[3]"); return; } - - $("#fileId").val(fileId); - $("#fileSeq").val(fileSeq); - $("#fileName").val(fileName); + + $("#attachFileId").val(attachFileId); + $("#fileSn").val(fileSn); + $("#downloadFileForm").submit(); -} +} @@ -118,7 +114,7 @@ function fn_downloadFile(fileId, fileSeq, fileName) { // 파일정보 : 저장파일ID=원파일명 %> - ${attachFile.fileName} (${attachFile.fileSize} byte(s))
+ ${attachFile.orignlFileNm} (${attachFile.fileSize} byte(s))
 @@ -144,10 +140,12 @@ function fn_downloadFile(fileId, fileSeq, fileName) {
- - - - + + + + + +