From ef59a0609e87453cc37ecee82ebb797b92b6e14a Mon Sep 17 00:00:00 2001 From: myname Date: Tue, 7 Nov 2023 14:33:34 +0900 Subject: [PATCH] =?UTF-8?q?2023-11-07=2014:22=20=EA=B4=80=EB=A6=AC?= =?UTF-8?q?=EC=9E=90=20=ED=99=94=EB=A9=B4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stngInfo/service/VEAStngMixService.java | 3 + .../tngr/stngInfo/service/VEAStngService.java | 20 + .../adv/tngr/stngInfo/service/VEAStngVO.java | 400 ++++++++- .../stngInfo/service/impl/VEAStngDAO.java | 62 ++ .../stngInfo/service/impl/VEAStngMixDAO.java | 6 + .../service/impl/VEAStngMixServiceImpl.java | 4 + .../service/impl/VEAStngServiceImpl.java | 71 ++ .../service/ScholInfoService.java | 2 + .../service/impl/ScholInfoDAO.java | 5 + .../service/impl/ScholInfoServiceImpl.java | 6 + .../web/OprtnInstrTngrPrflContoller.java | 61 +- .../web/AreaLctrMngTngrController.java | 124 +++ .../web/NewEduCnfrmMngTngrController.java | 140 +++- .../scholMng/web/ScholMngTngrController.java | 3 +- .../spring/com/context-idgen.xml | 16 +- .../tibero/sql-map-config-tibero-ve.xml | 2 + .../sqlmap/ve/schol/ScholInfo_SQL_Tibero.xml | 14 + .../ve/tngr/VEAAsgnmStngMix_SQL_Tibero.xml | 98 ++- .../ve/tngr/VEAInstrHstryMng_SQL_Tibero.xml | 219 +++++ .../ve/tngr/VEAInstrIndvdMntTm_SQL_Tibero.xml | 761 ++++++++++++++++++ .../oprtn/tngrVisitEdu/advAreaLctrMngList.jsp | 2 +- .../tngrVisitEdu/instrAplctIsltnExcel.jsp | 2 +- .../jsp/oprtn/tngrVisitEdu/instrMngDetail.jsp | 211 ++++- .../tngrVisitEdu/popup/instrHstryMngPopup.jsp | 618 ++++++++++++++ .../jsp/oprtn/tngrVisitEdu/scholMngList.jsp | 27 +- 25 files changed, 2854 insertions(+), 23 deletions(-) create mode 100644 src/main/resources/egovframework/sqlmap/ve/tngr/VEAInstrHstryMng_SQL_Tibero.xml create mode 100644 src/main/resources/egovframework/sqlmap/ve/tngr/VEAInstrIndvdMntTm_SQL_Tibero.xml create mode 100644 src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrHstryMngPopup.jsp diff --git a/src/main/java/kcc/ve/adv/tngr/stngInfo/service/VEAStngMixService.java b/src/main/java/kcc/ve/adv/tngr/stngInfo/service/VEAStngMixService.java index 81573fbe..8f1ecfd0 100644 --- a/src/main/java/kcc/ve/adv/tngr/stngInfo/service/VEAStngMixService.java +++ b/src/main/java/kcc/ve/adv/tngr/stngInfo/service/VEAStngMixService.java @@ -58,4 +58,7 @@ public interface VEAStngMixService { //VEA_INSTR_MNT_TM - 강사월별시수 int selectList_VEAIMT_2(VEAStngVO paramVO) throws Exception; // LIST + + //VEA_INSTR_INDVD_MNT_TM - 강사별월별시수 + List selectList_VEAIIMT_1(VEAStngVO paramVO) throws Exception; // LIST } diff --git a/src/main/java/kcc/ve/adv/tngr/stngInfo/service/VEAStngService.java b/src/main/java/kcc/ve/adv/tngr/stngInfo/service/VEAStngService.java index 6945eb47..16021b93 100644 --- a/src/main/java/kcc/ve/adv/tngr/stngInfo/service/VEAStngService.java +++ b/src/main/java/kcc/ve/adv/tngr/stngInfo/service/VEAStngService.java @@ -68,6 +68,17 @@ public interface VEAStngService { List selectList_VEAIMT(VEAStngVO paramVO) throws Exception; // LIST List selectPagingList_VEAIMT(VEAStngVO paramVO) throws Exception; // Page List + + //VEA_INSTR_INDVD_MNT_TM - 강사별월별시수 + void insert_VEAIIMT(VEAStngVO paramVO) throws Exception; // C + VEAStngVO selectDetail_VEAIIMT(VEAStngVO paramVO) throws Exception; // R + int update_VEAIIMT(VEAStngVO paramVO) throws Exception; // U + int delete_VEAIIMT(VEAStngVO paramVO) throws Exception; // D + List selectList_VEAIIMT(VEAStngVO paramVO) throws Exception; // LIST + List selectPagingList_VEAIIMT(VEAStngVO paramVO) throws Exception; // Page List + + int delete_VEAIIMT_query(VEAStngVO paramVO) throws Exception; // D-with query + //VEA_INSTR_RSDNC_RATIO - 강사거주지별비율 void insert_VEAIRR(VEAStngVO paramVO) throws Exception; // C @@ -85,4 +96,13 @@ public interface VEAStngService { int delete_VEABIS(VEAStngVO paramVO) throws Exception; // D List selectList_VEABIS(VEAStngVO paramVO) throws Exception; // LIST List selectPagingList_VEABIS(VEAStngVO paramVO) throws Exception; // Page List + + + //VEA_INSTR_HSTRY_MNG - 강사이력관리 + void insert_VEAIHM(VEAStngVO paramVO) throws Exception; // C + VEAStngVO selectDetail_VEAIHM(VEAStngVO paramVO) throws Exception; // R + int update_VEAIHM(VEAStngVO paramVO) throws Exception; // U + int delete_VEAIHM(VEAStngVO paramVO) throws Exception; // D + List selectList_VEAIHM(VEAStngVO paramVO) throws Exception; // LIST + List selectPagingList_VEAIHM(VEAStngVO paramVO) throws Exception; // Page List } diff --git a/src/main/java/kcc/ve/adv/tngr/stngInfo/service/VEAStngVO.java b/src/main/java/kcc/ve/adv/tngr/stngInfo/service/VEAStngVO.java index b5eb903e..4074c18c 100644 --- a/src/main/java/kcc/ve/adv/tngr/stngInfo/service/VEAStngVO.java +++ b/src/main/java/kcc/ve/adv/tngr/stngInfo/service/VEAStngVO.java @@ -98,6 +98,76 @@ public class VEAStngVO extends ComDefaultVO implements Serializable { private String stngCd; //설정코드 private String cn; //내용 + //vea_instr_indvd_mnt_tm - 강사별월별시수 + private String userId; //강사 아이디 + + private String m01Ea; //1월 설정한 강의일수 + private String m01Tm; //1월 계산된 최대 차시수 + private String m01RegisterId; //1월 등록자 + private String m01RegsitPnttm; //1월 등록일시 + + private String m02Ea; //1월 설정한 강의일수 + private String m02Tm; //1월 계산된 최대 차시수 + private String m02RegisterId; //1월 등록자 + private String m02RegsitPnttm; //1월 등록일시 + + private String m03Ea; //1월 설정한 강의일수 + private String m03Tm; //1월 계산된 최대 차시수 + private String m03RegisterId; //1월 등록자 + private String m03RegsitPnttm; //1월 등록일시 + + private String m04Ea; //1월 설정한 강의일수 + private String m04Tm; //1월 계산된 최대 차시수 + private String m04RegisterId; //1월 등록자 + private String m04RegsitPnttm; //1월 등록일시 + + private String m05Ea; //1월 설정한 강의일수 + private String m05Tm; //1월 계산된 최대 차시수 + private String m05RegisterId; //1월 등록자 + private String m05RegsitPnttm; //1월 등록일시 + + private String m06Ea; //1월 설정한 강의일수 + private String m06Tm; //1월 계산된 최대 차시수 + private String m06RegisterId; //1월 등록자 + private String m06RegsitPnttm; //1월 등록일시 + + private String m07Ea; //1월 설정한 강의일수 + private String m07Tm; //1월 계산된 최대 차시수 + private String m07RegisterId; //1월 등록자 + private String m07RegsitPnttm; //1월 등록일시 + + private String m08Ea; //1월 설정한 강의일수 + private String m08Tm; //1월 계산된 최대 차시수 + private String m08RegisterId; //1월 등록자 + private String m08RegsitPnttm; //1월 등록일시 + + private String m09Ea; //1월 설정한 강의일수 + private String m09Tm; //1월 계산된 최대 차시수 + private String m09RegisterId; //1월 등록자 + private String m09RegsitPnttm; //1월 등록일시 + + private String m10Ea; //1월 설정한 강의일수 + private String m10Tm; //1월 계산된 최대 차시수 + private String m10RegisterId; //1월 등록자 + private String m10RegsitPnttm; //1월 등록일시 + + private String m11Ea; //1월 설정한 강의일수 + private String m11Tm; //1월 계산된 최대 차시수 + private String m11RegisterId; //1월 등록자 + private String m11RegsitPnttm; //1월 등록일시 + + private String m12Ea; //1월 설정한 강의일수 + private String m12Tm; //1월 계산된 최대 차시수 + private String m12RegisterId; //1월 등록자 + private String m12RegsitPnttm; //1월 등록일시 + + //vea_instr_hstry_mng - 강사이력관리 + private String instrHstryOrd; //강사이력순번 + private String sbjct; //주제 + private String strtDt; //시작일 + private String ddlnDt; //종료일 + + //etc private String code; //설정 년도 private String psblTmQnttyCnt; //실제 신청 차시(관리자 달력용) @@ -112,7 +182,9 @@ public class VEAStngVO extends ComDefaultVO implements Serializable { private String rgstrDateState; //일자기준접수상태 0,1,2 -기간전, 기간중, 기간후 - private String searchWord; //검색어 + private String searchWord; //검색어 + + private String workWeekCnt; //주 수업 가능일수 //4 update private String tableNm; @@ -633,5 +705,331 @@ public class VEAStngVO extends ComDefaultVO implements Serializable { public void setTitleB(String titleB) { this.titleB = titleB; } + public String getUserId() { + return userId; + } + public void setUserId(String userId) { + this.userId = userId; + } + public String getM01Ea() { + return m01Ea; + } + public void setM01Ea(String m01Ea) { + this.m01Ea = m01Ea; + } + public String getM01Tm() { + return m01Tm; + } + public void setM01Tm(String m01Tm) { + this.m01Tm = m01Tm; + } + public String getM01RegisterId() { + return m01RegisterId; + } + public void setM01RegisterId(String m01RegisterId) { + this.m01RegisterId = m01RegisterId; + } + public String getM01RegsitPnttm() { + return m01RegsitPnttm; + } + public void setM01RegsitPnttm(String m01RegsitPnttm) { + this.m01RegsitPnttm = m01RegsitPnttm; + } + public String getM02Ea() { + return m02Ea; + } + public void setM02Ea(String m02Ea) { + this.m02Ea = m02Ea; + } + public String getM02Tm() { + return m02Tm; + } + public void setM02Tm(String m02Tm) { + this.m02Tm = m02Tm; + } + public String getM02RegisterId() { + return m02RegisterId; + } + public void setM02RegisterId(String m02RegisterId) { + this.m02RegisterId = m02RegisterId; + } + public String getM02RegsitPnttm() { + return m02RegsitPnttm; + } + public void setM02RegsitPnttm(String m02RegsitPnttm) { + this.m02RegsitPnttm = m02RegsitPnttm; + } + public String getM03Ea() { + return m03Ea; + } + public void setM03Ea(String m03Ea) { + this.m03Ea = m03Ea; + } + public String getM03Tm() { + return m03Tm; + } + public void setM03Tm(String m03Tm) { + this.m03Tm = m03Tm; + } + public String getM03RegisterId() { + return m03RegisterId; + } + public void setM03RegisterId(String m03RegisterId) { + this.m03RegisterId = m03RegisterId; + } + public String getM03RegsitPnttm() { + return m03RegsitPnttm; + } + public void setM03RegsitPnttm(String m03RegsitPnttm) { + this.m03RegsitPnttm = m03RegsitPnttm; + } + public String getM04Ea() { + return m04Ea; + } + public void setM04Ea(String m04Ea) { + this.m04Ea = m04Ea; + } + public String getM04Tm() { + return m04Tm; + } + public void setM04Tm(String m04Tm) { + this.m04Tm = m04Tm; + } + public String getM04RegisterId() { + return m04RegisterId; + } + public void setM04RegisterId(String m04RegisterId) { + this.m04RegisterId = m04RegisterId; + } + public String getM04RegsitPnttm() { + return m04RegsitPnttm; + } + public void setM04RegsitPnttm(String m04RegsitPnttm) { + this.m04RegsitPnttm = m04RegsitPnttm; + } + public String getM05Ea() { + return m05Ea; + } + public void setM05Ea(String m05Ea) { + this.m05Ea = m05Ea; + } + public String getM05Tm() { + return m05Tm; + } + public void setM05Tm(String m05Tm) { + this.m05Tm = m05Tm; + } + public String getM05RegisterId() { + return m05RegisterId; + } + public void setM05RegisterId(String m05RegisterId) { + this.m05RegisterId = m05RegisterId; + } + public String getM05RegsitPnttm() { + return m05RegsitPnttm; + } + public void setM05RegsitPnttm(String m05RegsitPnttm) { + this.m05RegsitPnttm = m05RegsitPnttm; + } + public String getM06Ea() { + return m06Ea; + } + public void setM06Ea(String m06Ea) { + this.m06Ea = m06Ea; + } + public String getM06Tm() { + return m06Tm; + } + public void setM06Tm(String m06Tm) { + this.m06Tm = m06Tm; + } + public String getM06RegisterId() { + return m06RegisterId; + } + public void setM06RegisterId(String m06RegisterId) { + this.m06RegisterId = m06RegisterId; + } + public String getM06RegsitPnttm() { + return m06RegsitPnttm; + } + public void setM06RegsitPnttm(String m06RegsitPnttm) { + this.m06RegsitPnttm = m06RegsitPnttm; + } + public String getM07Ea() { + return m07Ea; + } + public void setM07Ea(String m07Ea) { + this.m07Ea = m07Ea; + } + public String getM07Tm() { + return m07Tm; + } + public void setM07Tm(String m07Tm) { + this.m07Tm = m07Tm; + } + public String getM07RegisterId() { + return m07RegisterId; + } + public void setM07RegisterId(String m07RegisterId) { + this.m07RegisterId = m07RegisterId; + } + public String getM07RegsitPnttm() { + return m07RegsitPnttm; + } + public void setM07RegsitPnttm(String m07RegsitPnttm) { + this.m07RegsitPnttm = m07RegsitPnttm; + } + public String getM08Ea() { + return m08Ea; + } + public void setM08Ea(String m08Ea) { + this.m08Ea = m08Ea; + } + public String getM08Tm() { + return m08Tm; + } + public void setM08Tm(String m08Tm) { + this.m08Tm = m08Tm; + } + public String getM08RegisterId() { + return m08RegisterId; + } + public void setM08RegisterId(String m08RegisterId) { + this.m08RegisterId = m08RegisterId; + } + public String getM08RegsitPnttm() { + return m08RegsitPnttm; + } + public void setM08RegsitPnttm(String m08RegsitPnttm) { + this.m08RegsitPnttm = m08RegsitPnttm; + } + public String getM09Ea() { + return m09Ea; + } + public void setM09Ea(String m09Ea) { + this.m09Ea = m09Ea; + } + public String getM09Tm() { + return m09Tm; + } + public void setM09Tm(String m09Tm) { + this.m09Tm = m09Tm; + } + public String getM09RegisterId() { + return m09RegisterId; + } + public void setM09RegisterId(String m09RegisterId) { + this.m09RegisterId = m09RegisterId; + } + public String getM09RegsitPnttm() { + return m09RegsitPnttm; + } + public void setM09RegsitPnttm(String m09RegsitPnttm) { + this.m09RegsitPnttm = m09RegsitPnttm; + } + public String getM10Ea() { + return m10Ea; + } + public void setM10Ea(String m10Ea) { + this.m10Ea = m10Ea; + } + public String getM10Tm() { + return m10Tm; + } + public void setM10Tm(String m10Tm) { + this.m10Tm = m10Tm; + } + public String getM10RegisterId() { + return m10RegisterId; + } + public void setM10RegisterId(String m10RegisterId) { + this.m10RegisterId = m10RegisterId; + } + public String getM10RegsitPnttm() { + return m10RegsitPnttm; + } + public void setM10RegsitPnttm(String m10RegsitPnttm) { + this.m10RegsitPnttm = m10RegsitPnttm; + } + public String getM11Ea() { + return m11Ea; + } + public void setM11Ea(String m11Ea) { + this.m11Ea = m11Ea; + } + public String getM11Tm() { + return m11Tm; + } + public void setM11Tm(String m11Tm) { + this.m11Tm = m11Tm; + } + public String getM11RegisterId() { + return m11RegisterId; + } + public void setM11RegisterId(String m11RegisterId) { + this.m11RegisterId = m11RegisterId; + } + public String getM11RegsitPnttm() { + return m11RegsitPnttm; + } + public void setM11RegsitPnttm(String m11RegsitPnttm) { + this.m11RegsitPnttm = m11RegsitPnttm; + } + public String getM12Ea() { + return m12Ea; + } + public void setM12Ea(String m12Ea) { + this.m12Ea = m12Ea; + } + public String getM12Tm() { + return m12Tm; + } + public void setM12Tm(String m12Tm) { + this.m12Tm = m12Tm; + } + public String getM12RegisterId() { + return m12RegisterId; + } + public void setM12RegisterId(String m12RegisterId) { + this.m12RegisterId = m12RegisterId; + } + public String getM12RegsitPnttm() { + return m12RegsitPnttm; + } + public void setM12RegsitPnttm(String m12RegsitPnttm) { + this.m12RegsitPnttm = m12RegsitPnttm; + } + + public String getInstrHstryOrd() { + return instrHstryOrd; + } + public void setInstrHstryOrd(String instrHstryOrd) { + this.instrHstryOrd = instrHstryOrd; + } + + public String getWorkWeekCnt() { + return workWeekCnt; + } + public void setWorkWeekCnt(String workWeekCnt) { + this.workWeekCnt = workWeekCnt; + } + public String getSbjct() { + return sbjct; + } + public void setSbjct(String sbjct) { + this.sbjct = sbjct; + } + public String getStrtDt() { + return strtDt; + } + public void setStrtDt(String strtDt) { + this.strtDt = strtDt; + } + public String getDdlnDt() { + return ddlnDt; + } + public void setDdlnDt(String ddlnDt) { + this.ddlnDt = ddlnDt; + } } diff --git a/src/main/java/kcc/ve/adv/tngr/stngInfo/service/impl/VEAStngDAO.java b/src/main/java/kcc/ve/adv/tngr/stngInfo/service/impl/VEAStngDAO.java index 6d97c5aa..c8bc5794 100644 --- a/src/main/java/kcc/ve/adv/tngr/stngInfo/service/impl/VEAStngDAO.java +++ b/src/main/java/kcc/ve/adv/tngr/stngInfo/service/impl/VEAStngDAO.java @@ -217,6 +217,39 @@ public class VEAStngDAO extends EgovAbstractDAO { return tlist; } + + //VEA_INSTR_INDVD_MNT_TM - 강사별월별시수 + public void insert_VEAIIMT(VEAStngVO paramVO) throws Exception { + insert("VEAInstrIndvdMntTmDAO.insert", paramVO); + } + + public VEAStngVO selectDetail_VEAIIMT(VEAStngVO paramVO) throws Exception { + return (VEAStngVO) select("VEAInstrIndvdMntTmDAO.selectDetail", paramVO); + } + + public int update_VEAIIMT(VEAStngVO paramVO) throws Exception { + return update("VEAInstrIndvdMntTmDAO.update", paramVO); + } + + public int delete_VEAIIMT(VEAStngVO paramVO) throws Exception { + return delete("VEAInstrIndvdMntTmDAO.delete", paramVO); + } + + //L + public List selectList_VEAIIMT(VEAStngVO paramVO) throws Exception { + List tlist = (List) list("VEAInstrIndvdMntTmDAO.selectList", paramVO); + return tlist; + } + + public List selectPagingList_VEAIIMT(VEAStngVO paramVO) throws Exception { + List tlist = (List) list("VEAInstrIndvdMntTmDAO.selectPagingList", paramVO); + return tlist; + } + + public int delete_VEAIIMT_query(VEAStngVO paramVO) throws Exception { + return delete("VEAInstrIndvdMntTmDAO.delete_query", paramVO); + } + //VEA_INSTR_RSDNC_RATIO - 강사거주지별비율 public void insert_VEAIRR(VEAStngVO paramVO) throws Exception { @@ -274,4 +307,33 @@ public class VEAStngDAO extends EgovAbstractDAO { List tlist = (List) list("VEABasicInfoStngDAO.selectPagingList", paramVO); return tlist; } + + + //VEA_INSTR_HSTRY_MNG - 강사이력관리 + public void insert_VEAIHM(VEAStngVO paramVO) throws Exception { + insert("VEAInstrHstryMngDAO.insert", paramVO); + } + + public VEAStngVO selectDetail_VEAIHM(VEAStngVO paramVO) throws Exception { + return (VEAStngVO) select("VEAInstrHstryMngDAO.selectDetail", paramVO); + } + + public int update_VEAIHM(VEAStngVO paramVO) throws Exception { + return update("VEAInstrHstryMngDAO.update", paramVO); + } + + public int delete_VEAIHM(VEAStngVO paramVO) throws Exception { + return delete("VEAInstrHstryMngDAO.delete", paramVO); + } + + //L + public List selectList_VEAIHM(VEAStngVO paramVO) throws Exception { + List tlist = (List) list("VEAInstrHstryMngDAO.selectList", paramVO); + return tlist; + } + + public List selectPagingList_VEAIHM(VEAStngVO paramVO) throws Exception { + List tlist = (List) list("VEAInstrHstryMngDAO.selectPagingList", paramVO); + return tlist; + } } diff --git a/src/main/java/kcc/ve/adv/tngr/stngInfo/service/impl/VEAStngMixDAO.java b/src/main/java/kcc/ve/adv/tngr/stngInfo/service/impl/VEAStngMixDAO.java index 4223554e..ff2f4bac 100644 --- a/src/main/java/kcc/ve/adv/tngr/stngInfo/service/impl/VEAStngMixDAO.java +++ b/src/main/java/kcc/ve/adv/tngr/stngInfo/service/impl/VEAStngMixDAO.java @@ -94,4 +94,10 @@ public class VEAStngMixDAO extends EgovAbstractDAO { public int selectList_VEAIMT_2(VEAStngVO paramVO) throws Exception { return (int) select("VEAAsgnmStngMixDAO.selectList_VEAIMT_2", paramVO); } + + //L + public List selectList_VEAIIMT_1(VEAStngVO paramVO) throws Exception { + List tlist = (List) list("VEAAsgnmStngMixDAO.selectList_VEAIIMT_1", paramVO); + return tlist; + } } diff --git a/src/main/java/kcc/ve/adv/tngr/stngInfo/service/impl/VEAStngMixServiceImpl.java b/src/main/java/kcc/ve/adv/tngr/stngInfo/service/impl/VEAStngMixServiceImpl.java index 6c9d4ac7..75029bad 100644 --- a/src/main/java/kcc/ve/adv/tngr/stngInfo/service/impl/VEAStngMixServiceImpl.java +++ b/src/main/java/kcc/ve/adv/tngr/stngInfo/service/impl/VEAStngMixServiceImpl.java @@ -302,4 +302,8 @@ public class VEAStngMixServiceImpl implements VEAStngMixService { public int selectList_VEAIMT_2(VEAStngVO paramVO) throws Exception{ return vEAStngMixDAO.selectList_VEAIMT_2(paramVO); } + + public List selectList_VEAIIMT_1(VEAStngVO paramVO) throws Exception{ + return vEAStngMixDAO.selectList_VEAIIMT_1(paramVO); + } } diff --git a/src/main/java/kcc/ve/adv/tngr/stngInfo/service/impl/VEAStngServiceImpl.java b/src/main/java/kcc/ve/adv/tngr/stngInfo/service/impl/VEAStngServiceImpl.java index 67f34074..a92ab244 100644 --- a/src/main/java/kcc/ve/adv/tngr/stngInfo/service/impl/VEAStngServiceImpl.java +++ b/src/main/java/kcc/ve/adv/tngr/stngInfo/service/impl/VEAStngServiceImpl.java @@ -261,6 +261,44 @@ public class VEAStngServiceImpl implements VEAStngService { } + //VEA_INSTR_INDVD_MNT_TM - 강사별월별시수 + //C + public void insert_VEAIIMT(VEAStngVO paramVO) throws Exception { + vEAStngDAO.insert_VEAIIMT(paramVO); + } + + //R + public VEAStngVO selectDetail_VEAIIMT(VEAStngVO paramVO) throws Exception { + return vEAStngDAO.selectDetail_VEAIIMT(paramVO); + } + + //U + public int update_VEAIIMT(VEAStngVO paramVO) throws Exception{ + + return vEAStngDAO.update_VEAIIMT(paramVO); + } + + //D + public int delete_VEAIIMT(VEAStngVO paramVO) throws Exception{ + return vEAStngDAO.delete_VEAIIMT(paramVO); + } + + //List + public List selectList_VEAIIMT(VEAStngVO paramVO) throws Exception{ + return vEAStngDAO.selectList_VEAIIMT(paramVO); + } + + //paging List + public List selectPagingList_VEAIIMT(VEAStngVO paramVO) throws Exception{ + return vEAStngDAO.selectPagingList_VEAIIMT(paramVO); + } + + //D + public int delete_VEAIIMT_query(VEAStngVO paramVO) throws Exception{ + return vEAStngDAO.delete_VEAIIMT_query(paramVO); + } + + //VEA_INSTR_RSDNC_RATIO - 강사거주지별비율 //C public void insert_VEAIRR(VEAStngVO paramVO) throws Exception { @@ -325,4 +363,37 @@ public class VEAStngServiceImpl implements VEAStngService { public List selectPagingList_VEABIS(VEAStngVO paramVO) throws Exception{ return vEAStngDAO.selectPagingList_VEABIS(paramVO); } + + + //VEA_INSTR_HSTRY_MNG - 강사이력관리 + //C + public void insert_VEAIHM(VEAStngVO paramVO) throws Exception { + vEAStngDAO.insert_VEAIHM(paramVO); + } + + //R + public VEAStngVO selectDetail_VEAIHM(VEAStngVO paramVO) throws Exception { + return vEAStngDAO.selectDetail_VEAIHM(paramVO); + } + + //U + public int update_VEAIHM(VEAStngVO paramVO) throws Exception{ + + return vEAStngDAO.update_VEAIHM(paramVO); + } + + //D + public int delete_VEAIHM(VEAStngVO paramVO) throws Exception{ + return vEAStngDAO.delete_VEAIHM(paramVO); + } + + //List + public List selectList_VEAIHM(VEAStngVO paramVO) throws Exception{ + return vEAStngDAO.selectList_VEAIHM(paramVO); + } + + //paging List + public List selectPagingList_VEAIHM(VEAStngVO paramVO) throws Exception{ + return vEAStngDAO.selectPagingList_VEAIHM(paramVO); + } } diff --git a/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/service/ScholInfoService.java b/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/service/ScholInfoService.java index ec8c1807..6fecb908 100644 --- a/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/service/ScholInfoService.java +++ b/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/service/ScholInfoService.java @@ -26,4 +26,6 @@ public interface ScholInfoService { int insertSelectIsltn(ScholInfoVO scholInfoVO) throws Exception; + int insertSelectIsltn20231107(ScholInfoVO scholInfoVO) throws Exception; + } diff --git a/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/service/impl/ScholInfoDAO.java b/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/service/impl/ScholInfoDAO.java index 45c7fab9..362ddfcd 100644 --- a/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/service/impl/ScholInfoDAO.java +++ b/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/service/impl/ScholInfoDAO.java @@ -57,4 +57,9 @@ public class ScholInfoDAO extends EgovAbstractDAO { public int insertSelectIsltn(ScholInfoVO scholInfoVO) throws Exception { return update("ScholInfoDAO.insertSelectIsltn", scholInfoVO); } + + public int insertSelectIsltn20231107(ScholInfoVO scholInfoVO) throws Exception { + return update("ScholInfoDAO.insertSelectIsltn20231107", scholInfoVO); + } + } diff --git a/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/service/impl/ScholInfoServiceImpl.java b/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/service/impl/ScholInfoServiceImpl.java index 5d1e6e9a..dbc661dc 100644 --- a/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/service/impl/ScholInfoServiceImpl.java +++ b/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/service/impl/ScholInfoServiceImpl.java @@ -64,4 +64,10 @@ public class ScholInfoServiceImpl implements ScholInfoService { public int insertSelectIsltn(ScholInfoVO scholInfoVO) throws Exception { return scholInfoDAO.insertSelectIsltn(scholInfoVO); } + + @Override + public int insertSelectIsltn20231107(ScholInfoVO scholInfoVO) throws Exception { + return scholInfoDAO.insertSelectIsltn20231107(scholInfoVO); + } + } 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 48ed5dda..a83aaa9e 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 @@ -46,6 +46,9 @@ import kcc.let.cop.bbs.service.Board; import kcc.let.uat.uia.service.SsoLoginVO; import kcc.let.utl.fcc.service.EgovCryptoUtil; import kcc.let.utl.fcc.service.EgovCryptoUtil4VO; +import kcc.ve.adv.tngr.stngInfo.service.VEAStngMixService; +import kcc.ve.adv.tngr.stngInfo.service.VEAStngService; +import kcc.ve.adv.tngr.stngInfo.service.VEAStngVO; import kcc.ve.aplct.cpyrgExprnClsrm.exprnClsrmAplct.service.ScholInfoService; import kcc.ve.aplct.cpyrgExprnClsrm.exprnClsrmAplct.service.ScholInfoVO; import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEEduPnltyService; @@ -209,6 +212,14 @@ public class OprtnInstrTngrPrflContoller { @Resource(name = "vEEduPnltyService") private VEEduPnltyService vEEduPnltyService; + //강의설정 관리 + @Resource(name = "vEAStngService") + private VEAStngService vEAStngService; + + //강의설정 관리(MIX) + @Resource(name = "vEAStngMixService") + private VEAStngMixService vEAStngMixService; + /** * 1.강사등록신청 목록 조회 - */ @@ -1186,11 +1197,20 @@ public class OprtnInstrTngrPrflContoller { for (int i=1; i 0) { succCnt++; @@ -2594,6 +2614,43 @@ public class OprtnInstrTngrPrflContoller { return modelAndView; } + /** + * 6. 강사 이력 관리 팝업 + */ + @RequestMapping("/kccadr/oprtn/tngrVisitEdu/popup/instrHstryMngPopup.do") + public String advRndsStngMngPopup( + @ModelAttribute("vEAStngVO") VEAStngVO vEAStngVO + , ModelMap model + , HttpServletRequest request + ) throws Exception { + + //로그인 처리==================================== + //로그인 정보 가져오기 + + //String s_userCheckNInfo = checkLoginUtil.userCheckNInfo(model, request); + //if (!"".equals(s_userCheckNInfo)) return s_userCheckNInfo; + + //로그인 처리==================================== + + + try { + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + vEAStngVO.setFrstRegisterId(loginVO.getUniqId()); + + //등록된 해당 년도의 회차리스트 정보 가져오기 + List selectBasicList = vEAStngService.selectList_VEALRS(vEAStngVO); + + model.addAttribute("selectBasicList", selectBasicList); + + + }catch(Exception ex) + { + ex.printStackTrace(); + } + + + return "oprtn/tngrVisitEdu/popup/instrHstryMngPopup"; + } ///////////////////////////////////////////////////////////////////////////////////// // diff --git a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/areaLctrMng/web/AreaLctrMngTngrController.java b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/areaLctrMng/web/AreaLctrMngTngrController.java index 65f9f411..c317bee1 100644 --- a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/areaLctrMng/web/AreaLctrMngTngrController.java +++ b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/areaLctrMng/web/AreaLctrMngTngrController.java @@ -853,6 +853,130 @@ public class AreaLctrMngTngrController { } + /** + * 강사이력 등록 처리 + */ + @RequestMapping("popup/instrHstryRegAjax.do") + public ModelAndView instrHstryRegPopupAjax( + @ModelAttribute("vEInstrAsgnmVO") VEInstrAsgnmVO vEInstrAsgnmVO + , ModelMap model + //, RedirectAttributes redirectAttributes + , HttpServletRequest request + ) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + //로그인 처리==================================== + //로그인 정보 가져오기 + String s_oprtnLoginCheckNInfo = checkLoginUtil.oprtnCheckNInfo(model); + if (!"".equals(s_oprtnLoginCheckNInfo)) { + modelAndView.addObject("result", "loginFail"); + return modelAndView; + } + //로그인 처리==================================== + + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + + //교육차시강사배정 테이블에 패널티 정보 update + try { + //목록에서 한 패널티를 여러 유저에게 등록 시 + if(!"".equals(vEInstrAsgnmVO.getChk()) && vEInstrAsgnmVO.getChk() != null) { + String[] splitChk = vEInstrAsgnmVO.getChk().split(","); + String[] userId = vEInstrAsgnmVO.getUserId().split(","); + for(int i=0; i selectList_VEAIIMT_1 = vEAStngMixService.selectList_VEAIIMT_1(vEAStngVO); + + for (int i=0;i - + + + + + + + + + + + + + + + diff --git a/src/main/resources/egovframework/sqlmap/config/tibero/sql-map-config-tibero-ve.xml b/src/main/resources/egovframework/sqlmap/config/tibero/sql-map-config-tibero-ve.xml index 76ab27c7..b40e7198 100644 --- a/src/main/resources/egovframework/sqlmap/config/tibero/sql-map-config-tibero-ve.xml +++ b/src/main/resources/egovframework/sqlmap/config/tibero/sql-map-config-tibero-ve.xml @@ -127,6 +127,8 @@ + + diff --git a/src/main/resources/egovframework/sqlmap/ve/schol/ScholInfo_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/schol/ScholInfo_SQL_Tibero.xml index cbd12b42..2c8e6ace 100644 --- a/src/main/resources/egovframework/sqlmap/ve/schol/ScholInfo_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/schol/ScholInfo_SQL_Tibero.xml @@ -362,6 +362,20 @@ ON DUPLICATE KEY UPDATE schol_id = t.schol_id + + + /* ScholInfoDAO.insertSelectIsltn20231107 */ + UPDATE ve_schol a + SET a.isltn_yn=#isltnYn# + , a.isltn2_yn=#isltn2Yn# + , a.isltn3_yn=#isltn3Yn# + , a.ppltn_reduc_area_yn=#ppltnReducAreaYn# + WHERE a.SCHOL_ID =( + SELECT schol_id + FROM ve_schol + WHERE stndrd_schol_cd=#stndrdScholCd# + ) + + diff --git a/src/main/resources/egovframework/sqlmap/ve/tngr/VEAInstrHstryMng_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/tngr/VEAInstrHstryMng_SQL_Tibero.xml new file mode 100644 index 00000000..f07fab78 --- /dev/null +++ b/src/main/resources/egovframework/sqlmap/ve/tngr/VEAInstrHstryMng_SQL_Tibero.xml @@ -0,0 +1,219 @@ + + + + + + + + + + vea_instr_hstry_mng + + + + + instr_hstry_ord, + + user_id, + sbjct, + cn, + strt_dt, + ddln_dt, + + frst_regist_pnttm, + frst_register_id + + + + + + + a.instr_hstry_ord AS instrHstryOrd, + + a.user_id AS userId, + a.sbjct AS sbjct, + a.cn AS cn, + a.strt_dt AS strtDt, + a.ddln_dt AS ddlnDt, + + + TO_CHAR(a.frst_regist_pnttm,'YYYY-MM-DD') AS frstRegistPnttm, + a.frst_register_id AS frstRegisterId + + + + + + /* VEAInstrHstryMngDAO.insert */ + MERGE INTO + USING DUAL + ON(instr_hstry_ord=#instrHstryOrd#) + + WHEN NOT MATCHED THEN + INSERT + ( + + ) + VALUES( + #instrHstryOrd#, + + #userId#, + #sbjct#, + #cn#, + #strtDt#, + #ddlnDt#, + + SYSDATE, + #frstRegisterId# + ) + WHEN MATCHED THEN + UPDATE + SET user_id = #userId# + + , sbjct = #sbjct# + , cn = #cn# + , strtDt = #strtDt# + , ddlnDt = #ddlnDt# + , frst_regist_pnttm = SYSDATE + , frst_register_id = #frstRegisterId# + + + + + + + + /* VEAInstrHstryMngDAO.update */ + MERGE INTO + USING DUAL + ON(instr_hstry_ord=#instrHstryOrd#) + + WHEN NOT MATCHED THEN + INSERT + ( + + ) + VALUES( + #instrHstryOrd#, + + #userId#, + #sbjct#, + #cn#, + #strtDt#, + #ddlnDt#, + + SYSDATE, + #frstRegisterId# + ) + WHEN MATCHED THEN + UPDATE + SET user_id = #userId# + + , sbjct = #sbjct# + , cn = #cn# + , strtDt = #strtDt# + , ddlnDt = #ddlnDt# + , frst_regist_pnttm = SYSDATE + , frst_register_id = #frstRegisterId# + + + + + + + + DELETE FROM + a + WHERE + a.instr_hstry_ord=#instrHstryOrd# + + + + + + + + + + diff --git a/src/main/resources/egovframework/sqlmap/ve/tngr/VEAInstrIndvdMntTm_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/tngr/VEAInstrIndvdMntTm_SQL_Tibero.xml new file mode 100644 index 00000000..7be8751d --- /dev/null +++ b/src/main/resources/egovframework/sqlmap/ve/tngr/VEAInstrIndvdMntTm_SQL_Tibero.xml @@ -0,0 +1,761 @@ + + + + + + + + + + vea_instr_indvd_mnt_tm + + + + + yr, + user_id, + + m01_ea, + m01_tm, + m01_regist_pnttm, + m01_register_id, + + m02_ea, + m02_tm, + m02_regist_pnttm, + m02_register_id, + + m03_ea, + m03_tm, + m03_regist_pnttm, + m03_register_id, + + m04_ea, + m04_tm, + m04_regist_pnttm, + m04_register_id, + + m05_ea, + m05_tm, + m05_regist_pnttm, + m05_register_id, + + m06_ea, + m06_tm, + m06_regist_pnttm, + m06_register_id, + + m07_ea, + m07_tm, + m07_regist_pnttm, + m07_register_id, + + m08_ea, + m08_tm, + m08_regist_pnttm, + m08_register_id, + + m09_ea, + m09_tm, + m09_regist_pnttm, + m09_register_id, + + m10_ea, + m10_tm, + m10_regist_pnttm, + m10_register_id, + + m11_ea, + m11_tm, + m11_regist_pnttm, + m11_register_id, + + m12_ea, + m12_tm, + m12_regist_pnttm, + m12_register_id + + + + + + a.yr AS yr, + a.user_id AS userId, + + a.m01_ea AS m01Ea, + a.m01_tm AS m01Tm, + TO_CHAR(a.m01_regist_pnttm,'YYYY-MM-DD') AS m01RegistPnttm, + a.m01_register_id AS m01RegisterId, + + a.m02_ea AS m02Ea, + a.m02_tm AS m02Tm, + TO_CHAR(a.m02_regist_pnttm,'YYYY-MM-DD') AS m02RegistPnttm, + a.m02_register_id AS m02RegisterId, + + a.m03_ea AS m03Ea, + a.m03_tm AS m03Tm, + TO_CHAR(a.m03_regist_pnttm,'YYYY-MM-DD') AS m03RegistPnttm, + a.m03_register_id AS m03RegisterId, + + a.m04_ea AS m04Ea, + a.m04_tm AS m04Tm, + TO_CHAR(a.m04_regist_pnttm,'YYYY-MM-DD') AS m04RegistPnttm, + a.m04_register_id AS m04RegisterId, + + a.m05_ea AS m05Ea, + a.m05_tm AS m05Tm, + TO_CHAR(a.m05_regist_pnttm,'YYYY-MM-DD') AS m05RegistPnttm, + a.m05_register_id AS m05RegisterId, + + a.m06_ea AS m06Ea, + a.m06_tm AS m06Tm, + TO_CHAR(a.m06_regist_pnttm,'YYYY-MM-DD') AS m06RegistPnttm, + a.m06_register_id AS m06RegisterId, + + a.m07_ea AS m07Ea, + a.m07_tm AS m07Tm, + TO_CHAR(a.m07_regist_pnttm,'YYYY-MM-DD') AS m07RegistPnttm, + a.m07_register_id AS m07RegisterId, + + a.m08_ea AS m08Ea, + a.m08_tm AS m08Tm, + TO_CHAR(a.m08_regist_pnttm,'YYYY-MM-DD') AS m08RegistPnttm, + a.m08_register_id AS m08RegisterId, + + a.m09_ea AS m09Ea, + a.m09_tm AS m09Tm, + TO_CHAR(a.m09_regist_pnttm,'YYYY-MM-DD') AS m09RegistPnttm, + a.m09_register_id AS m09RegisterId, + + a.m10_ea AS m10Ea, + a.m10_tm AS m10Tm, + TO_CHAR(a.m10_regist_pnttm,'YYYY-MM-DD') AS m10RegistPnttm, + a.m10_register_id AS m10RegisterId, + + a.m11_ea AS m11Ea, + a.m11_tm AS m11Tm, + TO_CHAR(a.m11_regist_pnttm,'YYYY-MM-DD') AS m11RegistPnttm, + a.m11_register_id AS m11RegisterId, + + a.m12_ea AS m12Ea, + a.m12_tm AS m12Tm, + TO_CHAR(a.m12_regist_pnttm,'YYYY-MM-DD') AS m12RegistPnttm, + a.m12_register_id AS m12RegisterId + + + + + + /* VEAInstrIndvdMntTmDAO.insert */ + MERGE INTO + USING DUAL + ON(yr=#yr# AND user_id=#userId#) + + WHEN NOT MATCHED THEN + INSERT + ( + + ) + VALUES( + #yr#, + #userId#, + + + #m01Ea#, + #m01Tm#, + + + SYSDATE, + + NULL, + + + #m01RegisterId#, + + + #m02Ea#, + #m02Tm#, + + + SYSDATE, + + NULL, + + + #m02RegisterId#, + + #m03Ea#, + #m03Tm#, + + SYSDATE, + + NULL, + + #m03RegisterId#, + + #m04Ea#, + #m04Tm#, + + SYSDATE, + + NULL, + + #m04RegisterId#, + + #m05Ea#, + #m05Tm#, + + SYSDATE, + + NULL, + + #m05RegisterId#, + + #m06Ea#, + #m06Tm#, + + SYSDATE, + + NULL, + + #m06RegisterId#, + + #m07Ea#, + #m07Tm#, + + SYSDATE, + + NULL, + + #m07RegisterId#, + + #m08Ea#, + #m08Tm#, + + SYSDATE, + + NULL, + + #m08RegisterId#, + + #m09Ea#, + #m09Tm#, + + SYSDATE, + + NULL, + + #m09RegisterId#, + + #m10Ea#, + #m10Tm#, + + SYSDATE, + + NULL, + + #m10RegisterId#, + + #m11Ea#, + #m11Tm#, + + SYSDATE, + + NULL, + + #m11RegisterId#, + + #m12Ea#, + #m12Tm#, + + SYSDATE, + + NULL, + + #m12RegisterId# + + + ) + WHEN MATCHED THEN + UPDATE + SET + + + m01_ea=#m01Ea# + + + , m01_tm=#m01Tm# + + + , m01_register_id=#m01RegisterId# + , m01_regist_pnttm=SYSDATE + + + + + + m02_ea=#m02Ea# + + + , m02_tm=#m02Tm# + + + , m02_register_id=#m02RegisterId# + , m02_regist_pnttm=SYSDATE + + + + m03_ea=#m03Ea# + + + , m03_tm=#m03Tm# + + + , m03_register_id=#m03RegisterId# + , m03_regist_pnttm=SYSDATE + + + + m04_ea=#m04Ea# + + + , m04_tm=#m04Tm# + + + , m04_register_id=#m04RegisterId# + , m04_regist_pnttm=SYSDATE + + + + m05_ea=#m05Ea# + + + , m05_tm=#m05Tm# + + + , m05_register_id=#m05RegisterId# + , m05_regist_pnttm=SYSDATE + + + + m06_ea=#m06Ea# + + + , m06_tm=#m06Tm# + + + , m06_register_id=#m06RegisterId# + , m06_regist_pnttm=SYSDATE + + + + m07_ea=#m07Ea# + + + , m07_tm=#m07Tm# + + + , m07_register_id=#m07RegisterId# + , m07_regist_pnttm=SYSDATE + + + + m08_ea=#m08Ea# + + + , m08_tm=#m08Tm# + + + , m08_register_id=#m08RegisterId# + , m08_regist_pnttm=SYSDATE + + + + m09_ea=#m09Ea# + + + , m09_tm=#m09Tm# + + + , m09_register_id=#m09RegisterId# + , m09_regist_pnttm=SYSDATE + + + + m10_ea=#m10Ea# + + + , m10_tm=#m10Tm# + + + , m10_register_id=#m10RegisterId# + , m10_regist_pnttm=SYSDATE + + + + m11_ea=#m11Ea# + + + , m11_tm=#m11Tm# + + + , m11_register_id=#m11RegisterId# + , m11_regist_pnttm=SYSDATE + + + + m12_ea=#m12Ea# + + + , m12_tm=#m12Tm# + + + , m12_register_id=#m12RegisterId# + , m12_regist_pnttm=SYSDATE + + + + + + + + + + + /* VEAInstrIndvdMntTmDAO.update */ + MERGE INTO + USING DUAL + ON(yr=#yr# AND userId=#user_id#) + + WHEN NOT MATCHED THEN + INSERT + ( + + ) + VALUES( + #yr#, + #user_id#, + + + #m01Ea#, + #m01Tm#, + SYSDATE, + #m01RegisterId#, + + #m02Ea#, + #m02Tm#, + SYSDATE, + #m02RegisterId#, + + #m03Ea#, + #m03Tm#, + SYSDATE, + #m03RegisterId#, + + #m04Ea#, + #m04Tm#, + SYSDATE, + #m04RegisterId#, + + #m05Ea#, + #m05m#, + SYSDATE, + #m05RegisterId#, + + #m06Ea#, + #m06m#, + SYSDATE, + #m06RegisterId#, + + #m07Ea#, + #m07m#, + SYSDATE, + #m07RegisterId#, + + #m08Ea#, + #m08m#, + SYSDATE, + #m08RegisterId#, + + #m09Ea#, + #m09m#, + SYSDATE, + #m09RegisterId#, + + #m10Ea#, + #m10m#, + SYSDATE, + #m10RegisterId#, + + #m11Ea#, + #m11m#, + SYSDATE, + #m11RegisterId#, + + #m12Ea#, + #m12m#, + SYSDATE, + #m12RegisterId# + + + ) + WHEN MATCHED THEN + UPDATE + SET user_id = #userId# + + + , m01_ea=#m01Ea# + + + , m01_tm=#m01Tm# + + + , m01_register_id=#m01RegisterId# + , m01_regist_pnttm=SYSDATE + + + + + + , m02_ea=#m02Ea# + + + , m02_tm=#m02Tm# + + + , m02_register_id=#m02RegisterId# + , m02_regist_pnttm=SYSDATE + + + + , m03_ea=#m03Ea# + + + , m03_tm=#m03Tm# + + + , m03_register_id=#m03RegisterId# + , m03_regist_pnttm=SYSDATE + + + + , m04_ea=#m04Ea# + + + , m04_tm=#m04Tm# + + + , m04_register_id=#m04RegisterId# + , m04_regist_pnttm=SYSDATE + + + + , m05_ea=#m05Ea# + + + , m05_tm=#m05Tm# + + + , m05_register_id=#m05RegisterId# + , m05_regist_pnttm=SYSDATE + + + + , m06_ea=#m06Ea# + + + , m06_tm=#m06Tm# + + + , m06_register_id=#m06RegisterId# + , m06_regist_pnttm=SYSDATE + + + + , m07_ea=#m07Ea# + + + , m07_tm=#m07Tm# + + + , m07_register_id=#m07RegisterId# + , m07_regist_pnttm=SYSDATE + + + + , m08_ea=#m08Ea# + + + , m08_tm=#m08Tm# + + + , m08_register_id=#m08RegisterId# + , m08_regist_pnttm=SYSDATE + + + + , m09_ea=#m09Ea# + + + , m09_tm=#m09Tm# + + + , m09_register_id=#m09RegisterId# + , m09_regist_pnttm=SYSDATE + + + + , m10_ea=#m10Ea# + + + , m10_tm=#m10Tm# + + + , m10_register_id=#m10RegisterId# + , m10_regist_pnttm=SYSDATE + + + + , m11_ea=#m11Ea# + + + , m11_tm=#m11Tm# + + + , m11_register_id=#m11RegisterId# + , m11_regist_pnttm=SYSDATE + + + + , m12_ea=#m12Ea# + + + , m12_tm=#m12Tm# + + + , m12_register_id=#m12RegisterId# + , m12_regist_pnttm=SYSDATE + + + + + + + + + + + + DELETE FROM + a + WHERE + a.yr = #yr# + AND a.user_id = #userId# + + + + + + + + + + + + UPDATE a + $setQuery$ + WHERE + a.yr = #yr# + + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/advAreaLctrMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/advAreaLctrMngList.jsp index 8e4ca6ba..d428ab6a 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/advAreaLctrMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/advAreaLctrMngList.jsp @@ -494,7 +494,7 @@ } } - //회차관리 팝업 + //회차관리 팝업 function fncRndsStng() { var p_stngYr = $("#listForm #stngYr").val(); diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctIsltnExcel.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctIsltnExcel.jsp index b45b5a71..36878e15 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctIsltnExcel.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctIsltnExcel.jsp @@ -220,7 +220,7 @@ - + ※ 컴퓨터 파일(엑셀)만 등록 가능합니다.sample diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrMngDetail.jsp index dce2a02c..d5007141 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrMngDetail.jsp @@ -22,7 +22,6 @@ <%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> <%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> - @@ -344,7 +343,7 @@ }); } } - + // 패널티 삭제 function fnPnltyDelete(p_pnlty_ord) { @@ -373,6 +372,59 @@ }); } } + + + // 강사이력 등록팝업 + function fnInstrHstryInsert() { + + /* + var p_stngYr = $("#listForm #stngYr").val(); + + if(p_stngYr==''){ + alert("회차관리 대상 년도를 선택해주세요."); + return false; + } + document.listForm.yr.value = p_stngYr; + */ + + //document.listForm.authorCode.value = vAuthorCode; + //document.listForm.action = ""; + document.listForm.action = ""; + window.open("#", "_instrHstryMngPop", "scrollbars = no, top=100px, left=100px, height=800px, width=1000px"); + document.listForm.target = "_instrHstryMngPop"; + document.listForm.submit(); + + } + + // 강사이력 삭제 + function fnInstrHstryDelete(p_pnlty_ord) { + + $("#listForm #pnltyOrd").val(p_pnlty_ord); + + var data1 = new FormData(document.getElementById("listForm")); + if(confirm("해당 이력을 삭제하시겠습니까?)")){ + $.ajax({ + type:"POST", + url: "${pageContext.request.contextPath}/kccadr/oprtn/tngrVisitEdu/popup/instrHstryDelAjax.do", + data: data1, + dataType:'json', + async: false, + processData: false, + contentType: false, + cache: false, + success:function(returnData){ + if(returnData.result == 'success'){ + alert("삭제 되었습니다."); + location.reload(); + } + }, + error:function(request , status, error){ + alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error); + } + }); + } + } + @@ -403,6 +455,10 @@ + + +
+
@@ -623,13 +679,25 @@
+ + + + + +
+ + + +
+ +

비공개 메모

@@ -760,6 +828,7 @@
+

패널티 목록

@@ -782,7 +851,7 @@ 교육일자 학교명 교육차시 - 삭제 + 삭제 @@ -821,7 +890,6 @@
-
@@ -829,15 +897,136 @@
- - - - - - -
+
+ +
+
+
+
+
+
+ +
+

이력관리

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
교육명교육기간비고등록자등록일삭제
+ + ~ + (분) + + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
교육명교육기간비고등록
+ + +
+
+ +
+ ~ +
+ +
+
+ 		+ + + +
+
+ +
+
+
+
+ +
+
+
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrHstryMngPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrHstryMngPopup.jsp new file mode 100644 index 00000000..8d4bc87b --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrHstryMngPopup.jsp @@ -0,0 +1,618 @@ + +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> +<%@ 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="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<% + /** + * @Class Name : instrHstryMngPopup.jsp + * @Description : 강사이력관리 팝업 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2021.08.09 김봉호 최초 생성 + * @author 김봉호 + * @since 2021.08.21 + * @version 1.0 + * @see + * + */ +%> + + + + + + + + + + + + + + 신청반려팝업 + + + + +
+ + + +
+ + +
+

회차관리

+
+ + +
+ + +"> +"> +"> +"> + + + + + + + + + + + + + + +
+

필수입력 항목

+

+    년도   + + + +

+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
회차명접수시작일시접수마감일시관리
+
+ + 회차 +
+
+
+ +
+ 시 + +
+ 		+
+ +
+ +
+ + 시 +
+ 		+
+
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
회차명접수시작일시접수마감일시관리
+
+ + 회차 +
+
+
+ +
+ 시 + +
+ 		+
+ +
+ +
+ + 시 +
+ 		+
+
+ + +
+
+
+ + + +
+
+
+
+ + +
+
+
+
+
+ + +
+ + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/scholMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/scholMngList.jsp index c3502822..a68b2ab4 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/scholMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/scholMngList.jsp @@ -144,6 +144,9 @@ + + + @@ -153,7 +156,10 @@ 학교구분 지역 학교(기관)명 - 도서구분 + 도서여부 + 벽지여부 + 접적학교여부 + 인구감소지역여부 등록일 @@ -196,7 +202,22 @@ - + + + + + + + + + + + + + + + + @@ -207,7 +228,7 @@ - +