Merge branch 'advc' of http://hylee@vcs.iten.co.kr:9999/hylee/offedu into advc

src/main/java/kcc/let/uat/uia/web/APILoginContoller.java

@@ -33,6 +33,7 @@ import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper;
 import kcc.com.cmm.LoginVO;
 import kcc.com.utl.fcc.service.EgovStringUtil;
 import kcc.let.uat.uia.service.EgovLoginService;
+import kcc.let.uat.uia.service.SsoLoginVO;
 import kcc.let.uss.umt.service.EgovUserManageService;
 import kcc.let.uss.umt.service.UserManageVO;
 import kcc.let.utl.sim.service.EgovClntInfo;
@@ -113,12 +114,16 @@ public class APILoginContoller {
 			loginVO.setIp(EgovClntInfo.getClntIP(request));
 			
 			LoginVO resultVO = loginService.APIActionLogin(loginVO);
+			//23.10.19 - SSO세션 추가. 개발자 로그인을 위해 SSO세션 사용 유지
+	        SsoLoginVO ssoLoginVO = new SsoLoginVO();
+	        /*ssoLoginVO.setOtherUser("Y");*/
+	        ssoLoginVO.setMembSeq("1");
 			if (loginService.getUserAuth(resultVO) != null) {
 			    resultVO.setAuthority(loginService.getUserAuth(resultVO).getAuthority());
 			}
 			resultVO.setUrl(returnUrl);
 			request.getSession().setAttribute("LoginVO", resultVO); // LoginVO세션 생성
-			request.getSession().setAttribute("SSOLoginVO", resultVO); // SSOLogin세션 사용 유지
+			request.getSession().setAttribute("SSOLoginVO", ssoLoginVO);
 			UsernamePasswordAuthenticationFilter springSecurity = new UsernamePasswordAuthenticationFilter();
 			ApplicationContext act = WebApplicationContextUtils.getRequiredWebApplicationContext(request.getSession().getServletContext());
 			Map<String, UsernamePasswordAuthenticationFilter> beans = act.getBeansOfType(UsernamePasswordAuthenticationFilter.class);
@@ -335,11 +340,16 @@ public class APILoginContoller {
 			loginVO.setIp(EgovClntInfo.getClntIP(request));
 			
 			LoginVO resultVO = loginService.APIActionLogin(loginVO);
+			//23.10.19 - SSO세션 추가. actionLogin에서 SSO세션 오류로 인해 임시로 추가
+	        SsoLoginVO ssoLoginVO = new SsoLoginVO();
+	        ssoLoginVO.setOtherUser("Y");
+	        ssoLoginVO.setMembSeq("1");
 			if (loginService.getUserAuth(resultVO) != null) {
 			    resultVO.setAuthority(loginService.getUserAuth(resultVO).getAuthority());
 			}
 			resultVO.setUrl(returnUrl);
 			request.getSession().setAttribute("LoginVO", resultVO); // LoginVO세션 생성
+			request.getSession().setAttribute("SSOLoginVO", ssoLoginVO); // SSOLogin세션 사용 유지
 			UsernamePasswordAuthenticationFilter springSecurity = new UsernamePasswordAuthenticationFilter();
 			ApplicationContext act = WebApplicationContextUtils.getRequiredWebApplicationContext(request.getSession().getServletContext());
 			Map<String, UsernamePasswordAuthenticationFilter> beans = act.getBeansOfType(UsernamePasswordAuthenticationFilter.class);

src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Tibero.xml

@@ -245,7 +245,7 @@
                     #orgnztId#          ,
                     #insttCode#         ,
                     #emplyrSttusCode#   ,
-                    NOW()           ,
+                    SYSDATE           ,
                     <isNotEmpty  property="partIdx">
                 		#partIdx#       ,
                 	</isNotEmpty>
@@ -282,7 +282,7 @@
 		              , 'Y'
 		              , #moblphonNo#
 		              , NULL
-		              ,	NOW()
+		              ,	SYSDATE
 		              ,	#uniqId#
 		              , NULL
 		              , #mberSeq#
@@ -314,12 +314,12 @@
 		              , #emplyrSttusCode#
 		              , #moblphonNo#
 		              , NULL
-		              ,	NOW()
+		              ,	SYSDATE
 		              ,	#uniqId#
 		              , NULL
 		              , #mberSeq#
-		              , NOW()
+		              , SYSDATE
-		              , NOW()
+		              , SYSDATE
 		       )
     </insert>
     
@@ -500,7 +500,7 @@
                     PSTINST_CODE          ,
                     EMPLYR_STTUS_CODE   ,
                     ESNTL_ID             ,
-                    now()
+                    SYSDATE
             FROM LETTNEMPLYRINFO
             WHERE ESNTL_ID = #uniqId#
         ]]>
