diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngVO.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngVO.java index 57da9c50..ea7a0cc4 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngVO.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngVO.java @@ -57,7 +57,7 @@ public class CndtnTrgtMngVO extends ComDefaultVO implements Serializable { private String mergeStatus; //excel 등록시 병합상태 null or 병합 - + private String cmptntAthrtNm; // 관할청이름 - 의뢰통지서 첨부파일에 사용 @@ -288,5 +288,11 @@ public class CndtnTrgtMngVO extends ComDefaultVO implements Serializable { + ", rmrks=[" + rmrks + "] // 비고\n" ; } + public String getCmptntAthrtNm() { + return cmptntAthrtNm; + } + public void setCmptntAthrtNm(String cmptntAthrtNm) { + this.cmptntAthrtNm = cmptntAthrtNm; + } } diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java index 91cb9146..dfb591dd 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java @@ -642,6 +642,21 @@ public class CndtnTrgtMngController { modelAndView.addObject("sspnIdtmtTrgtOrd", cndtnTrgtInfoMngVO.getSspnIdtmtTrgtOrd()); modelAndView.addObject("result", "success"); + //첨부파일 이름 변경하기 + List result = new ArrayList<>(); + FileVO fileCheck = new FileVO(); + fileCheck.setAtchFileId(s_scholSealAtchFileId); + result = fileService.selectFileInfs(fileCheck); + + for(int i=0; i < result.size(); i++) { + cndtnTrgtInfoMngVO = egovCryptoUtil.decryptCndtnTrgtMngVOInfo(cndtnTrgtInfoMngVO); + String orignlFileNm = cndtnTrgtInfoMngVO.getTrgtNm() + "_"+cndtnTrgtInfoMngVO.getDBirth()+"_"+cndtnTrgtInfoMngVO.getCmptntAthrtNm(); + orignlFileNm = orignlFileNm+"_"+(i+1); + orignlFileNm = orignlFileNm +"."+ result.get(i).getFileExtsn(); + result.get(i).setOrignlFileNm(orignlFileNm); + fileService.updateFileName(result.get(i)); + } + }catch(Exception ex) { ex.printStackTrace(); modelAndView.addObject("result", "fail"); @@ -1112,7 +1127,23 @@ public class CndtnTrgtMngController { //수정 cndtnTrgtInfoMngService.update(cndtnTrgtInfoMngVO); - + try { + //첨부파일 이름 변경하기 + FileVO fileCheck = new FileVO(); + fileCheck.setAtchFileId(s_scholSealAtchFileId); + result = fileService.selectFileInfs(fileCheck); + + for(int i=0; i < result.size(); i++) { + cndtnTrgtInfoMngVO = egovCryptoUtil.decryptCndtnTrgtMngVOInfo(cndtnTrgtInfoMngVO); + String orignlFileNm = cndtnTrgtInfoMngVO.getTrgtNm() + "_"+cndtnTrgtInfoMngVO.getdBirth()+"_"+cndtnTrgtInfoMngVO.getCmptntAthrtNm(); + orignlFileNm = orignlFileNm+"_"+(i+1); + orignlFileNm = orignlFileNm +"."+ result.get(i).getFileExtsn(); + result.get(i).setOrignlFileNm(orignlFileNm); + fileService.updateFileName(result.get(i)); + } + }catch(Exception ex){ + System.out.println("error"); + } modelAndView.addObject("result", "success"); return modelAndView; diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp index 4d2a1b2c..f41ab2f6 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp @@ -96,7 +96,7 @@ } }); - + searchOptions = $("#searchSelStatusTemp").html(); }); function searchInit(){ @@ -316,13 +316,18 @@ form.target = "_duplChkPopup"; form.submit(); } - -/* function srchCndt2Chg(){ - alert("1234"); - $(".select2-results__option").each(function(index, item){ - alert("1234"); - }) - } */ + //기본 select2 option 세팅. 값은 document.ready에서 세팅 + var searchOptions; + function srchCndt2Chg(value){ + if(value != ''){ + $(".select2-search").click() + $(".select2-results__option").each(function(index, item){ + if($(this).html().indexOf(value) == -1 ){ + $(this).hide(); + } + }) + } + } 교육과정관리 @@ -436,21 +441,23 @@

관할청  

- + " /> +
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtReg.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtReg.jsp index 5bae0196..bdcf6a97 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtReg.jsp @@ -57,8 +57,8 @@ return false; } + document.getElementById("cmptntAthrtNm").value = $("#cmptntAthrt option:selected").text(); var data = new FormData(document.getElementById("createForm")); - //첨부파일 등록 처리-step2 _fileForm2.forEach(function(obj, idx) { if (obj) data.append("file"+idx, obj.fileObj); @@ -332,6 +332,7 @@ +