diff --git a/src/main/java/kcc/let/sym/log/clg/service/LoginLog.java b/src/main/java/kcc/let/sym/log/clg/service/LoginLog.java index 16dcb6d7..10ce589b 100644 --- a/src/main/java/kcc/let/sym/log/clg/service/LoginLog.java +++ b/src/main/java/kcc/let/sym/log/clg/service/LoginLog.java @@ -130,6 +130,8 @@ public class LoginLog extends ComDefaultVO implements Serializable { /*관리자 메소드 부분 추가*/ private String methodNm; //메소드 이름 + private String methodCd; //메소드 타입 + private String param; //파라미터 private String admotId; //메소드 ID @@ -499,5 +501,13 @@ public class LoginLog extends ComDefaultVO implements Serializable { public void setSortNum(String sortNum) { this.sortNum = sortNum; } + + public String getMethodCd() { + return methodCd; + } + + public void setMethodCd(String methodCd) { + this.methodCd = methodCd; + } } diff --git a/src/main/java/kcc/let/sym/log/clg/web/EgovLoginLogController.java b/src/main/java/kcc/let/sym/log/clg/web/EgovLoginLogController.java index 771a0ed7..f664e14d 100644 --- a/src/main/java/kcc/let/sym/log/clg/web/EgovLoginLogController.java +++ b/src/main/java/kcc/let/sym/log/clg/web/EgovLoginLogController.java @@ -107,7 +107,7 @@ public class EgovLoginLogController { loginLog.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); if("".equals(loginLog.getSearchSortCnd())){ //최초조회시 최신것 조회List - loginLog.setSearchSortCnd("a.CREAT_DT"); + loginLog.setSearchSortCnd("b.CREAT_DT"); loginLog.setSearchSortOrd("desc"); } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailVO.java index 4d7013d3..85888bb6 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailVO.java @@ -225,6 +225,137 @@ public class VEInstrDetailVO extends ComDefaultVO implements Serializable { private String actvtPeriod; + + //지적재산권 컬럼 추가 + private String carer; //경력 + + private String repQf; //대표자격 + public String getRepQf() { + return repQf; + } + public void setRepQf(String repQf) { + this.repQf = repQf; + } + public String getSubQf() { + return subQf; + } + public void setSubQf(String subQf) { + this.subQf = subQf; + } + public String getWorkArea() { + return workArea; + } + public void setWorkArea(String workArea) { + this.workArea = workArea; + } + public String getLctAvlArea1() { + return lctAvlArea1; + } + public void setLctAvlArea1(String lctAvlArea1) { + this.lctAvlArea1 = lctAvlArea1; + } + public String getLctAvlArea2() { + return lctAvlArea2; + } + public void setLctAvlArea2(String lctAvlArea2) { + this.lctAvlArea2 = lctAvlArea2; + } + public String getLctAvlArea3() { + return lctAvlArea3; + } + public void setLctAvlArea3(String lctAvlArea3) { + this.lctAvlArea3 = lctAvlArea3; + } + public String getLctAvlArea4() { + return lctAvlArea4; + } + public void setLctAvlArea4(String lctAvlArea4) { + this.lctAvlArea4 = lctAvlArea4; + } + public String getLctAvlArea5() { + return lctAvlArea5; + } + public void setLctAvlArea5(String lctAvlArea5) { + this.lctAvlArea5 = lctAvlArea5; + } + public String getLctAvlArea6() { + return lctAvlArea6; + } + public void setLctAvlArea6(String lctAvlArea6) { + this.lctAvlArea6 = lctAvlArea6; + } + public String getAvlLctCntnt1() { + return avlLctCntnt1; + } + public void setAvlLctCntnt1(String avlLctCntnt1) { + this.avlLctCntnt1 = avlLctCntnt1; + } + public String getAvlLctCntnt2() { + return avlLctCntnt2; + } + public void setAvlLctCntnt2(String avlLctCntnt2) { + this.avlLctCntnt2 = avlLctCntnt2; + } + public String getAvlLctCntnt3() { + return avlLctCntnt3; + } + public void setAvlLctCntnt3(String avlLctCntnt3) { + this.avlLctCntnt3 = avlLctCntnt3; + } + public String getGender() { + return gender; + } + public void setGender(String gender) { + this.gender = gender; + } + public String getRcrtCtgr() { + return rcrtCtgr; + } + public void setRcrtCtgr(String rcrtCtgr) { + this.rcrtCtgr = rcrtCtgr; + } + public String getApntDt() { + return apntDt; + } + public void setApntDt(String apntDt) { + this.apntDt = apntDt; + } + public String getActvDt() { + return actvDt; + } + public void setActvDt(String actvDt) { + this.actvDt = actvDt; + } + public String getOvrlSrvy() { + return ovrlSrvy; + } + public void setOvrlSrvy(String ovrlSrvy) { + this.ovrlSrvy = ovrlSrvy; + } + public static long getSerialversionuid() { + return serialVersionUID; + } + private String subQf; //세부자격 + private String workArea; //근무지역 + private String lctAvlArea1; //강의가능지역1-수도권Y/N + private String lctAvlArea2; //강의가능지역2-강원도Y/N + private String lctAvlArea3; //강의가능지역3-충청도Y/N + private String lctAvlArea4; //강의가능지역4-전라도Y/N + private String lctAvlArea5; //강의가능지역5-경상도Y/N + private String lctAvlArea6; //강의가능지역6-제주도Y/N + + private String avlLctCntnt1; //강의가능내용1-상표권교육(1)Y/N + private String avlLctCntnt2; //강의가능내용2-상표권교육(2)Y/N + private String avlLctCntnt3; //강의가능내용3-부정경쟁행위교육Y/N + + private String gender; //성별-M/F + private String rcrtCtgr; //모집구분 + private String apntDt; //위촉일 + private String actvDt; //활동일 + private String ovrlSrvy; //종합 만족도 조사 + + + public String getDesc1() { return desc1; } @@ -1133,5 +1264,11 @@ public class VEInstrDetailVO extends ComDefaultVO implements Serializable { public void setActvtPeriod(String actvtPeriod) { this.actvtPeriod = actvtPeriod; } + public String getCarer() { + return carer; + } + public void setCarer(String carer) { + this.carer = carer; + } } diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java index 3522d474..ed8f1b50 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java @@ -2201,6 +2201,7 @@ public class CndtnPrcsInfoMngController { //1.pageing step1 PaginationInfo paginationInfo = this.setPagingStep1(vEPrcsDetailVO); + paginationInfo.setRecordCountPerPage(10000); //2. pageing step2 @@ -2240,6 +2241,15 @@ public class CndtnPrcsInfoMngController { vEPrcsDetailVO.setInstrDiv(LCTR_DIV_CD); //20 vEPrcsDetailVO.setSelectPagingListQuery(selectCondition); + //정렬 + + if("".equals(vEPrcsDetailVO.getSearchSortCnd())){ //최초조회시 최신것 조회List + vEPrcsDetailVO.setOrderByQuery("A.SBMT_PNTTM DESC"); + }else{ + vEPrcsDetailVO.setOrderByQuery(vEPrcsDetailVO.getSearchSortCnd() + " " +vEPrcsDetailVO.getSearchSortOrd()); + } + + List vEInstrDetailVOList = vEPrcsAplctPrdService.selectinstrAsgnmPopupPagingList(vEPrcsDetailVO); try { @@ -3384,8 +3394,8 @@ public class CndtnPrcsInfoMngController { p_vEPrcsDetailVO.setRecordCountPerPage(p_paginationInfo.getRecordCountPerPage()); if("".equals(p_vEPrcsDetailVO.getSearchSortCnd())){ //최초조회시 최신것 조회List - p_vEPrcsDetailVO.setSearchSortCnd("prcs_ord"); - p_vEPrcsDetailVO.setSearchSortOrd("desc"); +// //p_vEPrcsDetailVO.setSearchSortCnd("prcs_ord");// + //p_vEPrcsDetailVO.setSearchSortOrd("desc"); } return p_vEPrcsDetailVO; @@ -3445,8 +3455,9 @@ public class CndtnPrcsInfoMngController { p_cndtnTrgtInfoMngVO.setRecordCountPerPage(p_paginationInfo.getRecordCountPerPage()); if("".equals(p_cndtnTrgtInfoMngVO.getSearchSortCnd())){ //최초조회시 최신것 조회List - p_cndtnTrgtInfoMngVO.setSearchSortCnd("prcs_ord"); - p_cndtnTrgtInfoMngVO.setSearchSortOrd("desc"); + //p_cndtnTrgtInfoMngVO.setSearchSortCnd("prcs_ord"); + //p_cndtnTrgtInfoMngVO.setSearchSortOrd("desc"); + } return p_cndtnTrgtInfoMngVO; diff --git 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 index 84215d59..b9540e6f 100644 --- 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 @@ -471,8 +471,8 @@ public class OprtnInstrAdultPrflContoller { //필요 쿼리 생성 및 처리 - 계좌번호만 작성된 파일 처리 String s_split = "\t"; - int i_data_column_size = 16; - int i_data_start_row = 0; + int i_data_column_size = 27; + int i_data_start_row = 2; //1.파일 정상 처리 여부와 첨부 파일 정보 @@ -491,6 +491,10 @@ public class OprtnInstrAdultPrflContoller { sb = checkFileUtil.extractFromExcelFile(multiRequest, sb, 0, i_data_column_size, i_data_start_row); } + + System.out.println("sb.toString()==================================="); + System.out.println(sb.toString()); + System.out.println(sb.toString()); @@ -517,31 +521,60 @@ public class OprtnInstrAdultPrflContoller { vEInstrDetailVO.setUseYn("Y"); vEInstrDetailVO.setInstrDiv(p_s_instr_div); - vEInstrDetailVO.setInstrNm(s_tmp[3]); - vEInstrDetailVO.setPhone(s_tmp[9]); - vEInstrDetailVO.setEmail(s_tmp[10]); - vEInstrDetailVO.setPost(s_tmp[14]); - vEInstrDetailVO.setAddr(s_tmp[13]); - vEInstrDetailVO.setRmrks(s_tmp[15]); + vEInstrDetailVO.setInstrNm(s_tmp[2]); + vEInstrDetailVO.setPhone(s_tmp[17]); + vEInstrDetailVO.setEmail(s_tmp[18]); + //vEInstrDetailVO.setPost(s_tmp[14]); + vEInstrDetailVO.setAddr(s_tmp[20]); + vEInstrDetailVO.setRmrks(s_tmp[26]); //vEInstrDetailVO.setAddrDetail(s_tmp[6]); - vEInstrDetailVO.setRsdne(s_tmp[12]); - vEInstrDetailVO.setdBirth(s_tmp[5].replaceAll("[.]", "")); + vEInstrDetailVO.setRsdne(s_tmp[6]); + vEInstrDetailVO.setdBirth(s_tmp[19].replaceAll("[.]", "")); //vEInstrDetailVO.setFinalSchol(s_tmp[9]); //vEInstrDetailVO.setMjr(s_tmp[10]); - vEInstrDetailVO.setApptYr(s_tmp[1]); - vEInstrDetailVO.setApptDiv(s_tmp[2].replaceAll("신규", "10").replaceAll("재위촉", "30").replaceAll("위촉", "20")); - vEInstrDetailVO.setBlng(s_tmp[6]); + //vEInstrDetailVO.setApptYr(s_tmp[1]); + //vEInstrDetailVO.setApptDiv(s_tmp[2].replaceAll("신규", "10").replaceAll("재위촉", "30").replaceAll("위촉", "20")); + //vEInstrDetailVO.setBlng(s_tmp[6]); - vEInstrDetailVO.setPstn(s_tmp[7]); - vEInstrDetailVO.setPrfsnFld(s_tmp[8]); - vEInstrDetailVO.setDivCd(s_tmp[4].replaceAll("입문", "10").replaceAll("전문", "20").replaceAll("내부", "30")); + //vEInstrDetailVO.setPstn(s_tmp[7]); + //vEInstrDetailVO.setPrfsnFld(s_tmp[8]); + //vEInstrDetailVO.setDivCd(s_tmp[4].replaceAll("입문", "10").replaceAll("전문", "20").replaceAll("내부", "30")); + + vEInstrDetailVO.setRepQf(s_tmp[3]); + vEInstrDetailVO.setSubQf(s_tmp[4]); + vEInstrDetailVO.setWorkArea(s_tmp[5]); + vEInstrDetailVO.setLctAvlArea1(s_tmp[7].equals("○")?"Y":"N"); + vEInstrDetailVO.setLctAvlArea2(s_tmp[8].equals("○")?"Y":"N"); + vEInstrDetailVO.setLctAvlArea3(s_tmp[9].equals("○")?"Y":"N"); + vEInstrDetailVO.setLctAvlArea4(s_tmp[10].equals("○")?"Y":"N"); + vEInstrDetailVO.setLctAvlArea5(s_tmp[11].equals("○")?"Y":"N"); + vEInstrDetailVO.setLctAvlArea6(s_tmp[12].equals("○")?"Y":"N"); + + vEInstrDetailVO.setAvlLctCntnt1(s_tmp[13].equals("○")?"Y":"N"); + vEInstrDetailVO.setAvlLctCntnt2(s_tmp[14].equals("○")?"Y":"N"); + vEInstrDetailVO.setAvlLctCntnt3(s_tmp[15].equals("○")?"Y":"N"); + + vEInstrDetailVO.setCarer(s_tmp[16]); + + vEInstrDetailVO.setGender(s_tmp[21].equals("남")?"M":"F"); + + vEInstrDetailVO.setRcrtCtgr(s_tmp[22]); + vEInstrDetailVO.setApntDt(s_tmp[23]); + vEInstrDetailVO.setActvDt(s_tmp[24]); + vEInstrDetailVO.setOvrlSrvy(s_tmp[25]); - //암호화 + System.out.println(vEInstrDetailVO.toString()); + + //암호화 vEInstrDetailVO = egovCryptoUtil.encryptVEInstrDetailVO(vEInstrDetailVO); + System.out.println(vEInstrDetailVO.toString()); + System.out.println(vEInstrDetailVO.toString()); + System.out.println(vEInstrDetailVO.toString()); + //ve_instr 데이터 존재여부 확인 - 이름, 핸드폰으로 해야 함. VEInstrDetailVO vEInstrVO = new VEInstrDetailVO(); diff --git a/src/main/resources/egovframework/sqlmap/let/sym/log/clg/EgovLoginLog_SQL_Postgresql.xml b/src/main/resources/egovframework/sqlmap/let/sym/log/clg/EgovLoginLog_SQL_Postgresql.xml index 4dba9a23..80c7628f 100644 --- a/src/main/resources/egovframework/sqlmap/let/sym/log/clg/EgovLoginLog_SQL_Postgresql.xml +++ b/src/main/resources/egovframework/sqlmap/let/sym/log/clg/EgovLoginLog_SQL_Postgresql.xml @@ -516,7 +516,7 @@ A.PRIVACY AS privacy, A.USE_YN AS useYn, A.SORT_NUM AS sortNum, - A.method_cd as dateType + A.method_cd as methodCd FROM LETTNADMINMETHOD A WHERE 1=1 @@ -573,6 +573,9 @@ , sort_num = CAST(#sortNum# as int) + + , METHOD_CD = #methodCd# + WHERE ADMOT_ID = #admotId# @@ -589,6 +592,9 @@ , sort_num = CAST(#sortNum# as int) + + , METHOD_CD = #methodCd# + WHERE METHOD_NM like CONCAT(CAST(#methodNm# as text), '%') @@ -867,8 +873,8 @@ - + /* 임시.*NOT_SQL_LOG.* LoginLogDAO.selectWebMenuLogList_bak_20251104 */ SELECT a.MENU_NM AS menuNm, a.APPRO_NM AS approNm, a.METHOD_NM AS methodNm, @@ -912,6 +918,60 @@ a.SORT_NUM ORDER BY A.SORT_NUM + + + + -

직위

+

세부자격

- + + +

소속명

+ + + + + +

강의가능내용

+ + + + + + + + + + + + +

근무지역

+ + + + + +

강의가능지역

+ + + + + + + + + + + + + + + + + + + +

경력

+ + + + + +

성별

+ + + + + + + +

모집구분

+ + + + + +

위촉일

+ + + + + + + +

활동일

+ + + + + +

종합 만족도 조사

+ + + + + + <%--

위촉구분${info.apptDiv}

@@ -510,6 +626,7 @@ --%> + + + +

비고

+ + + + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrAplctMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrAplctMngList.jsp index 46ce19de..f222c8be 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrAplctMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrAplctMngList.jsp @@ -116,7 +116,7 @@
-

이름

+

성명

- - + + - 이름 - 소속 - 직위 - 위촉년도 - 구분 + 성명 + 대표자격 + 세부자격 + 소속명 + 근무지역 등록일 @@ -185,16 +185,16 @@ - + - + - + - + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrAplctReg.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrAplctReg.jsp index 4c858273..dda2f8c2 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrAplctReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrAplctReg.jsp @@ -107,7 +107,7 @@ $( document ).ready(function(){ /* */ - if (!validateVEInstrDetailVO(document.createForm)) return; + //if (!validateVEInstrDetailVO(document.createForm)) return; /* */ @@ -123,6 +123,7 @@ $( document ).ready(function(){ } /* 청소년 강사와 다른 성인 강사 항목. 공통 validator에 없음 */ + /* if($("#finalSchol").val() == ''){ alert("최종학교는 필수입니다."); return false; @@ -132,6 +133,7 @@ $( document ).ready(function(){ alert("전공는 필수입니다."); return false; } + */ /* var ment = ""; if(type == 'I'){ @@ -147,10 +149,12 @@ $( document ).ready(function(){ // $("#mode").val(type); +/* if($("#prfsnFld").val().length > 1000){ alert("전문분야는 1000자 까지만 가능합니다.("+$("#prfsnFld").val().length+")"); return false; - } + } + */ var data = new FormData(document.getElementById("createForm")); _fileForm2.forEach(function(obj, idx) { @@ -330,6 +334,113 @@ $( document ).ready(function(){ + + +

세부자격

+ + + + + + + + +

소속명

+ + + + + +

강의가능내용

+ + + + + + + + + + + + +

근무지역

+ + + + + +

강의가능지역

+ + + + + + + + + + + + + + + + + + + + +

경력

+ + + + + +

성별

+ + + + + + + +

모집구분

+ + + + + +

위촉일

+ + + + + + + +

활동일

+ + + + + +

종합 만족도 조사

+ + + + + + + + + + + +

비고

+ + + + + +
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngDetail.jsp index b5c3a4d7..29824e46 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngDetail.jsp @@ -103,6 +103,30 @@ $( document ).ready(function(){ $(this).attr("selected","selected"); } }); + + + //강의가능지역 + if ("${info.lctAvlArea1}" == "Y") $("input[name='lctAvlArea1']").prop("checked", true); + if ("${info.lctAvlArea2}" == "Y") $("input[name='lctAvlArea2']").prop("checked", true); + if ("${info.lctAvlArea3}" == "Y") $("input[name='lctAvlArea3']").prop("checked", true); + if ("${info.lctAvlArea4}" == "Y") $("input[name='lctAvlArea4']").prop("checked", true); + if ("${info.lctAvlArea5}" == "Y") $("input[name='lctAvlArea5']").prop("checked", true); + if ("${info.lctAvlArea6}" == "Y") $("input[name='lctAvlArea6']").prop("checked", true); + + + //강의가능내용 + if ("${info.avlLctCntnt1}" == "Y") $("input[name='avlLctCntnt1']").prop("checked", true); + if ("${info.avlLctCntnt2}" == "Y") $("input[name='avlLctCntnt2']").prop("checked", true); + if ("${info.avlLctCntnt3}" == "Y") $("input[name='avlLctCntnt3']").prop("checked", true); + + //성별 + var gender = "${info.gender}" + + $('#gender option').each(function(){ + if (this.value == gender) { + $(this).attr("selected","selected"); + } + }); //파일첨부버튼 $(".btn_add_file").on('click', function(){ @@ -237,13 +261,14 @@ function getYears(getYear){ dBirth3 = "0"+dBirth3; } var dBirthAll = dBirth1 + dBirth2 + dBirth3 - $("#dBirth").val(dBirthAll); - - + $("#dBirth").val(dBirthAll); + + /* if($("#prfsnFld").val().length > 1000){ alert("전문분야는 1000자 까지만 가능합니다.("+$("#prfsnFld").val().length+")"); return false; } + */ var data1 = new FormData(document.detailForm); @@ -481,6 +506,114 @@ function getYears(getYear){ + + + +

대표자격

+ + + + + +

세부자격

+ + + + + + + +

소속명

+ + + + + +

강의가능내용

+ + +

상표권교육(1)

 +

상표권교육(2)

 +

부정경쟁행위 교육

 + + + + + +

근무지역

+ + + + + +

강의가능지역

+ + +

수도권

 +

강원도

 +

충청도

 +

전라도

 +

경상도

 +

제주도

 + + + + + + +

경력

+ + + + + +

성별

+ + +

남성

 +

여성

 + + + + + +

모집구분

+ + + + + +

위촉일

+ + + + + + + +

활동일

+ + + + + +

종합 만족도 조사

+ + + + + + + + +

비고

+ + + + + + + <%--

위촉구분

@@ -513,12 +647,14 @@ function getYears(getYear){ --%> + <%--

강의희망 교육분야

@@ -683,6 +819,121 @@ function getYears(getYear){ + + +

세부자격

+ + + + + + + +

소속명

+ + + + + +

강의가능내용

+ + + + + + + + + + + + +

근무지역

+ + + + + +

강의가능지역

+ + + + + + + + + + + + + + + + + + + +

경력

+ + + + + +

성별

+ + + + + + + +

모집구분

+ + + + + +

위촉일

+ + + + + + + +

활동일

+ + + + + +

종합 만족도 조사

+ + + + + + + + +

비고

+ + + + + + + + <%--

필수입력 항목*

diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngList.jsp index b9f76a3c..ff7333b4 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngList.jsp @@ -184,7 +184,7 @@
-

이름

+

성명

- - - + + + + + + + + <%-- --%> - 이름 - 구분 + 성명 + 대표자격 + 세부자격 + 소속명 + 근무지역 연락처 자격 종료 여부 @@ -250,7 +258,7 @@ - + ', '' , '', '');"> @@ -258,9 +266,17 @@ ', '' , '', '');" style="cursor:pointer;"> - ', '' , '', '');" style="cursor:pointer;"> - - + + + + + + + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/cndtnInstrAsgnmPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/cndtnInstrAsgnmPopup.jsp index 953da8fc..a10d1b26 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/cndtnInstrAsgnmPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/cndtnInstrAsgnmPopup.jsp @@ -109,7 +109,10 @@ - " /> + " /> + + " /> + " /> @@ -140,6 +143,7 @@
+ <%-- --%> @@ -151,12 +155,13 @@ - - + + + - - - + + + @@ -164,13 +169,28 @@ - - + + + + <%-- --%> - - - + + +
이름주소no성명소속명 선호분야온라인구분근무지역강의가능지역강의가능내용 선택
 Km + 수도권
 + 강원도
 + 충청도
 + 전라도
 + 경상도
 + 제주도
 + + 		+ 상표권교육(1)
 + 상표권교육(2)
 + 부정경쟁행위 교육
 + + 		사용자구분 - - ${loginLog.dateType}     -     U(사용자) / A(관리자) + + ${loginLog.methodCd}     -     U(사용자) / A(관리자)