@@ -630,7 +630,7 @@
               #emailYN#,
               #smsYN#,
               #photofileId#,
-              NOW()  )
+              SYSDATE  )
          ]]>              
     </insert>
 
@@ -698,7 +698,7 @@
               #emailYN#,
               #smsYN#,
               #photofileId#,
-              now()
+              SYSDATE
        )
     </update>
     
@@ -784,7 +784,7 @@
               	#snsId#    	,
               	#snsEmail#    	,
               </isNotEmpty>
-              now()
+              SYSDATE
        )
     </update>
     

src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetail_SQL_Tibero.xml

@@ -137,6 +137,7 @@
 	
 	<!-- 강사 등록 C -->
 	<insert id="VEInstrDetailDAO.insert" parameterClass="VEInstrDetailVO">
+		/*	VEInstrDetailDAO.insert	*/
 		<!-- 강사 상세 순번 처리 -->
 	    <!-- <selectKey resultClass="string" keyProperty="instrDetailOrd" >
 	        SELECT TO_NUMBER(IFNULL(MAX(TO_NUMBER(instr_detail_ord)),'0'))+1 FROM ve_instr_detail
@@ -202,6 +203,7 @@
 	
 	<!-- 강사 등록 C -->
 	<insert id="VEInstrDetailDAO.insertDup" parameterClass="VEInstrDetailVO">			
+		/*	VEInstrDetailDAO.insertDup	*/
 		INSERT INTO <include refid="VEInstrDetailDAO.table_name"/> (
 			<include refid="VEInstrDetailDAO.column_name"/>
 			

src/main/resources/egovframework/sqlmap/ve/rsdnc/VERsdnc_MIX_SQL_Tibero.xml

@@ -68,7 +68,7 @@
 	
 	<!-- 거주지 2단계 -->
 	<select id="VERsdncMIXDAO.selectRsdncStep2List" parameterClass="VERsdncVO" resultClass="VERsdncVO">
-		/*	강의 지역	-	Depth 2	*/
+		/*	강의 지역	-	Depth 2		VERsdncMIXDAO.selectRsdncStep2List	*/
 		SELECT aa.*
 			, NVL(bb.area_cd, 0) cnt
 		FROM (
@@ -126,14 +126,17 @@
 		         		)
 		         )			
 	
+	/*
 		WHERE TRIM(aa.twoDepthNm) !=''
+		*/
+		WHERE LENGTH(TRIM(aa.twoDepthNm))>0
 					
 	</select>
 	
 	<!-- 거주지 2단계 -->
 	<!-- //강사의 해당 년월의 강의 조사 선택 강의 지역 정보로 사용하도록 수정 - 2023.07.25 -->	
 	<select id="VERsdncMIXDAO.selectRsdncStep2ListNew" parameterClass="VERsdncVO" resultClass="VERsdncVO">
-		/*	강의 지역	-	Depth 2	*/
+		/*	강의 지역	-	Depth 2	VERsdncMIXDAO.selectRsdncStep2ListNew	*/
 		SELECT aa.*
 			, NVL(bb.area_cd, 0) cnt
 		FROM (
@@ -212,8 +215,11 @@
 		         			AND aa.twoDepthNm=bb.twoDepthNm 
 		         		)
 		         )			
-	
+	/*
 		WHERE TRIM(aa.twoDepthNm) !=''
+		*/
+		
+		WHERE LENGTH(TRIM(aa.twoDepthNm))>0
 					
 	</select>
 		
@@ -280,7 +286,11 @@
 		         		)
 		         )			
 	
