이지우 - 기소유예 검색조건 변경, 등록자 등록시 첨부파일 이름 변경

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;
+	}
 	
 }

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<FileVO> 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;

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();  
 		}		
-		
+		//기본  select2 option 세팅. 값은 document.ready에서 세팅
-/* 		function srchCndt2Chg(){
+		var searchOptions;
-			alert("1234");
+ 		function srchCndt2Chg(value){
-			$(".select2-results__option").each(function(index, item){
+			if(value != ''){
-			 	alert("1234");
+				$(".select2-search").click()
-			})	
+				$(".select2-results__option").each(function(index, item){
-		} */
+					if($(this).html().indexOf(value) == -1 ){
+						$(this).hide();
+					}
+				})	
+			}
+		}
 	</script>
 	<title>교육과정관리</title>
 </head>
@@ -436,21 +441,23 @@
 						</div>
 						<div class="util_right">
 							<p>관할청&nbsp;&nbsp;</p>
-							<!-- <select name="srchCndt2" id="srchCndt2" class="sel_type1" onchange="srchCndt2Chg();">
+							<select name="srchCndt2" id="srchCndt2" class="sel_type1" onchange="srchCndt2Chg(this.value);">
 								<option value="">지역</option>
 								<option value="광주">광주</option>
 								<option value="대구">대구</option>
-								<option value="대전">부산</option>
+								<option value="대전">대전</option>
-								<option value="서울">수원</option>
+								<option value="부산">부산</option>
+								<option value="서울">서울</option>
+								<option value="수원">수원</option>
 								<option value="울산">울산</option>
-								<option value="의정">의정부</option>
+								<option value="의정">의정</option>
 								<option value="인천">인천</option>
 								<option value="전주">전주</option>
 								<option value="제주">제주</option>
 								<option value="창원">창원</option>
 								<option value="청주">청주</option>
 								<option value="춘천">춘천</option>
-							</select> -->
+							</select>
 							
 							<select name="searchSelStatusTemp" id="searchSelStatusTemp" class="sel_type1" multiple="multiple" style="width: 75%">
 								<c:forEach var="list" items="${CmmnDetailCodeList}" varStatus="status">

src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngMdfy.jsp

@@ -159,7 +159,7 @@
 		{
 			return false;
 		}
-		
+		document.getElementById("cmptntAthrtNm").value = $("#cmptntAthrt option:selected").text();
 		var data = new FormData(document.getElementById("createForm"));
 
 		//첨부파일 등록 처리-step2
@@ -326,6 +326,7 @@
 <input type="hidden" name="sspnIdtmtTrgtOrd" value="<c:out value='${info.sspnIdtmtTrgtOrd}' />"/>
 <input type="hidden" name="atchFileId" value="<c:out value='${info.atchFileId}' />" />
 <input type="hidden" name="reqNmbr" value="<c:out value="${info.reqNmbr }" />" />
+<input type="hidden" name="cmptntAthrtNm" id="cmptntAthrtNm" value="" />
 <!-- cont -->
 <div class="cont_wrap">
 	<div class="box">

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 @@
 </form:form>
 <form:form id="createForm" name="createForm" commandName="adjustDeptManageVO" method="post">
 <input type="hidden" name="sspnIdtmtTrgtOrd" id="sspnIdtmtTrgtOrd" value="" />
+<input type="hidden" name="cmptntAthrtNm" id="cmptntAthrtNm" value="" />
 
 
 <!-- cont -->