2023-12-07 17:00 이수증 수정

2023-12-07 16:59:14 +09:00 · 2023-12-07 16:59:14 +09:00 · 06fbe8fc70
commit 06fbe8fc70
parent ce95503cd7
10 changed files with 317 additions and 14 deletions
--- a/src/main/java/kcc/ve/adv/tngr/stngInfo/service/VEACmpltCrtfcVO.java
+++ b/src/main/java/kcc/ve/adv/tngr/stngInfo/service/VEACmpltCrtfcVO.java
@ -26,6 +26,12 @@ public class VEACmpltCrtfcVO extends ComDefaultVO implements Serializable {
 	
 	private String rd;					//신청일자
 	
+	private String instrNm;				//과정명
+	private String desc1;				//과정명
+	private String desc2;				//과정명
+	private String desc3;				//과정명
+	private String desc4;				//과정명
+	

 	private static final long serialVersionUID = 1L;

@ -96,5 +102,35 @@ public class VEACmpltCrtfcVO extends ComDefaultVO implements Serializable {
 	public void setRd(String rd) {
 		this.rd = rd;
 	}
+	public String getInstrNm() {
+		return instrNm;
+	}
+	public void setInstrNm(String instrNm) {
+		this.instrNm = instrNm;
+	}
+	public String getDesc1() {
+		return desc1;
+	}
+	public void setDesc1(String desc1) {
+		this.desc1 = desc1;
+	}
+	public String getDesc2() {
+		return desc2;
+	}
+	public void setDesc2(String desc2) {
+		this.desc2 = desc2;
+	}
+	public String getDesc3() {
+		return desc3;
+	}
+	public void setDesc3(String desc3) {
+		this.desc3 = desc3;
+	}
+	public String getDesc4() {
+		return desc4;
+	}
+	public void setDesc4(String desc4) {
+		this.desc4 = desc4;
+	}
 	
 }
--- a/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java
+++ b/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java
@ -172,6 +172,7 @@ public class CrownixAjaxController {
 			vEACmpltCrtfcVO	=	vEACmpltCrtfcMixService.selectDetail_CC_1(vEACmpltCrtfcVO);
 			
 			vEACmpltCrtfcVO.setMberNm(egovCryptoUtil.decrypt(vEACmpltCrtfcVO.getMberNm()));
+			vEACmpltCrtfcVO.setInstrNm(egovCryptoUtil.decrypt(vEACmpltCrtfcVO.getInstrNm()));
 			
 			/*
 	    	modelAndView.addObject("data_t", "교육연수이수증X");
@ -187,20 +188,46 @@ public class CrownixAjaxController {
 			modelAndView.addObject("data_d", "2023년05월28일");
 			*/			
 			
-			modelAndView.addObject("data_t", "교육연수이수증");
+			//modelAndView.addObject("data_t", "교육연수이수증");
+			modelAndView.addObject("data_t", "<"+vEACmpltCrtfcVO.getEduCmpltCrtfcNmbr()+">");
 			
-			modelAndView.addObject("data_1", vEACmpltCrtfcVO.getEduCmpltCrtfcNmbr());
-			modelAndView.addObject("data_2", vEACmpltCrtfcVO.getMberNm());
-			modelAndView.addObject("data_3", vEACmpltCrtfcVO.getBirthDay());
-			modelAndView.addObject("data_4", vEACmpltCrtfcVO.getPrcsDiv());
-			modelAndView.addObject("data_5", vEACmpltCrtfcVO.getPrcsNm());
-			modelAndView.addObject("data_6", vEACmpltCrtfcVO.getMberNm());
-			modelAndView.addObject("data_7", vEACmpltCrtfcVO.getEduStrtPnttm()+"~"+vEACmpltCrtfcVO.getEduDdlnPnttm());
+			modelAndView.addObject("data_1", vEACmpltCrtfcVO.getPrcsNm());
+
+			String s_birthDay	=	vEACmpltCrtfcVO.getBirthDay();
+			
+			if (s_birthDay.length()==6) {
+				int i_birthDay	=	Integer.parseInt(s_birthDay.substring(0,2));
+				
+				if (i_birthDay>23) {
+					s_birthDay	=	"19"+s_birthDay.substring(0,2)+"."+s_birthDay.substring(2,4)+"."+s_birthDay.substring(4,6);	
+				}else {
+					s_birthDay	=	"20"+s_birthDay.substring(0,2)+"."+s_birthDay.substring(2,4)+"."+s_birthDay.substring(4,6);
+				}					
+			}
+			
+			
+			modelAndView.addObject("data_2", vEACmpltCrtfcVO.getMberNm()+"("+s_birthDay+")");
+			modelAndView.addObject("data_3", vEACmpltCrtfcVO.getEduStrtPnttm()+"~"+vEACmpltCrtfcVO.getEduDdlnPnttm());
+			
+			//강사명1,2,3
+			
+			if ("".equals(vEACmpltCrtfcVO.getDesc1())) {
+				modelAndView.addObject("data_41", vEACmpltCrtfcVO.getInstrNm());	
+			}else {
+				//modelAndView.addObject("data_41", vEACmpltCrtfcVO.getInstrNm());
+				modelAndView.addObject("data_41", vEACmpltCrtfcVO.getDesc1());	
+				
+			}			
+			
+			modelAndView.addObject("data_42", vEACmpltCrtfcVO.getDesc2());
+			modelAndView.addObject("data_43", vEACmpltCrtfcVO.getDesc3());
+			modelAndView.addObject("data_44", vEACmpltCrtfcVO.getDesc4());
+			
+			modelAndView.addObject("data_7", "위 사람은 한국저작권위원회에서 진행하는 '"+vEACmpltCrtfcVO.getPrcsNm()+"'을 수료 하였기에 위 교육이수증을 부여 합니다.");
 			
 			String s_rd	=	vEACmpltCrtfcVO.getRd();
-			s_rd	=	s_rd.substring(0,4)+"년"+s_rd.substring(4,6)+"년"+s_rd.substring(6,8);
-			System.out.println(s_rd);
-			System.out.println(s_rd);
+			s_rd	=	s_rd.substring(0,4)+"년 "+s_rd.substring(4,6)+"월 "+s_rd.substring(6,8)+"일";
+						
 			
 			modelAndView.addObject("data_d", s_rd);
 			
--- a/src/main/java/kcc/ve/instr/tngrVisitEdu/endInfo/web/VEEduEndController.java
+++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/endInfo/web/VEEduEndController.java
@ -391,6 +391,7 @@ public class VEEduEndController {
 		    	vEEduChasiVO.setPageIndex(0);
 		    	
 		    	vEEduChasiVO.setSiteId("10");			//설문정보를 위해서 설문지의 대상값을 넣는다.	VE0011	10-청소년, 20-성인,30-체험, 40-외부, 50-기반, 60-기소
+		    	
 		    	//대상 설문의 점수대상 확인에 필요하다.
 		    	vEEduChasiVO.setSiteIdCd("'10','20'");	//site id cd 	10-기본설문, 20-신청자설문, 30-강사설문
 		    	
--- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailVO.java
+++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailVO.java
@ -171,6 +171,37 @@ public class VEInstrDetailVO extends ComDefaultVO implements Serializable {
 	private String day1cnt;
 	private String day0cnt;
 	
+	
+	//수료증 출력용 데이터
+	private String desc1;
+	private String desc2;
+	public String getDesc1() {
+		return desc1;
+	}
+	public void setDesc1(String desc1) {
+		this.desc1 = desc1;
+	}
+	public String getDesc2() {
+		return desc2;
+	}
+	public void setDesc2(String desc2) {
+		this.desc2 = desc2;
+	}
+	public String getDesc3() {
+		return desc3;
+	}
+	public void setDesc3(String desc3) {
+		this.desc3 = desc3;
+	}
+	public String getDesc4() {
+		return desc4;
+	}
+	public void setDesc4(String desc4) {
+		this.desc4 = desc4;
+	}
+	private String desc3;
+	private String desc4;
+	
 	private String	chk;
 	
 	public String getLrnTmSum() {
--- a/src/main/java/kcc/ve/oprtn/instr/adultVisitEdu/instrInfo/web/OprtnInstrAdultPrflContoller.java
+++ b/src/main/java/kcc/ve/oprtn/instr/adultVisitEdu/instrInfo/web/OprtnInstrAdultPrflContoller.java
@ -1683,6 +1683,50 @@ public class OprtnInstrAdultPrflContoller {
 			return modelAndView;
 		}	  
 		
+	    /**
+		 *  강사 정보 수정 
+		 */		
+		@RequestMapping("/ve/oprtn/instr/adultVisitEdu/instrInfo/instrCmpltMdfyAjax.do")
+		public ModelAndView instrCmpltMdfyAjax(
+				@ModelAttribute("vEInstrDetailVO") VEInstrDetailVO vEInstrDetailVO
+				
+				, ModelMap model
+				, HttpSession session
+				, HttpServletRequest request
+				) throws Exception {
+			ModelAndView modelAndView = new ModelAndView();
+			modelAndView.setViewName("jsonView");	
+			
+			//로그인 처리====================================
+			//로그인 정보 가져오기
+	        LoginVO loginVO = checkLoginUtil.getAuthLoginVO();				//권한에 따른 로그인 정보 가져오기
+	        SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request);	//SSO 로그인 정보 가져오기
+	        
+			//로그인 처리====================================  
+	        //a
+	        vEInstrDetailVO.setLastUpdusrId(loginVO.getUniqId());
+	        //암호화
+	        //vEInstrDetailVO	=	egovCryptoUtil.encryptVEInstrDetailVO(vEInstrDetailVO);
+	        
+	        int i_ret	=	vEInstrService.update(vEInstrDetailVO);
+	        
+			//int i_ret	=	vEInstrDetailService.update(vEInstrDetailVO);
+			//vEInstrService.update(vEInstrDetailVO);
+			
+			if (i_ret>0)	modelAndView.addObject("result", "success");
+			else modelAndView.addObject("result", "fail");
+			
+			
+
+			//return "redirect:/ve/oprtn/instr/adultVisitEdu/instrInfo/instrMngList.do";
+			return modelAndView;
+		}	
+		
+		////////////////////////////////////////////////////////////////
+		//
+		//	private function
+		//
+		
 	    //페이징을 위한 처리 step1 - 페이징 기본 정보 설정
 	    private PaginationInfo setPagingStep1(
 	    		VEInstrDetailVO p_vEInstrDetailVO
--- a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetail_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetail_SQL_Tibero.xml
@ -319,8 +319,13 @@
 			<include refid="VEInstrDetailDAO.select_column_name"/>
 			, TO_CHAR(SYSDATE,'YYYY')||'년'||TO_CHAR(SYSDATE,'MM')||'월'||TO_CHAR(SYSDATE,'DD')||'일'	
 			AS	hstryPnttm
+			, b.desc_1	AS	desc1
+			, b.desc_2	AS	desc2
+			, b.desc_3	AS	desc3
+			, b.desc_4	AS	desc4
 		FROM 
 			<include refid="VEInstrDetailDAO.table_name"/> a
+			, ve_instr b
 		WHERE
 			a.instr_div	=	#instrDiv#
 		   	AND a.user_id	= 	#userId#
@ -331,6 +336,7 @@
 		   	<isNotEmpty property="useYn">
 		   		AND a.use_yn	=	#useYn#
 		   	</isNotEmpty>		   
+		   	AND a.user_id	= 	b.user_id
 		   
 	</select>
 	
--- a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_SQL_Tibero.xml
@ -20,6 +20,10 @@
       		frst_register_id,
       		last_updt_pnttm,
       		last_updusr_id
+       		, desc_1
+       		, desc_2
+       		, desc_3
+       		, desc_4
       	
 	</sql>
 	
@ -33,6 +37,11 @@
       		a.frst_register_id	AS frstRegisterId,
       		TO_CHAR(a.last_updt_pnttm,'YYYY-MM-DD')  AS lastUpdtPnttm,       		
       		a.last_updusr_id	AS lastUpdusrId
+       		
+       		, desc_1			AS	desc1
+       		, desc_2			AS	desc2
+       		, desc_3			AS	desc3
+       		, desc_4			AS	desc4       		       	   	
 	</sql>
 	
 	<!-- 강사 등록 C -->
@ -49,6 +58,10 @@
       		#frstRegisterId#,
       		SYSDATE,
       		#lastUpdusrId#
+       		, #desc1#
+       		, #desc2#
+       		, #desc3#
+       		, #desc4#
 		)
 	</insert>
 	
@ -84,6 +97,14 @@
 			, adult_instr_yn	= #adultInstrYn#
 		</isNotEmpty>
 		
+		<isNotEmpty property="desc1">
+			, desc_1	= #desc1#
+			, desc_2	= #desc2#
+			, desc_3	= #desc3#
+			, desc_4	= #desc4#
+		</isNotEmpty>
+		
+					
 		WHERE
 		   user_id	= #userId#
 	</update>	
--- a/src/main/resources/egovframework/sqlmap/ve/tngr/VEACmpltCrtfcMix_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/tngr/VEACmpltCrtfcMix_SQL_Tibero.xml
@ -30,10 +30,38 @@
 			, vpap.edu_ddln_pnttm		AS	eduDdlnPnttm
 			, vp.prcs_nm				AS	prcsNm
 			, vp.prcs_div				AS	prcsDiv
+			/*
 			, vadi.edu_cmplt_crtfc_nmbr	AS	eduCmpltCrtfcNmbr
+			*/	
+			, NVL(vadi.edu_cmplt_crtfc_nmbr,'이수번호발급전')    AS eduCmpltCrtfcNmbr
 			, to_char(sysdate, 'YYYYMMDD')	AS	rd
+			
+               , vi.DESC_1					AS	desc1 
+               , vi.DESC_2					AS	desc2
+               , vi.DESC_3					AS	desc3
+               , vi.DESC_4   				AS	desc4
+               , vid.INSTR_NM 				AS	instrNm
+			
 		FROM 
 				 ve_prcs_aplct_prd vpap
+				 
+               LEFT OUTER JOIN vea_prcs_aplct_prd_instr_asgnm vpapia
+               ON
+               (1=1
+        			AND	   vpap.PRCS_APLCT_PRD_ORD =vpapia.PRCS_APLCT_PRD_ORD               
+               )        
+               LEFT OUTER JOIN ve_instr vi
+               ON
+               (1=1
+        			AND	   vpapia.user_id=vi.USER_ID               
+               )        
+               LEFT OUTER JOIN ve_instr_detail vid
+               ON
+               (1=1
+			        AND	   	vpapia.user_id=vid.USER_ID               
+			        AND 	vid.USE_YN ='Y'
+               )    				 
+				 
 				, ve_prcs	vp
 				, vea_aplct_detail_info vadi
 				, ve_edu_aplct vea
--- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngDetail.jsp
@ -332,6 +332,40 @@ function getYears(getYear){
 			}
 		});
 	}
+
+	// 이수증강사정보 등록
+	function fnCmpltInsert() {
+		
+		$("#cmpltForm #desc1").val($("#detailForm #desc1").val());
+		$("#cmpltForm #desc2").val($("#detailForm #desc2").val());
+		$("#cmpltForm #desc3").val($("#detailForm #desc3").val());
+		$("#cmpltForm #desc4").val($("#detailForm #desc4").val());
+		
+		var data1 = new FormData(document.getElementById("cmpltForm"));		
+		
+		if(confirm("이수증 강사 정보를 수정하시겠습니까?")){
+			$.ajax({
+				type: "POST",
+				url: "${pageContext.request.contextPath}/ve/oprtn/instr/adultVisitEdu/instrInfo/instrCmpltMdfyAjax.do",
+				data: data1,
+				dataType:'json',
+				async: false,
+				processData: false,
+				contentType: false,
+				cache: false,
+				success: function (returnData, status) {
+					if(status == 'success'){
+						alert("수정되었습니다.");
+						location.reload();
+					} else if(status== 'fail'){
+						alert("수정에 실패하였습니다.");
+					}
+				},
+				error: function (e) { alert("수정에 실패하였습니다."); console.log("ERROR : ", e); }
+			});
+		}
+	    		
+	}		
 </script>
 <%-- <form id="pop" name="pop" method="post">
 	<input type="hidden" name="userId" id="userId" value="<c:out value='${info.userId}'/>"/>	<!-- 사용자 아이디 -->
@ -952,6 +986,64 @@ function getYears(getYear){
 				</div>
 			</div>		

+			<div class="tb_tit01">
+				<p>이수증 강사 정보</p>
+			</div>
+
+			<div class="tb_type02">
+				<table>
+					<colgroup>
+						<col style="width: 210px;">
+						<col style="width: auto;">
+					</colgroup>
+					
+					<tbody>
+						<tr>
+							<th scope="row">
+								<p>이수증강사소개1</p>
+							</th>
+							<td colspan="3" style="position: relative;">
+								<input type="text" name="desc1" id="desc1" value="<c:out value='${info.desc1}' />" style="width:800px;" maxLength="100"/>							
+							</td>
+						</tr>
+						<tr>
+							<th scope="row">
+								<p>이수증강사소개2</p>
+							</th>
+							<td colspan="3" style="position: relative;">
+								<input type="text" name="desc2" id="desc2" value="<c:out value='${info.desc2}' />" style="width:800px;" maxLength="100"/>							
+							</td>
+						</tr>
+						<tr>
+							<th scope="row">
+								<p>이수증강사소개3</p>
+							</th>
+							<td colspan="3" style="position: relative;">
+								<input type="text" name="desc3" id="desc3" value="<c:out value='${info.desc3}' />" style="width:800px;" maxLength="100"/>							
+							</td>
+						</tr>
+						<tr>
+							<th scope="row">
+								<p>이수증강사소개4</p>
+							</th>
+							<td colspan="3" style="position: relative;">
+								<input type="text" name="desc4" id="desc4" value="<c:out value='${info.desc4}' />" style="width:800px;" maxLength="100"/>							
+							</td>
+						</tr>
+
+
+					</tbody>
+				</table>
+			</div>	
+			
+			<div class="btn_wrap btn_layout01">
+				<div class="btn_left" style="width:60%;">						
+				</div>
+				<div class="btn_right">
+					<button type="button" class="btn_type04" onclick="fnCmpltInsert(); return false;">이수증 강사 정보 수정</button>
+				</div>
+			</div>	
+			
 		</div>
 	</div>
 </div>
@ -965,3 +1057,12 @@ function getYears(getYear){
 	<input type="hidden" name="userId" id="userId" value="<c:out value='${info.userId}'/>" />	
 	
 </form:form>
+
+<form:form id="cmpltForm" name="cmpltForm" method="post" onsubmit="return false;">
+	<input type="hidden" name="desc1" id="desc1" value="" />
+	<input type="hidden" name="desc2" id="desc2" value="" />
+	<input type="hidden" name="desc3" id="desc3" value="" />
+	<input type="hidden" name="desc4" id="desc4" value="" />	
+	<input type="hidden" name="userId" id="userId" value="<c:out value='${info.userId}'/>" />	
+	
+</form:form>
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.jsp
@ -512,8 +512,16 @@ $(document).ready(function(){
 		viewer.hideToolbarItem(["save"]);
 		viewer.showToolbarItem(["print_pdf"]);

+		viewer.useWebFont(true);
+		
 		//viewer.openFile('cmplt_crtfc_20231030.mrd');
 		//viewer.openFile('cmplt_crtfc_20231030.mrd', '/rfn [cmplt_crtfc_20231030.json]');
+		//viewer.openFile('cmplt_crtfc_20231030.mrd', '/rf [http://119.193.215.98:9989/offedu/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctCmpltCrtfcAjax.do?prcsAplctPrdOrd='+p_prcsAplctPrdOrd+'&eduAplctOrd='+p_eduAplctOrd+']');
+		/*
+		viewer.openFile('cmplt_crtfc_20231030.mrd', '/rf [http://192.168.0.59:3080/offedu/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctCmpltCrtfcAjax.do?prcsAplctPrdOrd='+p_prcsAplctPrdOrd+'&eduAplctOrd='+p_eduAplctOrd+']'
+				, {clientSidePdf: {embeddedFont: true}});
+		*/
+		//viewer.openFile('cmplt_crtfc_20231030.mrd', '/rf [http://192.168.0.59:3080/offedu/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctCmpltCrtfcAjax.do?prcsAplctPrdOrd='+p_prcsAplctPrdOrd+'&eduAplctOrd='+p_eduAplctOrd+']');
 		viewer.openFile('cmplt_crtfc_20231030.mrd', '/rf [http://119.193.215.98:9989/offedu/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctCmpltCrtfcAjax.do?prcsAplctPrdOrd='+p_prcsAplctPrdOrd+'&eduAplctOrd='+p_eduAplctOrd+']');

 	 	}