+	/*
 		WHERE TRIM(aa.twoDepthNm) !=''
+		*/
+		
+		WHERE LENGTH(TRIM(aa.twoDepthNm))>0
 					
 	</select>
 			

src/main/webapp/WEB-INF/decorators.xml

@@ -7,7 +7,7 @@
 		<pattern>/uss/ion/fms/fmsfileUploadPopup.do</pattern>					<!-- 첨부파일 파일업로드 팝업 -->
 		<pattern>/ve/**/*Popup*</pattern>										<!-- 찾교 팝업(강사신청 반려 팝업) -->
 		<pattern>*/kccadr/oprtn/tngrVisitEdu/instrDetailPopup.do</pattern>		<!-- 강사상세 팝업 -->
-		<pattern>*/sym/mnu/mcm/EgovMenuCreat.jsp</pattern>					<!-- 매뉴생성 -->
+		<pattern>*/sym/mnu/mcm/EgovMenuCreat.jsp</pattern>					<!-- 매뉴생성 -->		
 		
 		<pattern>*/sym/cal/*</pattern>					<!-- 달력 팝업 -->
 		
@@ -43,6 +43,7 @@
 		<pattern>*/oprtn/cmm/SchduleManagerPopDetailAdult.jsp</pattern> <!-- 성인찾아가는저작권 교육 > 교육일정관리 > 교육내용 팝업 -->
 		<pattern>*/oprtn/cmm/rejectPopup.jsp</pattern>					<!-- 반려 팝업 -->
 		<pattern>*/oprtn/comm/popup/**</pattern>					<!-- 반려 팝업 -->
+		<pattern>*/ve/oprtn/instr/adultVisitEdu/popup/instrRsdnePopup.do</pattern>		<!-- 거주지 선택 팝업 -->
 	</decorator>
 	
 	<!-- 찾교 추가 관리자 -->

src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctDetail.jsp

@@ -134,6 +134,8 @@
 				$('#info_apptYr').text(info.apptYr);
 				$('#info_actvtCarer').text(info.actvtCarer);
 				$('#info_mnLctrCn').text(info.mnLctrCn);
+
+				$('#info_prfsnFld').text(info.prfsnFld);
 			}
 			,error:function(request , status, error){
 				alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error);
@@ -218,6 +220,7 @@
 		                        	<p id="info_dBirth"></p>
 		                        </td>
 		                    </tr>   
+		                    <!-- 
 		                    <tr class="trLength4">
 		                        <th scope="row">
 		                            <p>최종학교</p>
@@ -232,6 +235,7 @@
 		                        	<p id="info_mjr"></p>
 		                        </td>
 		                    </tr>
+		                     -->
 		                   <!--  <tr class="trLength2">
 		                        <th scope="row">
 		                            <p>최종학교</p>
@@ -248,6 +252,7 @@
 		                        	<p id="info_mjr"></p>
 		                        </td>
 		                    </tr> -->
+		                    <!-- 
 		                    <tr class="trLength4">
 		                        <th scope="row">
 		                            <p>위촉년도</p>
@@ -262,6 +267,7 @@
 		                        	<p id="info_divCd"></p>
 		                        </td>
 		                    </tr>
+		                     -->
 		             <!--        <tr class="trLength2">
 		                        <th scope="row">
 		                            <p>위촉년도</p>
@@ -285,6 +291,7 @@
 		                        	<p></p id="info_apptDiv"><p></p>
 		                        </td>
 		                    </tr> -->
+		                    <!-- 
 							<tr>
 								<th scope="row">
 									<p>활동경력</p>
@@ -300,7 +307,17 @@
 								<td colspan="3">
 									<p id="info_mnLctrCn"></p>
 								</td>
-							</tr>		
+							</tr>	
+							 -->
+							<tr>
+								<th scope="row">
+									<p>전문분야</p>
+								</th>
+								<td colspan="3">
+									<p id="info_prfsnFld"></p>
+								</td>
+							</tr>	
+														
 	                    </tbody>
 	                </table>
 				</div>
@@ -467,6 +484,20 @@
 				</th>
 				<td colspan="3">${info.email}</td>
 			</tr>
