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 e1b83a3b..34f64389 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
@@ -1611,6 +1611,7 @@ public class CndtnTrgtMngController {
try {
//과정 조회
CndtnTrgtMngVO cndtnTrgtInfoVO = cndtnTrgtInfoMngService.selectDetail(cndtnTrgtInfoMngVO);
+ cndtnTrgtInfoVO = egovCryptoUtil.decryptCndtnTrgtMngVOInfo(cndtnTrgtInfoVO);
model.addAttribute("info", cndtnTrgtInfoVO);
diff --git a/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/instrInfo/web/OprtnInstrTngrPrflContoller.java b/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/instrInfo/web/OprtnInstrTngrPrflContoller.java
index 3d3cfea7..bf7e4671 100644
--- a/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/instrInfo/web/OprtnInstrTngrPrflContoller.java
+++ b/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/instrInfo/web/OprtnInstrTngrPrflContoller.java
@@ -1004,6 +1004,30 @@ public class OprtnInstrTngrPrflContoller {
return "/oprtn/tngrVisitEdu/instrAplctIsltnExcel";
}
+ /**
+ * 4. 강사활동확인서 등록 화면 (Excel)
+ */
+ @RequestMapping("/ve/oprtn/instr/tngrVisitEdu/instrInfo/instrAplctActvtExcel.do")
+ public String instrAplctActvtExcel(
+ @ModelAttribute("vEInstrDetailVO") VEInstrDetailVO vEInstrDetailVO
+
+ , ModelMap model
+ , RedirectAttributes redirectAttributes
+ , HttpSession session
+ , HttpServletRequest request
+ ) throws Exception {
+
+ //로그인 처리====================================
+ //로그인 정보 가져오기
+
+ LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기
+ SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기
+
+ //로그인 처리====================================
+
+ return "/oprtn/tngrVisitEdu/instrAplctActvtExcel";
+ }
+
/**
* 학교 정보 EXCEL 등록한다.
*
diff --git a/src/main/resources/egovframework/spring/com/context-idgen.xml b/src/main/resources/egovframework/spring/com/context-idgen.xml
index e6a5c64e..808ffffc 100644
--- a/src/main/resources/egovframework/spring/com/context-idgen.xml
+++ b/src/main/resources/egovframework/spring/com/context-idgen.xml
@@ -2993,8 +2993,8 @@
-
-
+
+
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMdfy.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMdfy.jsp
index 8c199bf8..4e93a8c8 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMdfy.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMdfy.jsp
@@ -164,7 +164,7 @@
}
// 관할청 검사
- if($("input[name='cmptntAthrt']").val()){
+ if($("input[name='cmptntAthrt']").val().trim() == ""){
alert("관할청을 입력해주세요.");
$("input[name='cmptntAthrt']").focus();
return true;
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngMdfy.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngMdfy.jsp
index 2d8fb812..4929c72d 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngMdfy.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngMdfy.jsp
@@ -212,6 +212,7 @@
// 관할청 검사
if($("input[name='cmptntAthrt']").val()){
+ //if($("input[name='cmptntAthrt']").val().trim() == ""){
alert("관할청을 입력해주세요.");
$("input[name='cmptntAthrt']").focus();
return true;
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrActvtHstryMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrActvtHstryMngDetail.jsp
index 809f1e6e..879c2101 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrActvtHstryMngDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrActvtHstryMngDetail.jsp
@@ -85,6 +85,14 @@
function fn_egov_downFile(atchFileId, fileSn){//atchFileId -> 파일 Id, fileSn -> 파일 순번
window.open("");
}
+
+ function fncGoScholExcel(){
+ alert("작업중입니다.");
+ return;
+ var detailForm = document.detailForm ;
+ detailForm.action = "";
+ detailForm.submit();
+ }
@@ -209,7 +217,13 @@
|
-
+
+
+ | 발급상태 |
+
+
+ |
+
@@ -220,15 +234,13 @@
', '0')">신청서
'); return false;">미리보기
+
+
+
-
-
-
-
-
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctActvtExcel.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctActvtExcel.jsp
new file mode 100644
index 00000000..5408a487
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctActvtExcel.jsp
@@ -0,0 +1,437 @@
+<%--
+ Class Name : instrAplctActvtExcel.jsp
+ Description : 강사활동확인서등록 화면(Excel)
+ Modification Information
+
+ 수정일 수정자 수정내용
+ ------- -------- ---------------------------
+ 2021.08.09 김봉호 최초 생성
+
+ author : 김봉호
+ since : 2021.08.09
+--%>
+<%@ page contentType="text/html; charset=utf-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %>
+<%@ taglib prefix="double-submit" uri="http://www.egovframe.go.kr/tags/double-submit/jsp" %>
+<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %>
+<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%>
+
+
+
+
+
+학교 정보 등록
+
+
+">
+
+
+
+
+
+
+<%-- --%>
+
+
+
+ " />
+ " />
+ " />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
강사 활동 등록(Excel)
+
+
+ -
+
강사활동확인서신청관리
+
+ - 강사 활동 등록(Excel)
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp
index cc6b07ac..9700987d 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp
@@ -174,38 +174,50 @@
-<%-- --%>
-<%-- --%>
-<%-- --%>
-
-<%-- --%>
-<%-- --%>
-
-<%-- --%>
-<%-- --%>
-<%-- --%>
-<%-- --%>
-<%-- --%>
-<%-- --%>
-
+
+
+
+ 정산중
+
+
+ 정산중
+
+
-
+
+
+
+
+<%-- --%>
+<%-- --%>
|
-
+
+
+
+
+
-
+
-
+<%-- --%>
+