diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/FileVO.java b/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/FileVO.java index 4a56e375..fc3ab954 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/FileVO.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/FileVO.java @@ -7,7 +7,8 @@ import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmVO; @SuppressWarnings("serial") public class FileVO extends PgrCmmVO implements Serializable { private String adrSeq; - private String adrDocTy; /* 파일유형 */ + private String adrDocTy; /* 파일유형 code */ + private String adrDocTyTx; /* 파일유형 text */ private String atchFileId; /* 첨부파일ID */ private String fileSn; /* 파일순번 */ private String fileStreCours; /* 파일저장경로 */ @@ -140,6 +141,12 @@ public class FileVO extends PgrCmmVO implements Serializable { public void setApplyNum2(String applyNum2) { this.applyNum2 = applyNum2; } + public String getAdrDocTyTx() { + return adrDocTyTx; + } + public void setAdrDocTyTx(String adrDocTyTx) { + this.adrDocTyTx = adrDocTyTx; + } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java index 5129e918..e76f60f7 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java @@ -19,6 +19,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.mvc.support.RedirectAttributes; @@ -276,24 +277,26 @@ public class AdjReqMgrPastController { */ @RequestMapping("/kccadr/adjReqMgOff/popup/adjReqMgrPastFileRegist.do") public String adjReqMgrPastFileRegist(@ModelAttribute("adjReqMgrPastVO") AdjReqMgrPastVO adjReqMgrPastVO, ModelMap model) throws Exception { - - try { - List fileListVO = adjReqMgrPastService.fileFindById(adjReqMgrPastVO); - logger.info("fileListVO :: [{}]", fileListVO.get(0).getFrstRegistPnttm()); - - model.addAttribute("fileListVO", fileListVO); - - } catch (Exception e) { - e.printStackTrace(); - // TODO: handle exception - } -// rpplList = adjReqMgrPastService.selectAdrRpplPastList(adjReqMgrPastVO); - - return "kccadr/adjReqMgrPast/adjReqMgrPastFileRegist"; } + /** + * @methodName : selectAdjReqMgrPastFileListAjax + * @author : 이호영 + * @date : 2022.11.03 + * @description : 파일 조회 + * @param adjReqMgrPastVO + * @return + * @throws Exception + */ + @RequestMapping("/kccadr/adjReqMgOff/popup/selectAdjReqMgrPastFileListAjax.do") + public ResponseEntity selectAdjReqMgrPastFileListAjax(@RequestBody AdjReqMgrPastVO adjReqMgrPastVO) throws Exception { + logger.info("adjReqMgrPastVO :: [{}]", adjReqMgrPastVO.getAdrSeq()); + List fileListVO = adjReqMgrPastService.fileFindById(adjReqMgrPastVO); + return ResponseEntity.ok(new RestResponse(HttpStatus.OK, fileListVO, LocalDateTime.now())); + } + /** * @methodName : adjReqMgrPastProgPop * @author : 이호영 @@ -641,6 +644,8 @@ public class AdjReqMgrPastController { } return ResponseEntity.ok(new RestResponse(HttpStatus.BAD_REQUEST, "수정 중 오류가 발생하였습니다.", LocalDateTime.now())); } + + diff --git a/src/main/java/kcc/kccadr/cmm/RestResponse.java b/src/main/java/kcc/kccadr/cmm/RestResponse.java index 67535342..2685efae 100644 --- a/src/main/java/kcc/kccadr/cmm/RestResponse.java +++ b/src/main/java/kcc/kccadr/cmm/RestResponse.java @@ -66,6 +66,12 @@ public class RestResponse { this.data = data; this.timestamp = timestamp; } + + public RestResponse(HttpStatus status, List dataList, LocalDateTime timestamp) { + this.status = status; + this.dataList = dataList; + this.timestamp = timestamp; + } public HttpStatus getStatus() { return status; diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml index 99ae4b3c..249d0c89 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml @@ -1177,6 +1177,13 @@ , lfd.FILE_SN as fileSn , ard.ADR_DOC_TY as adrDocTy , lfd.ORIGNL_FILE_NM as orignlFileNm + , ( + select + le.code_nm + from lettccmmndetailcode le + where le.code_id = 'CC044' + and le.code=ard.adr_doc_ty + ) as adrDocTyTx ,TO_CHAR(ard.FRST_REGIST_PNTTM,'YYYY-MM-DD') AS frstRegistPnttm FROM ADR_RPPL_DOC ard LEFT JOIN LETTNFILEDETAIL lfd diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastFileRegist.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastFileRegist.jsp index a3cdb58e..1a29f159 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastFileRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastFileRegist.jsp @@ -35,20 +35,67 @@ $(document).ready(function(){ - $('#allUploadBtn').click(function(){ - - console.log($('.uploadBtn').length) - - $('.uploadBtn').leanth(); - $('.uploadBtn').click(); - - }) - - + fn_selectFileList(); }); +/* + * list 만들기위한 데이터 가져오기 + * */ +function fn_selectFileList(){ + var resultData = {"adrSeq": $('#adrSeq').val()} + $.ajax({ + type: "POST", + url: "", + data: JSON.stringify(resultData), + dataType:'json', + async: false, + processData: false, + contentType: "application/json", + cache: false, + success: function (returnData) { + fn_makeList(returnData.dataList); + }, + error: function (e) { alert("저장에 실패하였습니다."); console.log("ERROR : ", e); } + }); +} + + +/* + * 데이터 list 만들기 + * */ +function fn_makeList(data){ + $('#tbodyId').empty(); + var contsStr = ""; + $.each(data, function (index, data) { + + contsStr +='\t\t\t' + +'\t\t\t\t' + +'\t\t\t\t\t

'+data.frstRegistPnttm+'

' + +'\t\t\t\t' + +'\t\t\t\t\n' + +'\t\t\t\t\t'+ data.adrDocTyTx +'\n' + +'\t\t\t\t\n' + +'\t\t\t\t\n' + +'\t\t\t\t\t\n' + +'\t\t\t\t\t\t

'+data.orignlFileNm +'\n' + +'\t\t\t\t\t\n' + +'\t\t\t\t\n' + +'\t\t\t\n'; + }); + + if(data.length == 0) + contsStr='\t\t\t문서를 등록해 주세요'; + + $('#tbodyId').append(contsStr); + +} + + +/* + * 파일 정보 DB insert Ajax + * */ function fn_insertFile(data){ var resultData = { @@ -69,7 +116,6 @@ function fn_insertFile(data){ cache: false, success: function (returnData) { if(data.status == "OK"){ -// saveProcess(); alert(returnData.data); }else{ alert(returnData.data); @@ -97,23 +143,45 @@ window.onload = function() { // 업로드 완료 이벤트 control.on('uploadComplete', function (p) { - console.log(p.files); - fn_insertFile(p.files); - var f = p.files; +// console.log(p.files); + fn_insertFile(p.files); // 파일 정보 DB isnert function + fn_selectFileList(); // 파일 정보 list select function + control.removeAllFiles(); // control 초기화 +// var f = p.files; // var r = "Upload complete\n\n"; // for (var i = 0; i < f.length; i++ ) { // r += f[i].controlId + " " + f[i].clientFileName + " " + f[i].fileSize + "\n"; // } // alert(r); - var files = JSON.stringify(f); - console.log(files); - var innoJquery = innorix._load("innoJquery"); - innoJquery('form#f_write').append(''); +// var files = JSON.stringify(f); +// console.log(files); +// var innoJquery = innorix._load("innoJquery"); +// innoJquery('form#f_write').append(''); // innoJquery('form#f_write').submit(); }); }; +function fn_upload() { + + if(!$('#frstRegistPnttm').val()) + { + alert("일자를 입력해 주세요."); + return false; + } + + if(control.getUploadFiles().length > 0){ + + control.upload(); // 업로드 시작 + + }else{ + + alert("등록된 첨부파일이 없습니다."); + return false; + + } +} +