+			<tr>
+				<th scope="row">
+					<p>신청내용</p>
+				</th>
+				<td colspan="3">				
+					<!-- , 들어간 값을 구분해서 표시한다. -->
+					<c:set var="aplctCns" value="${fn:split(info.aplctCn,',')}" />
+					
+					<c:forEach var="aplctCn" items="${aplctCns}" varStatus="g">
+						<kc:code codeId="VEA006" code="${aplctCn}"/>
+					</c:forEach> 				
+				
+				</td>
+			</tr>			
 			<tr>
 				<th scope="row">
 					<p>희망주제</p>

src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.jsp

@@ -645,7 +645,17 @@
 				</th>
 				<td>
 					<label for="jobNm" class="label">직함 입력</label>
-					<kc:checkbox name="aplctCn" id="aplctCn" codeId="VEA006"/>					
+					<kc:checkbox name="aplctCn" id="aplctCn" codeId="VEA006"/>
+					
+					<!-- , 들어간 값을 구분해서 표시한다. -->
+					<c:set var="aplctCns" value="${fn:split(info.aplctCn,',')}" />
+					
+					<c:forEach var="aplctCn" items="${aplctCns}" varStatus="g">						
+						<script>
+						$("input[name=aplctCn][value=${aplctCn}]").prop("checked",true);
+						</script>
+					</c:forEach> 						
+										
 				</td>					
 			</tr>			
 			<tr>

src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp

@@ -366,6 +366,9 @@
 				$('#info_apptYr').text(info.apptYr);
 				$('#info_actvtCarer').text(info.actvtCarer);
 				$('#info_mnLctrCn').text(info.mnLctrCn);
+
+				$('#info_prfsnFld').text(info.prfsnFld);
+				
 			}
 			,error:function(request , status, error){
 				alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error);
@@ -450,6 +453,7 @@
 		                        	<p id="info_dBirth"></p>
 		                        </td>
 		                    </tr>   
+		                    <!-- 
 		                    <tr class="trLength4">
 		                        <th scope="row">
 		                            <p>최종학교</p>
@@ -464,6 +468,7 @@
 		                        	<p id="info_mjr"></p>
 		                        </td>
 		                    </tr>
+		                     -->
 		                   <!--  <tr class="trLength2">
 		                        <th scope="row">
 		                            <p>최종학교</p>
@@ -480,6 +485,7 @@
 		                        	<p id="info_mjr"></p>
 		                        </td>
 		                    </tr> -->
+		                    <!-- 
 		                    <tr class="trLength4">
 		                        <th scope="row">
 		                            <p>위촉년도</p>
@@ -494,6 +500,7 @@
 		                        	<p id="info_divCd"></p>
 		                        </td>
 		                    </tr>
+		                     -->
 		             <!--        <tr class="trLength2">
 		                        <th scope="row">
 		                            <p>위촉년도</p>
@@ -517,6 +524,7 @@
 		                        	<p></p id="info_apptDiv"><p></p>
 		                        </td>
 		                    </tr> -->
+		                    <!-- 
 							<tr>
 								<th scope="row">
 									<p>활동경력</p>
@@ -532,7 +540,19 @@
 								<td colspan="3">
 									<p id="info_mnLctrCn"></p>
 								</td>
+							</tr>
+							 -->
+							<tr>
+								<th scope="row">
+									<p>전문분야</p>
+								</th>
+								<td colspan="3">
+									<p id="info_prfsnFld"></p>
+								</td>
 							</tr>		
+
+						</tr>							
+											 		
 	                    </tbody>
 	                </table>
 				</div>
@@ -952,6 +972,20 @@
 				</th>
 				<td colspan="3">${info.email}</td>
 			</tr>
+			<tr>
+				<th scope="row">
+					<p>신청내용</p>
+				</th>
+				<td colspan="3">				
+					<!-- , 들어간 값을 구분해서 표시한다. -->
+					<c:set var="aplctCns" value="${fn:split(info.aplctCn,',')}" />
+					
+					<c:forEach var="aplctCn" items="${aplctCns}" varStatus="g">
+						<kc:code codeId="VEA006" code="${aplctCn}"/>
+					</c:forEach> 				
+				
+				</td>
+			</tr>				
 			<tr>
 				<th scope="row">
 					<p>희망주제</p>