diff --git a/src/main/java/kcc/let/my/web/MyPageController.java b/src/main/java/kcc/let/my/web/MyPageController.java index 36ca54f2..75020404 100644 --- a/src/main/java/kcc/let/my/web/MyPageController.java +++ b/src/main/java/kcc/let/my/web/MyPageController.java @@ -133,6 +133,10 @@ public class MyPageController { ) ); + System.out.println(tngrMap); + System.out.println(tngrMap); + + model.addAttribute("tngrMap", tngrMap); model.addAttribute("tngrList", tngrList); } diff --git a/src/main/java/kcc/let/uss/notify/service/impl/NotifyManageServiceImpl.java b/src/main/java/kcc/let/uss/notify/service/impl/NotifyManageServiceImpl.java index 272cffab..414e07f7 100644 --- a/src/main/java/kcc/let/uss/notify/service/impl/NotifyManageServiceImpl.java +++ b/src/main/java/kcc/let/uss/notify/service/impl/NotifyManageServiceImpl.java @@ -110,7 +110,7 @@ public class NotifyManageServiceImpl extends EgovAbstractServiceImpl implements notifyManageVO.setNotifyPath(notifyPath); notifyManageVO.setNotifyChk("N"); notifyManageVO.setEduAplctOrd(eduAplctOrd); - notifyManageVO.setEduChasiOrd(eduChasiOrdList.toString()); + notifyManageVO.setEduChasiOrd(eduChasiOrdList.get(0).toString()); notifyManageVO.setFrstRegisterId(loginVO.getUniqId()); for(NotifyManageVO vo : notifyManageListVO) { notifyManageVO.setToUserId(vo.getMngUserId()); diff --git a/src/main/java/kcc/ve/aplct/adultVisitEdu/eduAplct/service/impl/EduAplctAdultServiceImpl.java b/src/main/java/kcc/ve/aplct/adultVisitEdu/eduAplct/service/impl/EduAplctAdultServiceImpl.java index 2a000e5b..33a22a6c 100644 --- a/src/main/java/kcc/ve/aplct/adultVisitEdu/eduAplct/service/impl/EduAplctAdultServiceImpl.java +++ b/src/main/java/kcc/ve/aplct/adultVisitEdu/eduAplct/service/impl/EduAplctAdultServiceImpl.java @@ -155,8 +155,12 @@ public class EduAplctAdultServiceImpl implements EduAplctAdultService { vEEduChasiVO.setStrtTm(s_strtTm[i].replaceAll("[^0-9]","")); vEEduChasiVO.setEndTm(s_endTm[i].replaceAll("[^0-9]","")); vEEduChasiVO.setLrnTm(s_lrnTm[i]); - vEEduChasiVO.setTrgt(s_trgt[i]); - vEEduChasiVO.setPrsnl(s_prsnl[i]); + if(s_trgt != null && !s_trgt[i].isEmpty()) { + vEEduChasiVO.setTrgt(s_trgt[i]); + } + if(s_prsnl != null && !s_prsnl[i].isEmpty()) { + vEEduChasiVO.setPrsnl(s_prsnl[i]); + } vVEEduChasiService.insert(vEEduChasiVO); // 알림을 위한 LIST @@ -243,8 +247,12 @@ public class EduAplctAdultServiceImpl implements EduAplctAdultService { vEEduChasiVO.setStrtTm(s_strtTm[i].replaceAll("[^0-9]","")); vEEduChasiVO.setEndTm(s_endTm[i].replaceAll("[^0-9]","")); vEEduChasiVO.setLrnTm(s_lrnTm[i]); - vEEduChasiVO.setTrgt(s_trgt[i]); - vEEduChasiVO.setPrsnl(s_prsnl[i]); + if(s_trgt != null && !s_trgt[i].isEmpty()) { + vEEduChasiVO.setTrgt(s_trgt[i]); + } + if(s_prsnl != null && !s_prsnl[i].isEmpty()) { + vEEduChasiVO.setPrsnl(s_prsnl[i]); + } vVEEduChasiService.insert(vEEduChasiVO); } return true; diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java index 2f2ae667..7df39e3c 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java @@ -440,7 +440,10 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable { public String lctrStrtH; public String lctrStrtM; public String lctrEndH; - public String lctrEndM; + public String lctrEndM; + + public String eduMdCd; //교육매체 코드 + public String feeInsttCd; //강사료지급기관코드 public String getSpecialWorkAllow() { @@ -1944,6 +1947,18 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable { public void setLctrEndM(String lctrEndM) { this.lctrEndM = lctrEndM; } + public String getEduMdCd() { + return eduMdCd; + } + public void setEduMdCd(String eduMdCd) { + this.eduMdCd = eduMdCd; + } + public String getFeeInsttCd() { + return feeInsttCd; + } + public void setFeeInsttCd(String feeInsttCd) { + this.feeInsttCd = feeInsttCd; + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduChasiVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduChasiVO.java index c26638db..f0676dc3 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduChasiVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduChasiVO.java @@ -134,6 +134,7 @@ public class VEEduChasiVO extends ComDefaultVO implements Serializable { private String prcsAplctPrdOrd; //기간과정신청정보 + private String eduTrgt; //대상 public String getQustnrQesitmId10Cnt() { @@ -708,5 +709,11 @@ public class VEEduChasiVO extends ComDefaultVO implements Serializable { public void setPrcsAplctPrdOrd(String prcsAplctPrdOrd) { this.prcsAplctPrdOrd = prcsAplctPrdOrd; } + public String getEduTrgt() { + return eduTrgt; + } + public void setEduTrgt(String eduTrgt) { + this.eduTrgt = eduTrgt; + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailActvtHstryService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailActvtHstryService.java index 3be4dd84..9ce8fed9 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailActvtHstryService.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailActvtHstryService.java @@ -1,41 +1,43 @@ -package kcc.ve.instr.tngrVisitEdu.instrInfo.service; - -import java.util.List; - -public interface VEInstrDetailActvtHstryService { - - List select(VEInstrDetailActvtHstryVO vEInstrDetailActvtHstryVO); - - List selectPagingList(VEInstrDetailActvtHstryVO vEInstrDetailActvtHstryVO); - - VEInstrDetailActvtHstryVO findById(VEInstrDetailActvtHstryVO vEInstrDetailActvtHstryVO); - - void updateStateCd(VEInstrDetailActvtHstryVO vEInstrDetailActvtHstryVO); - - - - /* - //C - void insert(VEInstrDetailVO vEInstrDetailVO) throws Exception; - - //R - VEInstrDetailVO selectDetail(VEInstrDetailVO vEInstrDetailVO) throws Exception; - - //U - int update(VEInstrDetailVO vEInstrDetailVO) throws Exception; - - //D - int delete(VEInstrDetailVO vEInstrDetailVO) throws Exception; - - //L - List selectList(VEInstrDetailVO vEInstrDetailVO) throws Exception; - - //L page - List selectPagingList(VEInstrDetailVO vEInstrDetailVO) throws Exception; - */ - - //EgovMap selectAdrRpplInfo(AdjstChangeDateVO adjstChangeDateVO) throws Exception; - - //List selectPagingList(AdjstChangeDateVO adjstChangeDateVO) throws Exception; - -} +package kcc.ve.instr.tngrVisitEdu.instrInfo.service; + +import java.util.List; + +public interface VEInstrDetailActvtHstryService { + + List select(VEInstrDetailActvtHstryVO vEInstrDetailActvtHstryVO); + + List selectPagingList(VEInstrDetailActvtHstryVO vEInstrDetailActvtHstryVO); + + List selectSignPagingList(VEInstrDetailActvtHstryVO vEInstrDetailActvtHstryVO); + + VEInstrDetailActvtHstryVO findById(VEInstrDetailActvtHstryVO vEInstrDetailActvtHstryVO); + + void updateStateCd(VEInstrDetailActvtHstryVO vEInstrDetailActvtHstryVO); + + + + /* + //C + void insert(VEInstrDetailVO vEInstrDetailVO) throws Exception; + + //R + VEInstrDetailVO selectDetail(VEInstrDetailVO vEInstrDetailVO) throws Exception; + + //U + int update(VEInstrDetailVO vEInstrDetailVO) throws Exception; + + //D + int delete(VEInstrDetailVO vEInstrDetailVO) throws Exception; + + //L + List selectList(VEInstrDetailVO vEInstrDetailVO) throws Exception; + + //L page + List selectPagingList(VEInstrDetailVO vEInstrDetailVO) throws Exception; + */ + + //EgovMap selectAdrRpplInfo(AdjstChangeDateVO adjstChangeDateVO) throws Exception; + + //List selectPagingList(AdjstChangeDateVO adjstChangeDateVO) throws Exception; + +} diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailActvtHstryDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailActvtHstryDAO.java index 34760750..c76a01ab 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailActvtHstryDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailActvtHstryDAO.java @@ -1,45 +1,47 @@ -package kcc.ve.instr.tngrVisitEdu.instrInfo.service.impl; - -import java.util.List; - -import org.springframework.stereotype.Repository; - -import egovframework.rte.psl.dataaccess.EgovAbstractDAO; -import kcc.kccadr.accdnt.acd.service.AdjstChangeDateVO; -import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailActvtHstryVO; -import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO; - -@Repository("vEInstrDetailActvtHstryDAO") -public class VEInstrDetailActvtHstryDAO extends EgovAbstractDAO { - - public void insert(VEInstrDetailActvtHstryVO vEInstrActvtHstryVO) { - insert("VEInstrDetailActvtHstryDAO.insert", vEInstrActvtHstryVO); - } - - public List selectList(VEInstrDetailActvtHstryVO vEInstrDetailActvtHstryVO) { - return (List) list("VEInstrDetailActvtHstryDAO.selectList", vEInstrDetailActvtHstryVO); - } - - public List selectPagingList(VEInstrDetailActvtHstryVO vEInstrDetailActvtHstryVO) { - return (List) list("VEInstrDetailActvtHstryDAO.selectPagingList", vEInstrDetailActvtHstryVO); - } - - public VEInstrDetailActvtHstryVO findById(VEInstrDetailActvtHstryVO vEInstrDetailActvtHstryVO) { - return (VEInstrDetailActvtHstryVO) select("VEInstrDetailActvtHstryDAO.findById", vEInstrDetailActvtHstryVO); - // TODO Auto-generated method stub - } - - public void updateStateCd(VEInstrDetailActvtHstryVO vEInstrDetailActvtHstryVO) { - update("VEInstrDetailActvtHstryDAO.updateStateCd", vEInstrDetailActvtHstryVO); - } - - /** - * 등록 - C - * @param AdjstChangeDateVO - * @throws Exception - */ -// public void insert(VEInstrDetailVO vEInstrDetailVO) throws Exception { -// insert("VEInstrDetailActvtHstryDAO.insert", vEInstrDetailVO); -// } - -} +package kcc.ve.instr.tngrVisitEdu.instrInfo.service.impl; + +import java.util.List; + +import org.springframework.stereotype.Repository; + +import egovframework.rte.psl.dataaccess.EgovAbstractDAO; +import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailActvtHstryVO; + +@Repository("vEInstrDetailActvtHstryDAO") +public class VEInstrDetailActvtHstryDAO extends EgovAbstractDAO { + + public void insert(VEInstrDetailActvtHstryVO vEInstrActvtHstryVO) { + insert("VEInstrDetailActvtHstryDAO.insert", vEInstrActvtHstryVO); + } + + public List selectList(VEInstrDetailActvtHstryVO vEInstrDetailActvtHstryVO) { + return (List) list("VEInstrDetailActvtHstryDAO.selectList", vEInstrDetailActvtHstryVO); + } + + public List selectPagingList(VEInstrDetailActvtHstryVO vEInstrDetailActvtHstryVO) { + return (List) list("VEInstrDetailActvtHstryDAO.selectPagingList", vEInstrDetailActvtHstryVO); + } + + public List selectSignPagingList(VEInstrDetailActvtHstryVO vEInstrDetailActvtHstryVO) { + return (List) list("VEInstrDetailActvtHstryDAO.selectSignPagingList", vEInstrDetailActvtHstryVO); + } + + public VEInstrDetailActvtHstryVO findById(VEInstrDetailActvtHstryVO vEInstrDetailActvtHstryVO) { + return (VEInstrDetailActvtHstryVO) select("VEInstrDetailActvtHstryDAO.findById", vEInstrDetailActvtHstryVO); + // TODO Auto-generated method stub + } + + public void updateStateCd(VEInstrDetailActvtHstryVO vEInstrDetailActvtHstryVO) { + update("VEInstrDetailActvtHstryDAO.updateStateCd", vEInstrDetailActvtHstryVO); + } + + /** + * 등록 - C + * @param AdjstChangeDateVO + * @throws Exception + */ +// public void insert(VEInstrDetailVO vEInstrDetailVO) throws Exception { +// insert("VEInstrDetailActvtHstryDAO.insert", vEInstrDetailVO); +// } + +} diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailActvtHstryServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailActvtHstryServiceImpl.java index 2a998101..c4267c93 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailActvtHstryServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailActvtHstryServiceImpl.java @@ -1,87 +1,91 @@ -package kcc.ve.instr.tngrVisitEdu.instrInfo.service.impl; - - -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - -import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailActvtHstryService; -import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailActvtHstryVO; - -@Service("vEInstrDetailActvtHstryService") -public class VEInstrDetailActvtHstryServiceImpl implements VEInstrDetailActvtHstryService { - - //강사 상세 - @Resource(name="vEInstrDetailActvtHstryDAO") - private VEInstrDetailActvtHstryDAO vEInstrDetailActvtHstryDAO; - - - @Override - public List select(VEInstrDetailActvtHstryVO vEInstrDetailActvtHstryVO) { - return vEInstrDetailActvtHstryDAO.selectList(vEInstrDetailActvtHstryVO); - } - - - @Override - public List selectPagingList(VEInstrDetailActvtHstryVO vEInstrDetailActvtHstryVO) { - return vEInstrDetailActvtHstryDAO.selectPagingList(vEInstrDetailActvtHstryVO); - } - - - @Override - public VEInstrDetailActvtHstryVO findById(VEInstrDetailActvtHstryVO vEInstrDetailActvtHstryVO) { - return vEInstrDetailActvtHstryDAO.findById(vEInstrDetailActvtHstryVO); - } - - - @Override - public void updateStateCd(VEInstrDetailActvtHstryVO vEInstrDetailActvtHstryVO) { - vEInstrDetailActvtHstryDAO.updateStateCd(vEInstrDetailActvtHstryVO); - } - - /* - - //C - public void insert(VEInstrDetailVO vEInstrDetailVO) throws Exception { - vEInstrDetailApptHchkHstryDAO.insert(vEInstrDetailVO); - } - - //R - public VEInstrDetailVO selectDetail(VEInstrDetailVO vEInstrDetailVO) throws Exception { - return vEInstrDetailApptHchkHstryDAO.selectDetail(vEInstrDetailVO); - } - - //U - public int update(VEInstrDetailVO vEInstrDetailVO) throws Exception{ - - return vEInstrDetailApptHchkHstryDAO.update(vEInstrDetailVO); - } - - //D - public int delete(VEInstrDetailVO vEInstrDetailVO) throws Exception{ - return vEInstrDetailApptHchkHstryDAO.delete(vEInstrDetailVO); - } - - //List - public List selectList(VEInstrDetailVO vEInstrDetailVO) throws Exception{ - return vEInstrDetailApptHchkHstryDAO.selectList(vEInstrDetailVO); - } - - //paging List - public List selectPagingList(VEInstrDetailVO vEInstrDetailVO) throws Exception{ - return vEInstrDetailApptHchkHstryDAO.selectPagingList(vEInstrDetailVO); - } - */ - /* - //R - public EgovMap selectAdrRpplInfo(AdjstChangeDateVO adjstChangeDateVO) throws Exception { - return adjstChangeDateDAO.selectAdrRpplInfo(adjstChangeDateVO); - } - */ - - - - -} +package kcc.ve.instr.tngrVisitEdu.instrInfo.service.impl; + + +import java.util.List; + +import javax.annotation.Resource; + +import org.springframework.stereotype.Service; + +import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailActvtHstryService; +import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailActvtHstryVO; + +@Service("vEInstrDetailActvtHstryService") +public class VEInstrDetailActvtHstryServiceImpl implements VEInstrDetailActvtHstryService { + + //강사 상세 + @Resource(name="vEInstrDetailActvtHstryDAO") + private VEInstrDetailActvtHstryDAO vEInstrDetailActvtHstryDAO; + + + @Override + public List select(VEInstrDetailActvtHstryVO vEInstrDetailActvtHstryVO) { + return vEInstrDetailActvtHstryDAO.selectList(vEInstrDetailActvtHstryVO); + } + + + @Override + public List selectPagingList(VEInstrDetailActvtHstryVO vEInstrDetailActvtHstryVO) { + return vEInstrDetailActvtHstryDAO.selectPagingList(vEInstrDetailActvtHstryVO); + } + + @Override + public List selectSignPagingList(VEInstrDetailActvtHstryVO vEInstrDetailActvtHstryVO) { + return vEInstrDetailActvtHstryDAO.selectSignPagingList(vEInstrDetailActvtHstryVO); + } + + @Override + public VEInstrDetailActvtHstryVO findById(VEInstrDetailActvtHstryVO vEInstrDetailActvtHstryVO) { + return vEInstrDetailActvtHstryDAO.findById(vEInstrDetailActvtHstryVO); + } + + + @Override + public void updateStateCd(VEInstrDetailActvtHstryVO vEInstrDetailActvtHstryVO) { + vEInstrDetailActvtHstryDAO.updateStateCd(vEInstrDetailActvtHstryVO); + } + + /* + + //C + public void insert(VEInstrDetailVO vEInstrDetailVO) throws Exception { + vEInstrDetailApptHchkHstryDAO.insert(vEInstrDetailVO); + } + + //R + public VEInstrDetailVO selectDetail(VEInstrDetailVO vEInstrDetailVO) throws Exception { + return vEInstrDetailApptHchkHstryDAO.selectDetail(vEInstrDetailVO); + } + + //U + public int update(VEInstrDetailVO vEInstrDetailVO) throws Exception{ + + return vEInstrDetailApptHchkHstryDAO.update(vEInstrDetailVO); + } + + //D + public int delete(VEInstrDetailVO vEInstrDetailVO) throws Exception{ + return vEInstrDetailApptHchkHstryDAO.delete(vEInstrDetailVO); + } + + //List + public List selectList(VEInstrDetailVO vEInstrDetailVO) throws Exception{ + return vEInstrDetailApptHchkHstryDAO.selectList(vEInstrDetailVO); + } + + //paging List + public List selectPagingList(VEInstrDetailVO vEInstrDetailVO) throws Exception{ + return vEInstrDetailApptHchkHstryDAO.selectPagingList(vEInstrDetailVO); + } + */ + /* + //R + public EgovMap selectAdrRpplInfo(AdjstChangeDateVO adjstChangeDateVO) throws Exception { + return adjstChangeDateDAO.selectAdrRpplInfo(adjstChangeDateVO); + } + */ + + + + +} diff --git a/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduAplctMng/service/impl/EduAplctMngAdultServiceImpl.java b/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduAplctMng/service/impl/EduAplctMngAdultServiceImpl.java index 976fc6f4..916c5cba 100644 --- a/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduAplctMng/service/impl/EduAplctMngAdultServiceImpl.java +++ b/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduAplctMng/service/impl/EduAplctMngAdultServiceImpl.java @@ -147,8 +147,12 @@ public class EduAplctMngAdultServiceImpl implements EduAplctMngAdultService { vEEduChasiVO.setStrtTm(s_strtTm[i].replaceAll("[^0-9]","")); vEEduChasiVO.setEndTm(s_endTm[i].replaceAll("[^0-9]","")); vEEduChasiVO.setLrnTm(s_lrnTm[i]); - vEEduChasiVO.setTrgt(s_trgt[i]); - vEEduChasiVO.setPrsnl(s_prsnl[i]); + if(s_trgt != null && !s_trgt[i].isEmpty()) { + vEEduChasiVO.setTrgt(s_trgt[i]); + } + if(s_prsnl != null && !s_prsnl[i].isEmpty()) { + vEEduChasiVO.setPrsnl(s_prsnl[i]); + } vVEEduChasiService.insert(vEEduChasiVO); } return true; @@ -232,8 +236,12 @@ public class EduAplctMngAdultServiceImpl implements EduAplctMngAdultService { vEEduChasiVO.setStrtTm(s_strtTm[i].replaceAll("[^0-9]","")); vEEduChasiVO.setEndTm(s_endTm[i].replaceAll("[^0-9]","")); vEEduChasiVO.setLrnTm(s_lrnTm[i]); - vEEduChasiVO.setTrgt(s_trgt[i]); - vEEduChasiVO.setPrsnl(s_prsnl[i]); + if(s_trgt != null && !s_trgt[i].isEmpty()) { + vEEduChasiVO.setTrgt(s_trgt[i]); + } + if(s_prsnl != null && !s_prsnl[i].isEmpty()) { + vEEduChasiVO.setPrsnl(s_prsnl[i]); + } //vVEEduChasiService.insert(vEEduChasiVO); vVEEduChasiService.update(vEEduChasiVO); } diff --git a/src/main/java/kcc/ve/oprtn/comweb/CommonManageController.java b/src/main/java/kcc/ve/oprtn/comweb/CommonManageController.java new file mode 100644 index 00000000..69c32dbc --- /dev/null +++ b/src/main/java/kcc/ve/oprtn/comweb/CommonManageController.java @@ -0,0 +1,181 @@ +package kcc.ve.oprtn.comweb; + +import java.util.List; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; + +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; + +import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; +import kcc.com.utl.user.service.CheckLoginUtil; +import kcc.let.utl.fcc.service.EgovCryptoUtil; +import kcc.ve.cmm.VeConstants; +import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailActvtHstryService; +import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailActvtHstryVO; + +@Controller +//@RequestMapping("/kccadr/oprtn/comm") +public class CommonManageController { + + /* + @Resource(name = "scholInfoService") + private ScholInfoService scholInfoService; + + @Resource(name = "scholInfoMIXService") + private ScholInfoMIXService scholInfoMIXService; + + @Resource(name = "vEEduAplctService") + private VEEduAplctService vEEduAplctService; + + @Resource(name = "vEPrcsOnlnCntntService") + private VEPrcsOnlnCntntService vEPrcsOnlnCntntService; + + //로그인 체크 util + @Resource(name = "checkLoginUtil") + private CheckLoginUtil checkLoginUtil; + + //snd_hstry id gen + @Resource(name = "sndGnrService") + private EgovIdGnrService sndGnrService; + + // 교육신청발송이력 + @Resource(name = "vEEduAplctSndHstryService") + private VEEduAplctSndHstryService vEEduAplctSndHstryService; + + + //회원조회 + @Resource(name = "userManageService") + private EgovUserManageService userManageService; + + + //강의 회차 정보 + @Resource(name = "vEAStngService") + private VEAStngService vEAStngService; + + + @Resource(name = "NotifyManageService") + private NotifyManageService notifyManageService; + */ + + //로그인 체크 util + @Resource(name = "checkLoginUtil") + private CheckLoginUtil checkLoginUtil; + + //암복호화 유틸 + @Resource(name = "egovCryptoUtil") + EgovCryptoUtil egovCryptoUtil; + + // 첨부파일 정보 + @Resource(name="vEInstrDetailActvtHstryService") + private VEInstrDetailActvtHstryService vEInstrDetailActvtHstryService; + + /** + * @methodName : instrActvtHstryMngList + * @author : 이호영 + * @date : 2023.11.16 + * @description : 강사활동확인서신청관리 목록 + * @param vEInstrDetailActvtHstryVO + * @param model + * @param request + * @return + * @throws Exception + */ + @RequestMapping("/kccadr/oprtn/cmm/instrActvtHstrySignMngList.do") + public String instrActvtHstrySignMngList( + @ModelAttribute("vEInstrActvtHstryVO") VEInstrDetailActvtHstryVO vEInstrDetailActvtHstryVO + , ModelMap model + , HttpServletRequest request + ) throws Exception { + + //로그인 처리==================================== + //로그인 정보 가져오기 + //LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + //SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 + +// if (loginVO == null || ssoLoginVO == null) { +// return checkLoginUtil.getUserLoginPage(model); //로그인 정보가 없으면 로그인 페이지로 이동한다. +// } + //로그인 처리==================================== + vEInstrDetailActvtHstryVO.setInstrDiv(VeConstants.LCTR_DIV_CD_10); //청소년 + + //1.pageing step1 + PaginationInfo paginationInfo = this.setPagingStep1(vEInstrDetailActvtHstryVO); + //2. pageing step2 + vEInstrDetailActvtHstryVO = this.setPagingStep2(vEInstrDetailActvtHstryVO, paginationInfo); + vEInstrDetailActvtHstryVO.setSearchKeyword(egovCryptoUtil.encrypt(vEInstrDetailActvtHstryVO.getSearchKeyword())); + List vEInstrDetailActvtHstryVOList = vEInstrDetailActvtHstryService.selectSignPagingList(vEInstrDetailActvtHstryVO); + + vEInstrDetailActvtHstryVOList.stream().forEach(t-> t.setInstrNm(egovCryptoUtil.decrypt(t.getInstrNm()))); + + //3.pageing step3 + paginationInfo = this.setPagingStep3(vEInstrDetailActvtHstryVOList, paginationInfo); + model.addAttribute("paginationInfo", paginationInfo); + + // 검색어 복호화 + vEInstrDetailActvtHstryVO.setSearchKeyword(egovCryptoUtil.decrypt(vEInstrDetailActvtHstryVO.getSearchKeyword())); + //대상 리스트, 페이징 정보 전달 + model.addAttribute("list", vEInstrDetailActvtHstryVOList); + + + + return "oprtn/cmm/instrActvtHstrySignMngList"; + } + + ////////////////////////////////////////////////////////////////////////////////////////////////////////////// + // + // + // private function + // + // + + //페이징을 위한 처리 step1 - 페이징 기본 정보 설정 + private PaginationInfo setPagingStep1( + VEInstrDetailActvtHstryVO p_vEEduAplctVO + )throws Exception{ + // pageing step1 + PaginationInfo paginationInfo = new PaginationInfo(); + paginationInfo.setCurrentPageNo(p_vEEduAplctVO.getPageIndex()); + paginationInfo.setRecordCountPerPage(p_vEEduAplctVO.getPageUnit()); + paginationInfo.setPageSize(p_vEEduAplctVO.getPageSize()); + + return paginationInfo; + } + + + //페이징을 위한 처리 step2 - 게시물 리스트 수량 설정 및 검색 조건 초기화 + private VEInstrDetailActvtHstryVO setPagingStep2( + VEInstrDetailActvtHstryVO p_vEEduAplctVO + , PaginationInfo p_paginationInfo + )throws Exception{ + // pageing step2 + p_vEEduAplctVO.setFirstIndex(p_paginationInfo.getFirstRecordIndex()); + p_vEEduAplctVO.setLastIndex(p_paginationInfo.getLastRecordIndex()); + p_vEEduAplctVO.setRecordCountPerPage(p_paginationInfo.getRecordCountPerPage()); + + if("".equals(p_vEEduAplctVO.getSearchSortCnd())){ //최초조회시 최신것 조회List + p_vEEduAplctVO.setSearchSortCnd("prcs_ord"); + p_vEEduAplctVO.setSearchSortOrd("desc"); + } + + return p_vEEduAplctVO; + } + + + //페이징을 위한 처리 step3 - 전체 게시물 수량 설정하기 + private PaginationInfo setPagingStep3( + List p_vEEduAplctVOList + + , PaginationInfo p_paginationInfo + )throws Exception{ + // pageing step3 + int totCnt = 0; + if(p_vEEduAplctVOList.size() > 0) totCnt = p_vEEduAplctVOList.get(0).getTotCnt(); + p_paginationInfo.setTotalRecordCount(totCnt); + + return p_paginationInfo; + } +} diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml index 38a7d906..ce353b9b 100644 --- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml @@ -91,6 +91,9 @@ , RNDS_ORD , APLCT_CN + + , EDU_MD_CD + , FEE_INSTT_CD @@ -161,6 +164,8 @@ , A.RNDS_ORD AS rndsOrd , A.APLCT_CN AS aplctCn , A.RSLT_ATCH_FILE_ID AS rsltAtchFileId + , A.EDU_MD_CD AS eduMdCd + , A.FEE_INSTT_CD AS feeInsttCd @@ -250,6 +255,8 @@ , #rndsOrd# , #aplctCn# + , #eduMdCd# + , #feeInsttCd# ) @@ -1007,6 +1014,12 @@ , RNDS_ORD = #rndsOrd# + + , FEE_INSTT_CD = #feeInsttCd# + + + , EDU_MD_CD = #eduMdCd# + , APLCT_CN = #aplctCn# diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml index 163d34f6..39349554 100644 --- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml @@ -2361,6 +2361,7 @@ a.chrg_nm AS chrgNm , a.schol_div_cd AS scholDivCd , a.stndrd_schol_cd AS stndrdScholCd , + a.edu_trgt AS eduTrgt , a.clphone AS clphone , a.email AS email , b.edu_chasi_ord AS eduChasiOrd , @@ -3858,6 +3859,7 @@ , G.aprvl_cd AS acmdtAprvlCd , H.oneway_dstnc AS onewayDstnc , A.rslt_atch_file_id AS rsltAtchFileId + , A.edu_trgt AS eduTrgt FROM VE_EDU_APLCT A , VE_EDU_CHASI B diff --git a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetailActvtHstry_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetailActvtHstry_SQL_Tibero.xml index 64b2ff2e..6168c758 100644 --- a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetailActvtHstry_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetailActvtHstry_SQL_Tibero.xml @@ -126,6 +126,40 @@ + + - /* VEInstrMixDAO.selectPagingDetailList4Report */ + /* VEInstrMixDAO.selectWhereInDetailReport */ SELECT COUNT(1) OVER() AS totCnt , , @@ -1066,7 +1066,7 @@ AND a00.instrDiv =a.instr_div AND a00.userId =a.user_id AND a00.instrDetailOrd=a.instr_detail_ord - AND + AND userId IN #userIdList[]# diff --git a/src/main/webapp/WEB-INF/decorators.xml b/src/main/webapp/WEB-INF/decorators.xml index 9036cd8f..8bee7f0e 100644 --- a/src/main/webapp/WEB-INF/decorators.xml +++ b/src/main/webapp/WEB-INF/decorators.xml @@ -52,6 +52,8 @@ + */oprtn/cmm/* + */oprtn/tngrVisitEdu/* */oprtn/instr/tngrVisitEdu/* diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctCnfrmMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctCnfrmMngDetail.jsp index 192d6963..f393f8d0 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctCnfrmMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctCnfrmMngDetail.jsp @@ -123,7 +123,12 @@

교육매체

- + + + + + + @@ -170,6 +175,18 @@ ${info.email} + + +

교육대상

+ + ${info.eduTrgt} + + + +

교육인원

+ + ${info.eduPrsnl} +

신청내용

@@ -196,6 +213,12 @@

+ + +

강의료지급기관

+ + +

신청상태

@@ -260,19 +283,19 @@
- + <%-- --%> - + <%-- --%> - + - + @@ -298,19 +321,19 @@ (${list.lrnTm}분) - + <%-- --%> - + <%-- --%> - + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngCreate.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngCreate.jsp index ddc82a56..23523398 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngCreate.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngCreate.jsp @@ -8,6 +8,7 @@ <%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> <%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> <%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> @@ -20,6 +21,7 @@ $( document ).ready(function(){ //교육 선택에 따른 항목 노출 itemChg($("#eduSlctCd").val()); + eduMdChg(); }); function fncGoList(){ @@ -197,7 +199,27 @@ alert('교육 주제 관련 상세 요청사항 및 사전 질의(자유기재)를 입력해주세요.'); $("#rqstCn").focus(); return false; - }; + }; + if($("#eduTrgt").val() == ''){ + alert('교육대상을 입력해주세요..'); + $("#eduTrgt").focus(); + return false; + }; + if($("#eduPrsnl").val() == ''){ + alert('교육인원을 입력해주세요.'); + $("#eduPrsnl").focus(); + return false; + }; + + if($("#eduSlctCd").val() == "10"){ + if($("input[name='eduMdCd']:checked").val() == "99"){ + if($("#eduMd").val() == ''){ + alert('교육매체를 입력해주세요.'); + $("#eduMd").focus(); + return false; + }; + } + } var trObj = $('.addClassRow').find('tbody > tr').not('.calendar_wrap tr'); @@ -279,6 +301,22 @@ ); } + //교육 매체 따른 내용 변경 + function eduMdChg(){ + + var v_eduMdCd = $("input[name='eduMdCd']:checked").val(); + var v_eduMd = $('#eduMd'); + + + if (v_eduMdCd=='99'){ + v_eduMd.removeAttr('disabled'); + }else{ + v_eduMd.val(''); + v_eduMd.attr('disabled', 'disabled'); + } + + } + @@ -304,6 +342,8 @@ + + @@ -391,6 +431,10 @@ @@ -463,7 +507,25 @@ - + + + + + + + + + + + + +
교육희망일 시간대상 배정강사인원
${list.trgt}${list.trgt} - ${list.prsnl}${list.prsnl}
+
+

필수입력 항목*

+

교육대상

+
+ +
+

필수입력 항목*

+

교육인원

+
+ +

필수입력 항목*

@@ -499,6 +561,17 @@
+

필수입력 항목*

+

강의료지급기관

+
+ + +
@@ -513,17 +586,17 @@ - - - - + <%-- + --%> + <%-- + --%>

필수입력 항목*

교육희망일

필수입력 항목*

시간 -

필수입력 항목*

대상 -

필수입력 항목*

인원 + @@ -797,8 +870,8 @@ --> - -

+ <%-- --%> diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngDetail.jsp index 14dcbc28..f41686eb 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngDetail.jsp @@ -393,7 +393,12 @@

교육매체

- + + + + + + @@ -448,6 +453,18 @@ ${info.email} + + +

교육대상

+ + ${info.eduTrgt} + + + +

교육인원

+ + ${info.eduPrsnl} +

신청내용

@@ -474,6 +491,12 @@

+ + +

강의료지급기관

+ + +

신청상태

@@ -540,17 +563,17 @@ - + <%-- --%> - + <%-- --%> 교육희망일 시간 - 대상 + 배정강사 - 인원 + @@ -576,14 +599,14 @@ (${list.lrnTm}분) - ${list.trgt} + <%-- ${list.trgt} --%> ${empty list.instrNm ? '-' : list.instrNm} - ${list.prsnl} + <%-- ${list.prsnl} --%> - + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngReg.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngReg.jsp index aaa21f93..a2770acc 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngReg.jsp @@ -8,6 +8,7 @@ <%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> <%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> <%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> @@ -20,6 +21,7 @@ $( document ).ready(function(){ //교육 선택에 따른 항목 노출 itemChg($("#eduSlctCd").val()); + eduMdChg(); }); function fncGoList(){ @@ -268,6 +270,21 @@ } } + function eduMdChg(){ + + var v_eduMdCd = $("input[name='eduMdCd']:checked").val(); + var v_eduMd = $('#eduMd'); + + + if (v_eduMdCd=='99'){ + v_eduMd.removeAttr('disabled'); + }else{ + v_eduMd.val(''); + v_eduMd.attr('disabled', 'disabled'); + } + + } + @@ -367,6 +384,10 @@ + @@ -440,6 +461,21 @@ + + +

필수입력 항목*

+

교육대상

+ + + + + +

필수입력 항목*

+

교육인원

+ + + +

필수입력 항목*

@@ -475,6 +511,17 @@ + + +

필수입력 항목*

+

강의료 지급 기관

+ + + + + + @@ -489,15 +536,15 @@ - - + <%-- + --%>

필수입력 항목*

교육희망일

필수입력 항목*

시간 -

필수입력 항목*

대상 -

필수입력 항목*

인원 + @@ -633,8 +680,8 @@ (분) - -

+ <%-- +

--%> @@ -769,8 +816,8 @@ - -

+ diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAsgnmCnfrmMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAsgnmCnfrmMngDetail.jsp index 5fb80df8..4a014ae6 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAsgnmCnfrmMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAsgnmCnfrmMngDetail.jsp @@ -9,6 +9,7 @@ <%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> <%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> <%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> <% @@ -310,7 +311,12 @@

교육매체

- + + + + + + @@ -370,6 +376,18 @@ ${info.email} + + +

교육대상

+ + ${info.eduTrgt} + + + +

교육인원

+ + ${info.eduPrsnl} +

신청내용

@@ -402,6 +420,13 @@

+ + + +

강의료지급기관

+ + + @@ -415,10 +440,10 @@
- - + + <%-- --%> <%-- --%> <%-- --%> @@ -426,9 +451,9 @@ - + - + @@ -456,18 +481,18 @@ (분) - + --%> - + --%> @@ -342,8 +364,8 @@ ~ (분) - - + <%-- + --%> - ', '' , '', '');" style="cursor:pointer;"> + - - - @@ -226,12 +231,12 @@ - + - + +
+

직인대장관리 목록

+
    +
  • +
  • +

    운영관리

    +
  • +
  • 직인대장관리
  • +
+
+ + +
+ +
+ +
+
+

신청일자

+
+
+
+ +
+ ~ +
+ +
+ +
+
+
+
+

강사명

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

총 건수 :

+
+ +
+
+ + +
+
교육희망일 시간대상 배정강사인원
+ <%-- - - + <%-- -

배정강사

강의계획서

diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrActvtHstryMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrActvtHstryMngList.jsp index 1bbb24e5..9592a271 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrActvtHstryMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrActvtHstryMngList.jsp @@ -65,7 +65,22 @@ form.submit(); } - + function fncReset(thisObj){ + var targetObj = $(thisObj).closest('.list_top').find('select,input'); + $.each(targetObj, function(){ + if($(this).prop('tagName') == 'SELECT'){ + if($(this).attr('name').indexOf('Month') != -1){ + $(this).val(new Date().getMonth()+1); + }else if($(this).attr('name').indexOf('Year') != -1){ + $(this).val(new Date().getFullYear()); + }else{ + $(this).prop("selectedIndex", 0); + } + }else{ + $(this).val(''); + } + }); + } 강사활동확인서신청관리 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 a733efcb..c94725f5 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngList.jsp @@ -240,19 +240,19 @@
+ ', '' , '', '');" style="cursor:pointer;"> + ', '' , '', '');" style="cursor:pointer;"> + ', '' , '', '');" style="cursor:pointer;"> diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cmm/SchduleManagerPopDetailAdult.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cmm/SchduleManagerPopDetailAdult.jsp index 3f54c326..81325188 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cmm/SchduleManagerPopDetailAdult.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cmm/SchduleManagerPopDetailAdult.jsp @@ -139,7 +139,12 @@

교육매체

- + + + + + +

인원

대상

+ + + + + + + + + + + +<%-- --%> +<%-- --%> +<%-- --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
번호강사명성별용도사업자명
사업자등록번호
신청일처리일문서번호발급상태
+ + + + + + + + + +
+ () +
+ + + + + + - + + + + + + + + + + + + - + + + + +
+
+ + +
+ +
+ +
+
+
+
+
+
+
+
+ + + + + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cmm/rejectPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cmm/rejectPopup.jsp index b9600c0b..850790bf 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cmm/rejectPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cmm/rejectPopup.jsp @@ -25,9 +25,12 @@ if(lctrDivCd == '40') { msg = "반려"; aprvlCd = VeConstants.APRVL_CD_30; - } else { + } else if(lctrDivCd == '30'){ msg = "수정요청"; aprvlCd = '11'; + } else{ + msg = "수정요청"; + aprvlCd = VeConstants.APRVL_CD_70; } if(confirm(msg+" 하시겠습니까?")){ $.ajax({ diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrActvtHstryMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrActvtHstryMngList.jsp index e9c55cff..e3333f8b 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrActvtHstryMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrActvtHstryMngList.jsp @@ -65,7 +65,22 @@ form.submit(); } - + function fncReset(thisObj){ + var targetObj = $(thisObj).closest('.list_top').find('select,input'); + $.each(targetObj, function(){ + if($(this).prop('tagName') == 'SELECT'){ + if($(this).attr('name').indexOf('Month') != -1){ + $(this).val(new Date().getMonth()+1); + }else if($(this).attr('name').indexOf('Year') != -1){ + $(this).val(new Date().getFullYear()); + }else{ + $(this).prop("selectedIndex", 0); + } + }else{ + $(this).val(''); + } + }); + } 강사활동확인서신청관리 diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctDetail.jsp index 2aa7acf5..047458c6 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctDetail.jsp @@ -436,7 +436,12 @@

교육매체

- + + + + + + @@ -491,6 +496,18 @@ ${info.email} + + +

교육대상

+ + ${info.eduTrgt} + + + +

교육인원

+ + ${info.eduPrsnl} +

신청내용

@@ -517,6 +534,12 @@

+ + +

강의료 지급 기관

+ + +

신청상태

@@ -576,17 +599,13 @@ - - 교육희망일 시간 - 대상 배정강사 - 인원 @@ -612,7 +631,6 @@ (${list.lrnTm}분) - ${list.trgt} <%-- ${empty list.instrNm ? '-' : list.instrNm} --%> @@ -625,12 +643,11 @@ - ${list.prsnl} - + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.jsp index c1ef734b..e39533d2 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.jsp @@ -20,6 +20,7 @@ <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> <%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> <%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> @@ -230,11 +231,13 @@ } if($("#eduSlctCd").val() == "10"){ - if($("#eduMd").val() == ''){ - alert('교육매체를 입력해주세요.'); - $("#eduMd").focus(); - return false; - }; + if($("input[name='eduMdCd']:checked").val() == "99"){ + if($("#eduMd").val() == ''){ + alert('교육매체를 입력해주세요.'); + $("#eduMd").focus(); + return false; + }; + } } if($("#chrgNm").val() == ''){ @@ -278,6 +281,16 @@ $("#rqstCn").focus(); return false; }; + if($("#eduTrgt").val() == ''){ + alert('교육대상을 입력해주세요..'); + $("#eduTrgt").focus(); + return false; + }; + if($("#eduPrsnl").val() == ''){ + alert('교육인원을 입력해주세요.'); + $("#eduPrsnl").focus(); + return false; + }; var trObj = $('.addClassRow').find('tbody > tr').not('.calendar_wrap tr'); @@ -402,6 +415,8 @@ $("#addrDetail").val(info.addrDetail); $("#chrgNm").val(info.chrgNm); $("#jobNm").val(info.jobNm); + $("#eduTrgt").val(info.eduTrgt); + $("#eduPrsnl").val(info.eduPrsnl); if(isNotEmpty(info.aplctCn)){ var aplctCnList = info.aplctCn.split(','); $.each(aplctCnList, function(idx, value){ @@ -428,6 +443,13 @@ $("#email2").val(email[1]); } + if(isNotEmpty(info.eduMdCd)){ + $('input[name=eduMdCd][value='+info.eduMdCd+']').prop('checked',true); + } + if(isNotEmpty(info.feeInsttCd)){ + $('input[name=feeInsttCd][value='+info.feeInsttCd+']').prop('checked',true); + } + $("#hopeSbjct").val(info.hopeSbjct); $("#rqstCn").val(info.rqstCn); @@ -467,6 +489,7 @@ if(item == '10'){ mechae.show(); mechae.find("input").removeAttr("disabled", "disabled"); + $("#eduMd").attr("disabled", "disabled"); juso.hide(); juso.find("input").attr("disabled", "disabled"); } @@ -479,6 +502,21 @@ } } + //교육 매체 따른 내용 변경 + function eduMdChg(){ + + var v_eduMdCd = $("input[name='eduMdCd']:checked").val(); + var v_eduMd = $('#eduMd'); + + + if (v_eduMdCd=='99'){ + v_eduMd.removeAttr('disabled'); + }else{ + v_eduMd.val(''); + v_eduMd.attr('disabled', 'disabled'); + } + + }
@@ -583,6 +621,10 @@ + @@ -672,6 +714,27 @@ + + +

필수입력 항목*

+

교육대상

+ + + + +
* 교육대상자의 주요업무 또는 직업군 등 교육대상자가 명확히 드러나도록 기재 바랍니다.
* 교육대상자의 주요업무 또는 직업군이 여러 개일 경우, 모두 기재 하셔도 됩니다. + + + + +

필수입력 항목*

+

교육인원

+ + + + + +

필수입력 항목*

@@ -714,10 +777,22 @@ + + +

필수입력 항목*

+

강의료 지급 기관

+ + + + + +
+

교육일정 정보

@@ -731,17 +806,17 @@ - + - - + <%-- + --%> - - + @@ -756,7 +831,7 @@ - + --%> @@ -899,7 +974,7 @@ - diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp index cef35c3a..ffa5c178 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp @@ -20,6 +20,7 @@ <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> <%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> @@ -1179,7 +1180,12 @@

교육매체

@@ -1244,6 +1250,18 @@ + + + + + + + + + + + + - + @@ -1381,7 +1405,7 @@ (${list.lrnTm}분) - + <%-- --%> - + <%-- --%>
교육차시 정보 교육희망일, 시간, 대상, 배정강사, 인원, 삭제 을/를 입력하는 표

필수입력 항목*

교육희망일

필수입력 항목*

시간

필수입력 항목*

대상

필수입력 항목*

인원
-
+
" class="time" name="strtTm" title="시작 시간 입력"> @@ -879,14 +954,14 @@
(분)
+ <%--

-
-
+
@@ -1020,14 +1095,14 @@
(분)
+
- + + + + + +
${info.email}
+

교육대상

+
${info.eduTrgt}
+

교육인원

+
${info.eduPrsnl}

신청내용

@@ -1270,6 +1288,12 @@

+

강의료지급기관

+
배정강사인원 만족도조사(학생) 만족도조사(신청인)
${list.trgt}${list.trgt} <%-- ${empty list.instrNm ? '-' : list.instrNm} --%> @@ -1394,7 +1418,7 @@ ${list.prsnl}${list.prsnl}