diff --git a/src/main/java/kcc/com/cmm/ComDefaultVO.java b/src/main/java/kcc/com/cmm/ComDefaultVO.java index 31475f18..72df2360 100644 --- a/src/main/java/kcc/com/cmm/ComDefaultVO.java +++ b/src/main/java/kcc/com/cmm/ComDefaultVO.java @@ -170,6 +170,8 @@ public class ComDefaultVO implements Serializable { private String searchDashboard; + private String searchQuery; + public int getBeSort() { return beSort; } @@ -834,4 +836,12 @@ public class ComDefaultVO implements Serializable { this.searchInsttNm = searchInsttNm; } + public String getSearchQuery() { + return searchQuery; + } + + public void setSearchQuery(String searchQuery) { + this.searchQuery = searchQuery; + } + } diff --git a/src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java b/src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java index 5589badb..2fea247b 100644 --- a/src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java +++ b/src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java @@ -26,6 +26,7 @@ import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduChasiVO; import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO; import kcc.ve.instr.tngrVisitEdu.lctrInfo.service.VELctrDetailVO; import kcc.ve.instr.tngrVisitEdu.lctrInfo.service.VELctrSttsVO; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEAPrcsAplctPrdInstrAsgnmVO; /** * @@ -469,6 +470,18 @@ public class EgovCryptoUtil { return p_schduleManageVOList; } + //VEAPrcsAplctPrdInstrAsgnmVO + //- 복호화 + public List decryptVEAPrcsAplctPrdInstrAsgnmVOList(List p_VEAPrcsAplctPrdInstrAsgnmList){ + + for (int i=0;i findByPrcsAplctPrdOrd(String prcsAplctPrdOrd); +} diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEAPrcsAplctPrdInstrAsgnmVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEAPrcsAplctPrdInstrAsgnmVO.java new file mode 100644 index 00000000..dd8339a7 --- /dev/null +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEAPrcsAplctPrdInstrAsgnmVO.java @@ -0,0 +1,165 @@ +package kcc.ve.instr.tngrVisitEdu.prcsInfo.service; + +import java.io.Serializable; + +import kcc.com.cmm.ComDefaultVO; + + +/** + * + * @author : 이호영 + * @fileName : VEPrcsDetailVO.java + * @date : 2023.09.05 + * @description : 교육과정강사배정 태이블 [vea_prcs_aplct_prd_instr_asgnm] + * =========================================================== + * DATE AUTHOR NOTE + * ----------------------------------------------------------- * + * 2023.09.05 이호영 최초 생성 + * + * + * + */ +public class VEAPrcsAplctPrdInstrAsgnmVO extends ComDefaultVO implements Serializable { + /* + * + * + * */ + + private static final long serialVersionUID = 1L; + + private String prcsAplctPrdOrd; // 과정신청기간순번 + private String userId; // 사용자아이디-강사 + private String lctrPlanAtchFileId; // 강의계획서첨부파일아이디 + private String docAtchFileId; // 서류첨부파일아이디 + private String asgnmAprvlCd; // 배정 승인 코드(VE0019) + private String asgnmAprvlPnttm; // 배정 승인 일시 + private String asgnmAprvlId; // 배정 승인 아이디 + private String rmrks; // 비고 + private String frstRegisterId; // + private String frstRegistPnttm; + private String lastUpdusrId; // + private String lastUpdtPnttm; + + // ve_instr_detail + private String instrNm; // 강사 이름 + private String phone; // phone + + public String getPrcsAplctPrdOrd() { + return prcsAplctPrdOrd; + } + + public void setPrcsAplctPrdOrd(String prcsAplctPrdOrd) { + this.prcsAplctPrdOrd = prcsAplctPrdOrd; + } + + public String getUserId() { + return userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + + public String getLctrPlanAtchFileId() { + return lctrPlanAtchFileId; + } + + public void setLctrPlanAtchFileId(String lctrPlanAtchFileId) { + this.lctrPlanAtchFileId = lctrPlanAtchFileId; + } + + public String getDocAtchFileId() { + return docAtchFileId; + } + + public void setDocAtchFileId(String docAtchFileId) { + this.docAtchFileId = docAtchFileId; + } + + public String getAsgnmAprvlCd() { + return asgnmAprvlCd; + } + + public void setAsgnmAprvlCd(String asgnmAprvlCd) { + this.asgnmAprvlCd = asgnmAprvlCd; + } + + public String getAsgnmAprvlPnttm() { + return asgnmAprvlPnttm; + } + + public void setAsgnmAprvlPnttm(String asgnmAprvlPnttm) { + this.asgnmAprvlPnttm = asgnmAprvlPnttm; + } + + public String getAsgnmAprvlId() { + return asgnmAprvlId; + } + + public void setAsgnmAprvlId(String asgnmAprvlId) { + this.asgnmAprvlId = asgnmAprvlId; + } + + public String getRmrks() { + return rmrks; + } + + public void setRmrks(String rmrks) { + this.rmrks = rmrks; + } + + public String getFrstRegisterId() { + return frstRegisterId; + } + + public void setFrstRegisterId(String frstRegisterId) { + this.frstRegisterId = frstRegisterId; + } + + public String getFrstRegistPnttm() { + return frstRegistPnttm; + } + + public void setFrstRegistPnttm(String frstRegistPnttm) { + this.frstRegistPnttm = frstRegistPnttm; + } + + public String getLastUpdusrId() { + return lastUpdusrId; + } + + public void setLastUpdusrId(String lastUpdusrId) { + this.lastUpdusrId = lastUpdusrId; + } + + public String getLastUpdtPnttm() { + return lastUpdtPnttm; + } + + public void setLastUpdtPnttm(String lastUpdtPnttm) { + this.lastUpdtPnttm = lastUpdtPnttm; + } + + public String getInstrNm() { + return instrNm; + } + + public void setInstrNm(String instrNm) { + this.instrNm = instrNm; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + + + + + + +} diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsAplctPrdService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsAplctPrdService.java index ab4a3354..9db12867 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsAplctPrdService.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsAplctPrdService.java @@ -2,6 +2,8 @@ package kcc.ve.instr.tngrVisitEdu.prcsInfo.service; import java.util.List; +import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO; + public interface VEPrcsAplctPrdService { //C @@ -33,4 +35,7 @@ public interface VEPrcsAplctPrdService { VEPrcsDetailVO selectDetailNewOne(VEPrcsDetailVO paramVO) throws Exception; VEPrcsDetailVO selectDetailNewOne4Fndth(VEPrcsDetailVO paramVO) throws Exception; + + List selectinstrAsgnmPopupPagingList(VEPrcsDetailVO vEPrcsDetailVO); + } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java index 9771f976..843d8a16 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java @@ -13,6 +13,7 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable { private static final long serialVersionUID = 1L; //ve_prcs + private String prcsOrd; //과정순번 private String prcsDiv; //과정구분 private String prcsKind; //과정종류 @@ -104,10 +105,17 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable { private String deadLineDt; private String eduPartCd; - private String nos; + private int nos; private String ddlnCd; private String nosCnt1; //신청인 + private String eduPlace; //교육장소 + + private String instrDiv; + private String userId; + + + public String getPrcsOrd() { return prcsOrd; @@ -505,10 +513,10 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable { public void setEduPartCd(String eduPartCd) { this.eduPartCd = eduPartCd; } - public String getNos() { + public int getNos() { return nos; } - public void setNos(String nos) { + public void setNos(int nos) { this.nos = nos; } public String getDdlnCd() { @@ -523,4 +531,24 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable { public void setNosCnt1(String nosCnt1) { this.nosCnt1 = nosCnt1; } + public String getEduPlace() { + return eduPlace; + } + public void setEduPlace(String eduPlace) { + this.eduPlace = eduPlace; + } + public String getInstrDiv() { + return instrDiv; + } + public void setInstrDiv(String instrDiv) { + this.instrDiv = instrDiv; + } + public String getUserId() { + return userId; + } + public void setUserId(String userId) { + this.userId = userId; + } + + } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEAPrcsAplctPrdInstrAsgnmDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEAPrcsAplctPrdInstrAsgnmDAO.java new file mode 100644 index 00000000..0753a018 --- /dev/null +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEAPrcsAplctPrdInstrAsgnmDAO.java @@ -0,0 +1,24 @@ +package kcc.ve.instr.tngrVisitEdu.prcsInfo.service.impl; + +import java.util.List; + +import org.springframework.stereotype.Repository; + +import egovframework.rte.psl.dataaccess.EgovAbstractDAO; +import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEAPrcsAplctPrdInstrAsgnmVO; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; + +@Repository("vEAPrcsAplctPrdInstrAsgnmDAO") +public class VEAPrcsAplctPrdInstrAsgnmDAO extends EgovAbstractDAO { + + public void instrInsert(VEAPrcsAplctPrdInstrAsgnmVO vEAPrcsAplctPrdInstrAsgnmVO) { +// insert("VEPrcsAplctPrdDAO.instrInsert", vEAPrcsAplctPrdInstrAsgnmVO); + insert("VEAPrcsAplctPrdInstrAsgnmDAO.instrInsert", vEAPrcsAplctPrdInstrAsgnmVO); + } + + public List findByPrcsAplctPrdOrd(String prcsAplctPrdOrd) { + return (List) list("VEAPrcsAplctPrdInstrAsgnmDAO.findByPrcsAplctPrdOrd", prcsAplctPrdOrd); + } + +} diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEAPrcsAplctPrdInstrAsgnmServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEAPrcsAplctPrdInstrAsgnmServiceImpl.java new file mode 100644 index 00000000..58a96d74 --- /dev/null +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEAPrcsAplctPrdInstrAsgnmServiceImpl.java @@ -0,0 +1,38 @@ +package kcc.ve.instr.tngrVisitEdu.prcsInfo.service.impl; + + + +import java.util.List; + +import javax.annotation.Resource; + +import org.springframework.stereotype.Service; + +import egovframework.rte.fdl.idgnr.EgovIdGnrService; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEAPrcsAplctPrdInstrAsgnmService; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEAPrcsAplctPrdInstrAsgnmVO; + +@Service("vEAPrcsAplctPrdInstrAsgnmService") +public class VEAPrcsAplctPrdInstrAsgnmServiceImpl implements VEAPrcsAplctPrdInstrAsgnmService { + + + //과정신청기간순번 + @Resource(name="prcsAplctPrdGnrService") + private EgovIdGnrService prcsAplctPrdGnrService; + + //과정 + @Resource(name="vEAPrcsAplctPrdInstrAsgnmDAO") + private VEAPrcsAplctPrdInstrAsgnmDAO vEAPrcsAplctPrdInstrAsgnmDAO; + + //과정 + @Override + public void instrInsert(VEAPrcsAplctPrdInstrAsgnmVO vEAPrcsAplctPrdInstrAsgnmVO) { + vEAPrcsAplctPrdInstrAsgnmDAO.instrInsert(vEAPrcsAplctPrdInstrAsgnmVO); + + } + + @Override + public List findByPrcsAplctPrdOrd(String prcsAplctPrdOrd) { + return vEAPrcsAplctPrdInstrAsgnmDAO.findByPrcsAplctPrdOrd(prcsAplctPrdOrd); + } +} diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdDAO.java index b959fe8b..85cdf8e6 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdDAO.java @@ -5,6 +5,8 @@ import java.util.List; import org.springframework.stereotype.Repository; import egovframework.rte.psl.dataaccess.EgovAbstractDAO; +import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEAPrcsAplctPrdInstrAsgnmVO; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; @Repository("vEPrcsAplctPrdDAO") @@ -21,7 +23,7 @@ public class VEPrcsAplctPrdDAO extends EgovAbstractDAO { /** * 상세보기 - R - * @param VEPrcsDetailVO + * @param CndtnTrgtInfoMngVO * @return * @throws Exception */ @@ -31,7 +33,7 @@ public class VEPrcsAplctPrdDAO extends EgovAbstractDAO { /** * 수정 - U - * @param VEPrcsDetailVO + * @param CndtnTrgtInfoMngVO * @return * @throws Exception */ @@ -83,6 +85,11 @@ public class VEPrcsAplctPrdDAO extends EgovAbstractDAO { public VEPrcsDetailVO selectDetailNewOne4Fndth(VEPrcsDetailVO paramVO) throws Exception { return (VEPrcsDetailVO) select("VEPrcsAplctPrdDAO.selectDetailNewOne4Fndth", paramVO); - } + } + + public List selectinstrAsgnmPopupPagingList(VEPrcsDetailVO vEPrcsDetailVO) { + return (List) list("VEPrcsAplctPrdDAO.selectinstrAsgnmPopupPagingList", vEPrcsDetailVO); + } + } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdServiceImpl.java index f084e417..446ab94a 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdServiceImpl.java @@ -7,20 +7,39 @@ import javax.annotation.Resource; import org.springframework.stereotype.Service; +import egovframework.rte.fdl.idgnr.EgovIdGnrService; +import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEAPrcsAplctPrdInstrAsgnmVO; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsAplctPrdService; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; @Service("vEPrcsAplctPrdService") public class VEPrcsAplctPrdServiceImpl implements VEPrcsAplctPrdService { + + //과정신청기간순번 + @Resource(name="prcsAplctPrdGnrService") + private EgovIdGnrService prcsAplctPrdGnrService; + //과정 @Resource(name="vEPrcsAplctPrdDAO") private VEPrcsAplctPrdDAO vEPrcsAplctPrdDAO; + + //과정 + @Resource(name="vEPrcsDAO") + private VEPrcsDAO vEPrcsDAO; //C - public void insert(VEPrcsDetailVO paramVO) throws Exception { - vEPrcsAplctPrdDAO.insert(paramVO); + public void insert(VEPrcsDetailVO vEPrcsDetailVO) throws Exception { + + + String prcsAplctPrdOrd = prcsAplctPrdGnrService.getNextStringId(); // 고유ID + vEPrcsDetailVO.setPrcsAplctPrdOrd(prcsAplctPrdOrd); + vEPrcsDetailVO.setLctrDivCd("50"); //강의구분코드 VE0011 10-청소년강의, 20-성인강의, 30-체험, 50-기반강화, 60-조건부 + //vEPrcsDetailVO.setUseYn("Y"); + + vEPrcsAplctPrdDAO.insert(vEPrcsDetailVO); } //R @@ -30,8 +49,8 @@ public class VEPrcsAplctPrdServiceImpl implements VEPrcsAplctPrdService { //U public int update(VEPrcsDetailVO paramVO) throws Exception{ - - return vEPrcsAplctPrdDAO.update(paramVO); + vEPrcsAplctPrdDAO.update(paramVO); + return vEPrcsDAO.update(paramVO); } //D @@ -65,4 +84,10 @@ public class VEPrcsAplctPrdServiceImpl implements VEPrcsAplctPrdService { public VEPrcsDetailVO selectDetailNewOne4Fndth(VEPrcsDetailVO paramVO) throws Exception { return vEPrcsAplctPrdDAO.selectDetailNewOne4Fndth(paramVO); } + + @Override + public List selectinstrAsgnmPopupPagingList(VEPrcsDetailVO vEPrcsDetailVO) { + return vEPrcsAplctPrdDAO.selectinstrAsgnmPopupPagingList(vEPrcsDetailVO); + } + } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsDAO.java index 6da1a06c..47ea96ee 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsDAO.java @@ -12,7 +12,7 @@ public class VEPrcsDAO extends EgovAbstractDAO { /** * 등록 - C - * @param VEPrcsDetailVO + * @param CndtnTrgtInfoMngVO * @throws Exception */ public void insert(VEPrcsDetailVO paramVO) throws Exception { @@ -21,7 +21,7 @@ public class VEPrcsDAO extends EgovAbstractDAO { /** * 상세보기 - R - * @param VEPrcsDetailVO + * @param CndtnTrgtInfoMngVO * @return * @throws Exception */ @@ -31,7 +31,7 @@ public class VEPrcsDAO extends EgovAbstractDAO { /** * 수정 - U - * @param VEPrcsDetailVO + * @param CndtnTrgtInfoMngVO * @return * @throws Exception */ diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsMIXDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsMIXDAO.java index bef15bae..d6f08060 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsMIXDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsMIXDAO.java @@ -12,7 +12,7 @@ public class VEPrcsMIXDAO extends EgovAbstractDAO { /** * 상세보기 - R - * @param VEPrcsDetailVO + * @param CndtnTrgtInfoMngVO * @return * @throws Exception */ diff --git a/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduCnfrmMng/web/EduCnfrmMngAdultController.java b/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduCnfrmMng/web/EduCnfrmMngAdultController.java index eb74d852..e2573bd7 100644 --- a/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduCnfrmMng/web/EduCnfrmMngAdultController.java +++ b/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduCnfrmMng/web/EduCnfrmMngAdultController.java @@ -333,6 +333,7 @@ public class EduCnfrmMngAdultController { } //System.out.println(vEInstrAsgnmVO.getInstrNm()); + System.out.println("==============================================="); if ("10".equals(vEEduAplctVO.getEduSlctCd())) { //10-온라인, 20-오프라인 selectVEInstrAsgnmVOList = vEAsgnmMIXService.selectInstrAsgnmOnPagingList_220210_adult(vEInstrAsgnmVO); @@ -371,6 +372,7 @@ public class EduCnfrmMngAdultController { model.addAttribute("list", selectVEInstrAsgnmVOList); return "oprtn/adultVisitEdu/popup/instrAsgnmPopup"; + } diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/service/CndtnPrcsInfoMngService.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/service/CndtnPrcsInfoMngService.java new file mode 100644 index 00000000..fce8be02 --- /dev/null +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/service/CndtnPrcsInfoMngService.java @@ -0,0 +1,41 @@ +package kcc.ve.oprtn.cndtnSspnIdtmt.service; + +import java.util.List; + +public interface CndtnPrcsInfoMngService { + + List selectPagingList(CndtnPrcsInfoMngVO cndtnTrgtInfoMngVO); + + void insert(CndtnPrcsInfoMngVO cndtnTrgtInfoMngVO); + + + + + + +/* //C + void insert(VEPrcsDetailVO paramVO) throws Exception; + + //R + VEPrcsDetailVO selectDetail(VEPrcsDetailVO paramVO) throws Exception; + + //U + int update(VEPrcsDetailVO paramVO) throws Exception; + + //D + int delete(VEPrcsDetailVO paramVO) throws Exception; + + //L + List selectList(VEPrcsDetailVO paramVO) throws Exception; + + //List selectList4Fndth(VEPrcsDetailVO paramVO) throws Exception; + + List selectTngrPrcsList(VEPrcsDetailVO paramVO) throws Exception; + + //Page List + List selectPagingList(VEPrcsDetailVO paramVO) throws Exception; + + //교육과정 리스트 순서 수정 + void updatePrcsSort(VEPrcsDetailVO paramVO) throws Exception;*/ + +} diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/service/CndtnPrcsInfoMngVO.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/service/CndtnPrcsInfoMngVO.java new file mode 100644 index 00000000..323d2e1a --- /dev/null +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/service/CndtnPrcsInfoMngVO.java @@ -0,0 +1,130 @@ +package kcc.ve.oprtn.cndtnSspnIdtmt.service; + +import java.io.Serializable; + +import kcc.com.cmm.ComDefaultVO; + + +public class CndtnPrcsInfoMngVO extends ComDefaultVO implements Serializable { + /* + * 과정테이블 + * */ + + private static final long serialVersionUID = 1L; + + //ve_prcs + + private String sspnIdtmtTrgtOrd; // 과정순번 + private String userId; // 사용자아이디 + private String trgtStateCd; // 대상상태코드 VEA002 + private String frstRegistPnttm; // 등록일시 + private String frstRegisterId; // 등록자 + private String lastUpdtPnttm; // 수정일시 + private String lastUpdusrId; // 수정자 + private String trgtNm; // 대상자성명 + private String clphone; // 연락처 + private String dBirth; // 생년월일 + private String addr; // 주소 + private String addrDetail; // 상세주소 + private String email; // 이메일주소 + private String post; // 우편주소 + + + + + + + + public String getSspnIdtmtTrgtOrd() { + return sspnIdtmtTrgtOrd; + } + public void setSspnIdtmtTrgtOrd(String sspnIdtmtTrgtOrd) { + this.sspnIdtmtTrgtOrd = sspnIdtmtTrgtOrd; + } + public String getUserId() { + return userId; + } + public void setUserId(String userId) { + this.userId = userId; + } + public String getTrgtStateCd() { + return trgtStateCd; + } + public void setTrgtStateCd(String trgtStateCd) { + this.trgtStateCd = trgtStateCd; + } + public String getFrstRegistPnttm() { + return frstRegistPnttm; + } + public void setFrstRegistPnttm(String frstRegistPnttm) { + this.frstRegistPnttm = frstRegistPnttm; + } + public String getFrstRegisterId() { + return frstRegisterId; + } + public void setFrstRegisterId(String frstRegisterId) { + this.frstRegisterId = frstRegisterId; + } + public String getLastUpdtPnttm() { + return lastUpdtPnttm; + } + public void setLastUpdtPnttm(String lastUpdtPnttm) { + this.lastUpdtPnttm = lastUpdtPnttm; + } + public String getLastUpdusrId() { + return lastUpdusrId; + } + public void setLastUpdusrId(String lastUpdusrId) { + this.lastUpdusrId = lastUpdusrId; + } + public String getTrgtNm() { + return trgtNm; + } + public void setTrgtNm(String trgtNm) { + this.trgtNm = trgtNm; + } + public String getClphone() { + return clphone; + } + public void setClphone(String clphone) { + this.clphone = clphone; + } + public String getdBirth() { + return dBirth; + } + public void setdBirth(String dBirth) { + this.dBirth = dBirth; + } + public String getAddr() { + return addr; + } + public void setAddr(String addr) { + this.addr = addr; + } + public String getAddrDetail() { + return addrDetail; + } + public void setAddrDetail(String addrDetail) { + this.addrDetail = addrDetail; + } + public String getEmail() { + return email; + } + public void setEmail(String email) { + this.email = email; + } + public String getPost() { + return post; + } + public void setPost(String post) { + this.post = post; + } + + + + + + + + +} diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/service/impl/CndtnPrcsInfoMngDAO.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/service/impl/CndtnPrcsInfoMngDAO.java new file mode 100644 index 00000000..439e0f29 --- /dev/null +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/service/impl/CndtnPrcsInfoMngDAO.java @@ -0,0 +1,104 @@ +package kcc.ve.oprtn.cndtnSspnIdtmt.service.impl; + +import java.util.List; + +import org.springframework.stereotype.Repository; + +import egovframework.rte.psl.dataaccess.EgovAbstractDAO; +import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEAPrcsAplctPrdInstrAsgnmVO; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; +import kcc.ve.oprtn.cndtnSspnIdtmt.service.CndtnPrcsInfoMngVO; + +@Repository("cndtnTrgtInfoMngDAO") +public class CndtnPrcsInfoMngDAO extends EgovAbstractDAO { + +/* *//** + * 등록 - C + * @param VELctrDetailVO + * @throws Exception + *//* + public void insert(VEPrcsDetailVO paramVO) throws Exception { + insert("VEPrcsAplctPrdDAO.insert", paramVO); + } + + *//** + * 상세보기 - R + * @param CndtnTrgtInfoMngVO + * @return + * @throws Exception + *//* + public VEPrcsDetailVO selectDetail(VEPrcsDetailVO paramVO) throws Exception { + return (VEPrcsDetailVO) select("VEPrcsAplctPrdDAO.selectDetail", paramVO); + } + + *//** + * 수정 - U + * @param CndtnTrgtInfoMngVO + * @return + * @throws Exception + *//* + public int update(VEPrcsDetailVO paramVO) throws Exception { + return update("VEPrcsAplctPrdDAO.update", paramVO); + } + + *//** + * 삭제 - D + * @param addrAgencyVO + * @return + * @throws Exception + *//* + public int delete(VEPrcsDetailVO paramVO) throws Exception { + return delete("VEPrcsAplctPrdDAO.delete", paramVO); + } + + //L + public List selectList(VEPrcsDetailVO paramVO) throws Exception { + List tlist = (List) list("VEPrcsAplctPrdDAO.selectList", paramVO); + return tlist; + } + + public List selectList4Fndth(VEPrcsDetailVO paramVO) throws Exception { + List tlist = (List) list("VEPrcsAplctPrdDAO.selectList4Fndth", paramVO); + return tlist; + } + + + *//** + * L - Page + * @param addrVO + * @return + * @throws Exception + *//* + public List selectPagingList(VEPrcsDetailVO paramVO) throws Exception { + List tlist = (List) list("VEPrcsAplctPrdDAO.selectPagingList", paramVO); + return tlist; + } + + public List selectPagingList4Fndth(VEPrcsDetailVO paramVO) throws Exception { + List tlist = (List) list("VEPrcsAplctPrdDAO.selectPagingList4Fndth", paramVO); + return tlist; + } + + public VEPrcsDetailVO selectDetailNewOne(VEPrcsDetailVO paramVO) throws Exception { + return (VEPrcsDetailVO) select("VEPrcsAplctPrdDAO.selectDetailNewOne", paramVO); + } + + public VEPrcsDetailVO selectDetailNewOne4Fndth(VEPrcsDetailVO paramVO) throws Exception { + return (VEPrcsDetailVO) select("VEPrcsAplctPrdDAO.selectDetailNewOne4Fndth", paramVO); + } + + public List selectinstrAsgnmPopupPagingList(VEPrcsDetailVO vEPrcsDetailVO) { + return (List) list("VEPrcsAplctPrdDAO.selectinstrAsgnmPopupPagingList", vEPrcsDetailVO); + }*/ + + public List selectPagingList(CndtnPrcsInfoMngVO cndtnTrgtInfoMngVO) { + return (List) list("cndtnTrgtInfoMngDAO.selectPagingList", cndtnTrgtInfoMngVO); + } + + public void insert(CndtnPrcsInfoMngVO cndtnTrgtInfoMngVO) { + insert("cndtnTrgtInfoMngDAO.insert", cndtnTrgtInfoMngVO); + } + + +} diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/service/impl/CndtnPrcsInfoMngServiceImpl.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/service/impl/CndtnPrcsInfoMngServiceImpl.java new file mode 100644 index 00000000..f0648908 --- /dev/null +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/service/impl/CndtnPrcsInfoMngServiceImpl.java @@ -0,0 +1,100 @@ +package kcc.ve.oprtn.cndtnSspnIdtmt.service.impl; + + +import java.util.List; + +import javax.annotation.Resource; + +import org.springframework.stereotype.Service; + +import egovframework.rte.fdl.idgnr.EgovIdGnrService; +import kcc.ve.oprtn.cndtnSspnIdtmt.service.CndtnPrcsInfoMngService; +import kcc.ve.oprtn.cndtnSspnIdtmt.service.CndtnPrcsInfoMngVO; + +@Service("cndtnTrgtInfoMngService") +public class CndtnPrcsInfoMngServiceImpl implements CndtnPrcsInfoMngService { + + + //과정신청기간순번 + @Resource(name="prcsAplctPrdGnrService") + private EgovIdGnrService prcsAplctPrdGnrService; + + //과정 + + //대상자 + @Resource(name="cndtnTrgtInfoMngDAO") + private CndtnPrcsInfoMngDAO cndtnTrgtInfoMngDAO; + + @Override + public List selectPagingList(CndtnPrcsInfoMngVO cndtnTrgtInfoMngVO) { + return cndtnTrgtInfoMngDAO.selectPagingList(cndtnTrgtInfoMngVO); + } + + @Override + public void insert(CndtnPrcsInfoMngVO cndtnTrgtInfoMngVO) { + cndtnTrgtInfoMngDAO.insert(cndtnTrgtInfoMngVO); + + } + + /* + //C + public void insert(VEPrcsDetailVO vEPrcsDetailVO) throws Exception { + + + String prcsAplctPrdOrd = prcsAplctPrdGnrService.getNextStringId(); // 고유ID + vEPrcsDetailVO.setPrcsAplctPrdOrd(prcsAplctPrdOrd); + vEPrcsDetailVO.setLctrDivCd("50"); //강의구분코드 VE0011 10-청소년강의, 20-성인강의, 30-체험, 50-기반강화, 60-조건부 + //vEPrcsDetailVO.setUseYn("Y"); + + vEPrcsAplctPrdDAO.insert(vEPrcsDetailVO); + } + + //R + public VEPrcsDetailVO selectDetail(VEPrcsDetailVO paramVO) throws Exception { + return vEPrcsAplctPrdDAO.selectDetail(paramVO); + } + + //U + public int update(VEPrcsDetailVO paramVO) throws Exception{ + vEPrcsAplctPrdDAO.update(paramVO); + return vEPrcsDAO.update(paramVO); + } + + //D + public int delete(VEPrcsDetailVO paramVO) throws Exception{ + return vEPrcsAplctPrdDAO.delete(paramVO); + } + + //List + public List selectList(VEPrcsDetailVO paramVO) throws Exception{ + return vEPrcsAplctPrdDAO.selectList(paramVO); + } + + public List selectList4Fndth(VEPrcsDetailVO paramVO) throws Exception{ + return vEPrcsAplctPrdDAO.selectList4Fndth(paramVO); + } + + //paging List + public List selectPagingList(VEPrcsDetailVO paramVO) throws Exception{ + return vEPrcsAplctPrdDAO.selectPagingList(paramVO); + } + + public List selectPagingList4Fndth(VEPrcsDetailVO paramVO) throws Exception{ + return vEPrcsAplctPrdDAO.selectPagingList4Fndth(paramVO); + } + + //R + public VEPrcsDetailVO selectDetailNewOne(VEPrcsDetailVO paramVO) throws Exception { + return vEPrcsAplctPrdDAO.selectDetailNewOne(paramVO); + } + + public VEPrcsDetailVO selectDetailNewOne4Fndth(VEPrcsDetailVO paramVO) throws Exception { + return vEPrcsAplctPrdDAO.selectDetailNewOne4Fndth(paramVO); + } + + @Override + public List selectinstrAsgnmPopupPagingList(VEPrcsDetailVO vEPrcsDetailVO) { + return vEPrcsAplctPrdDAO.selectinstrAsgnmPopupPagingList(vEPrcsDetailVO); + }*/ + +} diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/prcsInfoMng/web/CndtnPrcsInfoMngController.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java similarity index 65% rename from src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/prcsInfoMng/web/CndtnPrcsInfoMngController.java rename to src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java index 794b3a96..34f58fe5 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/prcsInfoMng/web/CndtnPrcsInfoMngController.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java @@ -1,4 +1,4 @@ -package kcc.ve.oprtn.cndtnSspnIdtmt.prcsInfoMng.web; +package kcc.ve.oprtn.cndtnSspnIdtmt.web; import java.util.List; @@ -25,6 +25,8 @@ import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsCntntVO; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsOnlnCntntService; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsService; +import kcc.ve.oprtn.cndtnSspnIdtmt.service.CndtnPrcsInfoMngService; +import kcc.ve.oprtn.cndtnSspnIdtmt.service.CndtnPrcsInfoMngVO; /** * 기반강화연수(관리자) @@ -62,10 +64,18 @@ public class CndtnPrcsInfoMngController { @Resource(name = "vEPrcsOnlnCntntService") private VEPrcsOnlnCntntService vEPrcsOnlnCntntService; + + //과정 관리 + @Resource(name = "cndtnTrgtInfoMngService") + private CndtnPrcsInfoMngService cndtnTrgtInfoMngService; //교육과정순번 @Resource(name="prcsGnrService") private EgovIdGnrService prcsGnrService; + + //기소유예대상자 + @Resource(name="trgtOrdService") + private EgovIdGnrService trgtOrdService; //과정온라인콘텐츠순번 @Resource(name="prcsOnlnGnrService") @@ -109,9 +119,11 @@ public class CndtnPrcsInfoMngController { private CheckAdrProcessUtil checkAdrProcessUtil; */ - @RequestMapping("/kccadr/oprtn/cndtnSspnIdtmt/cndtnEduPrcsMngList.do") - public String cndtnEduPrcsMngList( - @ModelAttribute("vEPrcsDetailVO") VEPrcsDetailVO vEPrcsDetailVO + +// @RequestMapping("/kccadr/oprtn/cndtnSspnIdtmt/cndtnEduPrcsMngList.do") + @RequestMapping("/kccadr/oprtn/cndtnSspnIdtmt/trgtList.do") + public String cndtnSspnIdtmtMngList( + @ModelAttribute("cndtnTrgtInfoMngVO") CndtnPrcsInfoMngVO cndtnTrgtInfoMngVO , ModelMap model ) throws Exception { @@ -124,57 +136,56 @@ public class CndtnPrcsInfoMngController { //로그인 처리==================================== //1.pageing step1 - PaginationInfo paginationInfo = this.setPagingStep1(vEPrcsDetailVO); + PaginationInfo paginationInfo = this.setCndtnPagingStep1(cndtnTrgtInfoMngVO); //임시로 페이징 처리를 안하기 위해서 RecordCountPerPage 수를 10000 으로 셋팅함 //paginationInfo.setRecordCountPerPage(10000); //2. pageing step2 - vEPrcsDetailVO = this.setPagingStep2(vEPrcsDetailVO, paginationInfo); + cndtnTrgtInfoMngVO = this.setCndtnPagingStep2(cndtnTrgtInfoMngVO, paginationInfo); - //기반강화 조회 - vEPrcsDetailVO.setLctrDivCd("60"); //강의구분코드 VE0011 10-청소년강의, 20-성인강의, 30-체험, 50-기반강화, 60-조건부 - - if(StringUtil.isNotEmpty(vEPrcsDetailVO.getSearchKeyword())){ - String selectCondition = "AND a.PRCS_NM LIKE CONCAT ('%', '" +vEPrcsDetailVO.getSearchKeyword() + "', '%')"; - vEPrcsDetailVO.setSelectPagingListQuery(selectCondition); + //검색 조회 + if(StringUtil.isNotEmpty(cndtnTrgtInfoMngVO.getSearchKeyword())){ + + + String selectCondition = ""; + String searchStatus = cndtnTrgtInfoMngVO.getSearchStatus(); + + selectCondition = "AND a."+searchStatus+" LIKE CONCAT ('%', '" +cndtnTrgtInfoMngVO.getSearchKeyword() + "', '%')"; + cndtnTrgtInfoMngVO.setSearchQuery(selectCondition); } - if(StringUtil.isNotEmpty(vEPrcsDetailVO.getPrcsKind())){ - String[] splited = vEPrcsDetailVO.getPrcsKind().split(","); - vEPrcsDetailVO.setSearchStatusArr(splited); - } - - if(StringUtil.isEmpty(vEPrcsDetailVO.getPrcsDiv())) { - - vEPrcsDetailVO.setPrcsDiv("10");// 과정구분 VE0015 10-산업종사자, 20-대학생, 30-공무원, 40-일반인, 50-청소년, 60-학부모 - - } - List vEPrcsDetailVOList = vEPrcsService.selectPagingList(vEPrcsDetailVO); +// List cndtnTrgtInfoMngVOList = cndtnTrgtInfoMngService.selectPagingList(cndtnTrgtInfoMngVO); + List cndtnTrgtInfoMngVOList = null; + try { + + cndtnTrgtInfoMngVOList = cndtnTrgtInfoMngService.selectPagingList(cndtnTrgtInfoMngVO); + } catch (Exception e) { + e.printStackTrace(); + // TODO: handle exception + } //3.pageing step3 - paginationInfo = this.setPagingStep3(vEPrcsDetailVOList, paginationInfo); + paginationInfo = this.setCndtnPagingStep3(cndtnTrgtInfoMngVOList, paginationInfo); model.addAttribute("paginationInfo", paginationInfo); //대상 리스트, 페이징 정보 전달 - model.addAttribute("list", vEPrcsDetailVOList); + model.addAttribute("list", cndtnTrgtInfoMngVOList); - - return "oprtn/cndtnSspnIdtmt/cndtnEduPrcsMngList"; - ///kccadr/oprtn/fndthEnhanceTrn/fndthEduPrcsMngList.do + return "oprtn/cndtnSspnIdtmt/trgtList"; } /** - * 조건부기소유예과정 등록 화면 + * 조건부기소유예대상자 등록 화면 */ //@RequestMapping("eduPrcsMngReg.do") - @RequestMapping("/kccadr/oprtn/cndtnSspnIdtmt/cndtnEduPrcsMngReg.do") + @RequestMapping("/kccadr/oprtn/cndtnSspnIdtmt/trgtReg.do") public String cndtnEduPrcsMngReg( - @ModelAttribute("vEPrcsDetailVO") VEPrcsDetailVO vEPrcsDetailVO + @ModelAttribute("cndtnTrgtInfoMngVO") CndtnPrcsInfoMngVO cndtnTrgtInfoMngVO , ModelMap model ) throws Exception { @@ -187,15 +198,15 @@ public class CndtnPrcsInfoMngController { //로그인 처리==================================== - return "oprtn/cndtnSspnIdtmt/cndtnEduPrcsMngReg"; + return "oprtn/cndtnSspnIdtmt/trgtReg"; } /** * 조건부기소유예과정 등록 */ - @RequestMapping("/kccadr/oprtn/cndtnSspnIdtmt/cndtnEduPrcsMngRegAjax.do") + @RequestMapping("/kccadr/oprtn/cndtnSspnIdtmt/trgtRegAjax.do") public ModelAndView cndtnEduPrcsMngRegAjax( - @ModelAttribute("vEPrcsDetailVO") VEPrcsDetailVO vEPrcsDetailVO + @ModelAttribute("cndtnTrgtInfoMngVO") CndtnPrcsInfoMngVO cndtnTrgtInfoMngVO , ModelMap model //, RedirectAttributes redirectAttributes , HttpServletRequest request @@ -212,7 +223,6 @@ public class CndtnPrcsInfoMngController { modelAndView.addObject("result", "loginFail"); return modelAndView; } - //로그인 처리==================================== @@ -220,28 +230,15 @@ public class CndtnPrcsInfoMngController { SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 - String prcsOrd = prcsGnrService.getNextStringId(); // 고유ID - vEPrcsDetailVO.setPrcsOrd(prcsOrd); - vEPrcsDetailVO.setLctrDivCd("60"); //강의구분코드 VE0011 10-청소년강의, 20-성인강의, 30-체험, 50-기반강화, 60-조건부 - vEPrcsDetailVO.setUseYn("Y"); - vEPrcsDetailVO.setFrstRegisterId(loginVO.getUniqId()); //esntl_id - vEPrcsService.insert(vEPrcsDetailVO); + cndtnTrgtInfoMngVO.setSspnIdtmtTrgtOrd(trgtOrdService.getNextStringId()); + cndtnTrgtInfoMngVO.setFrstRegisterId(loginVO.getUniqId()); //esntl_id +// vEPrcsDetailVO.setPrcsOrd(prcsOrd); +// vEPrcsDetailVO.setLctrDivCd("60"); //강의구분코드 VE0011 10-청소년강의, 20-성인강의, 30-체험, 50-기반강화, 60-조건부 +// vEPrcsDetailVO.setUseYn("Y"); +// vEPrcsDetailVO.setFrstRegisterId(loginVO.getUniqId()); //esntl_id + cndtnTrgtInfoMngService.insert(cndtnTrgtInfoMngVO); - //세부과정 생성하기 - String[] s_detailPrcsNm = request.getParameterValues("detailPrcsNm"); - for (int i=0;i p_vEPrcsDetailVOList - , PaginationInfo p_paginationInfo )throws Exception{ // pageing step3 @@ -423,6 +479,52 @@ public class CndtnPrcsInfoMngController { if(p_vEPrcsDetailVOList.size() > 0) totCnt = p_vEPrcsDetailVOList.get(0).getTotCnt(); p_paginationInfo.setTotalRecordCount(totCnt); + return p_paginationInfo; + } + //CndtnTrgtInfoMngVO + //페이징을 위한 처리 step1 - 페이징 기본 정보 설정 + private PaginationInfo setCndtnPagingStep1( + CndtnPrcsInfoMngVO p_cndtnTrgtInfoMngVO + )throws Exception{ + // pageing step1 + PaginationInfo paginationInfo = new PaginationInfo(); + paginationInfo.setCurrentPageNo(p_cndtnTrgtInfoMngVO.getPageIndex()); + paginationInfo.setRecordCountPerPage(p_cndtnTrgtInfoMngVO.getPageUnit()); + paginationInfo.setPageSize(p_cndtnTrgtInfoMngVO.getPageSize()); + + return paginationInfo; + } + + + //페이징을 위한 처리 step2 - 게시물 리스트 수량 설정 및 검색 조건 초기화 + private CndtnPrcsInfoMngVO setCndtnPagingStep2( + CndtnPrcsInfoMngVO p_cndtnTrgtInfoMngVO + , PaginationInfo p_paginationInfo + )throws Exception{ + // pageing step2 + p_cndtnTrgtInfoMngVO.setFirstIndex(p_paginationInfo.getFirstRecordIndex()); + p_cndtnTrgtInfoMngVO.setLastIndex(p_paginationInfo.getLastRecordIndex()); + p_cndtnTrgtInfoMngVO.setRecordCountPerPage(p_paginationInfo.getRecordCountPerPage()); + + if("".equals(p_cndtnTrgtInfoMngVO.getSearchSortCnd())){ //최초조회시 최신것 조회List + p_cndtnTrgtInfoMngVO.setSearchSortCnd("prcs_ord"); + p_cndtnTrgtInfoMngVO.setSearchSortOrd("desc"); + } + + return p_cndtnTrgtInfoMngVO; + } + + + //페이징을 위한 처리 step3 - 전체 게시물 수량 설정하기 + private PaginationInfo setCndtnPagingStep3( + List p_cndtnTrgtInfoMngVOList + , PaginationInfo p_paginationInfo + )throws Exception{ + // pageing step3 + int totCnt = 0; + if(p_cndtnTrgtInfoMngVOList.size() > 0) totCnt = p_cndtnTrgtInfoMngVOList.get(0).getTotCnt(); + p_paginationInfo.setTotalRecordCount(totCnt); + return p_paginationInfo; } } diff --git a/src/main/java/kcc/ve/oprtn/fndtnEnhanceTrn/prcsAplctPrdMng/web/FndthPrcsAplctPrdMngController.java b/src/main/java/kcc/ve/oprtn/fndtnEnhanceTrn/prcsAplctPrdMng/web/FndthPrcsAplctPrdMngController.java index 735a1e16..ce4c413c 100644 --- a/src/main/java/kcc/ve/oprtn/fndtnEnhanceTrn/prcsAplctPrdMng/web/FndthPrcsAplctPrdMngController.java +++ b/src/main/java/kcc/ve/oprtn/fndtnEnhanceTrn/prcsAplctPrdMng/web/FndthPrcsAplctPrdMngController.java @@ -17,17 +17,27 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes; import egovframework.rte.fdl.idgnr.EgovIdGnrService; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; +import kcc.com.cmm.ComDefaultCodeVO; +import kcc.com.cmm.ComDefaultVO; import kcc.com.cmm.LoginVO; +import kcc.com.cmm.service.CmmnDetailCode; import kcc.com.cmm.service.EgovFileMngService; import kcc.com.cmm.service.EgovFileMngUtil; +import kcc.com.cmm.service.impl.CmmUseDAO; import kcc.com.cmm.util.StringUtil; import kcc.com.utl.user.service.CheckLoginUtil; import kcc.let.uat.uia.service.SsoLoginVO; import kcc.let.utl.fcc.service.EgovCryptoUtil; +import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEInstrAsgnmVO; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctService; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduChasiService; +import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduChasiVO; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduMIXService; +import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO; +import kcc.ve.instr.tngrVisitEdu.lctrInfo.service.VELctrDetailVO; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEAPrcsAplctPrdInstrAsgnmService; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEAPrcsAplctPrdInstrAsgnmVO; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsAplctPrdService; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsCmpltDetailService; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; @@ -79,6 +89,10 @@ public class FndthPrcsAplctPrdMngController { @Resource(name = "vEPrcsAplctPrdService") private VEPrcsAplctPrdService vEPrcsAplctPrdService; + //과정차시 관리 + @Resource(name = "vEAPrcsAplctPrdInstrAsgnmService") + private VEAPrcsAplctPrdInstrAsgnmService vEAPrcsAplctPrdInstrAsgnmService; + //교육과정순번 @Resource(name="prcsGnrService") private EgovIdGnrService prcsGnrService; @@ -117,7 +131,10 @@ public class FndthPrcsAplctPrdMngController { @Resource(name = "EgovFileMngService") private EgovFileMngService fileService; - + + //과정 + @Resource(name="cmmUseDAO") + private CmmUseDAO cmmUseDAO; /* // 교육신청 서비스단 @@ -187,7 +204,7 @@ public class FndthPrcsAplctPrdMngController { vEPrcsDetailVO.setLctrDivCd("50"); //강의구분코드 VE0011 10-청소년강의, 20-성인강의, 30-체험, 50-기반강화, 60-조건부 if(StringUtil.isNotEmpty(vEPrcsDetailVO.getSearchKeyword())){ - String selectCondition = "AND a.PRCS_NM LIKE CONCAT ('%', '" +vEPrcsDetailVO.getSearchKeyword() + "', '%')"; + String selectCondition = "AND b.PRCS_NM LIKE CONCAT ('%', '" +vEPrcsDetailVO.getSearchKeyword() + "', '%')"; vEPrcsDetailVO.setSelectPagingListQuery(selectCondition); } @@ -260,9 +277,23 @@ public class FndthPrcsAplctPrdMngController { //model.addAttribute("paginationInfo", paginationInfo); - + + + // 교육 부분 코드 가져오는 영역 + ComDefaultCodeVO codeVO = new ComDefaultCodeVO(); + codeVO.setCodeId("VEA001");//기관구분코드 + codeVO.setCode(vEPrcsDetailVOList.get(0).getPrcsDiv()); + model.addAttribute("prcsDivNm", cmmUseDAO.selectCmmCodeDetailValue(codeVO).getCodeNm()); + + // 상세교육과정 내용 가져오는 영역 + VEPrcsDetailVO vEPrcsDetailVOPrcsCn = new VEPrcsDetailVO(); + vEPrcsDetailVOPrcsCn.setPrcsOrd(vEPrcsDetailVOList.get(0).getPrcsOrd()); + model.addAttribute("prcsCn", vEPrcsService.selectDetail(vEPrcsDetailVOPrcsCn).getPrcsCn()); + + + //대상 리스트, 페이징 정보 전달 - model.addAttribute("listPrcs", vEPrcsDetailVOList); + model.addAttribute("listPrcs", vEPrcsDetailVOList); } @@ -295,18 +326,11 @@ public class FndthPrcsAplctPrdMngController { } //로그인 처리==================================== - - LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 - - String prcsAplctPrdOrd = prcsAplctPrdGnrService.getNextStringId(); // 고유ID - vEPrcsDetailVO.setPrcsAplctPrdOrd(prcsAplctPrdOrd); - vEPrcsDetailVO.setLctrDivCd("50"); //강의구분코드 VE0011 10-청소년강의, 20-성인강의, 30-체험, 50-기반강화, 60-조건부 - //vEPrcsDetailVO.setUseYn("Y"); - vEPrcsDetailVO.setFrstRegisterId(loginVO.getUniqId()); //esntl_id - + + vEPrcsDetailVO.setFrstRegisterId(loginVO.getUniqId()); //esntl_id vEPrcsAplctPrdService.insert(vEPrcsDetailVO); @@ -316,6 +340,50 @@ public class FndthPrcsAplctPrdMngController { } + /** + * 기반강화연수과정 신청기간 등록 + */ + @RequestMapping("/kccadr/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctSelectDivAndCnAjax.do") + public ModelAndView fndthEduPrcsAplctSelectDivAjax( + @ModelAttribute("vEPrcsDetailVO") VEPrcsDetailVO vEPrcsDetailVO + , 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; + } + + //로그인 처리==================================== + + VEPrcsDetailVO vEPrcsDetailVODetail = vEPrcsService.selectDetail(vEPrcsDetailVO); + + ComDefaultCodeVO codeVO = new ComDefaultCodeVO(); + codeVO.setCodeId("VEA001");//기관구분코드 + codeVO.setCode(vEPrcsDetailVODetail.getPrcsDiv()); + + + + modelAndView.addObject("result", "success"); + modelAndView.addObject("prcsDiv", cmmUseDAO.selectCmmCodeDetailValue(codeVO) + .getCodeNm()); + + modelAndView.addObject("prcsCn", vEPrcsDetailVODetail.getPrcsCn()); + + + return modelAndView; + + } + /** * 기반강화연수과정 기간 상세화면 */ @@ -386,6 +454,15 @@ public class FndthPrcsAplctPrdMngController { model.addAttribute("listPrcsAplct", vEPrcsDetailVOList); } + // 강사 배치 정보 + { + + List vEAPrcsAplctPrdInstrAsgnmList = vEAPrcsAplctPrdInstrAsgnmService.findByPrcsAplctPrdOrd(vEPrcsDetailVO.getPrcsAplctPrdOrd()); + List instrAsgnmList = egovCryptoUtil.decryptVEAPrcsAplctPrdInstrAsgnmVOList(vEAPrcsAplctPrdInstrAsgnmList); + + model.addAttribute("instrAsgnmList", instrAsgnmList); + } + return "/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngDetail"; } @@ -479,6 +556,7 @@ public class FndthPrcsAplctPrdMngController { //String prcsAplctPrdOrd = prcsAplctPrdGnrService.getNextStringId(); // 고유ID //vEPrcsDetailVO.setPrcsAplctPrdOrd(prcsAplctPrdOrd); vEPrcsDetailVO.setLctrDivCd("50"); //강의구분코드 VE0011 10-청소년강의, 20-성인강의, 30-체험, 50-기반강화, 60-조건부 + vEPrcsDetailVO.setLastUpdusrId(loginVO.getUniqId()); //강의구분코드 VE0011 10-청소년강의, 20-성인강의, 30-체험, 50-기반강화, 60-조건부 //vEPrcsDetailVO.setUseYn("Y"); vEPrcsDetailVO.setFrstRegisterId(loginVO.getUniqId()); //esntl_id @@ -491,6 +569,134 @@ public class FndthPrcsAplctPrdMngController { } + + + + /** + * 1.기반강화 강사배치 팝업 function + */ + @RequestMapping("/kccadr/oprtn/fndthEnhanceTrn/popup/fndthInstrAsgnmPopup.do") + public String fndthInstrAsgnmPopup( +// @ModelAttribute("vEInstrDetailVO") VEInstrDetailVO vEInstrDetailVO + @ModelAttribute("vEPrcsDetailVO") VEPrcsDetailVO vEPrcsDetailVO + + , ModelMap model + , RedirectAttributes redirectAttributes + , HttpSession session + , HttpServletRequest request + ) throws Exception { + + + + System.out.println("vEPrcsDetailVO.getPrcsAplctPrdOrd() :"+ vEPrcsDetailVO.getPrcsAplctPrdOrd()); + + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 + + //로그인 처리==================================== + + + //1.pageing step1 + PaginationInfo paginationInfo = this.setPagingStep1(vEPrcsDetailVO); + + + //2. pageing step2 + vEPrcsDetailVO = this.setPagingStep2(vEPrcsDetailVO, paginationInfo); + + //3. SelectPagingListQuery set 할 조건 설정 + String selectCondition = new String(); + //3.1 제출 완료 후 사용중인 데이터 조회 + selectCondition += "AND a.sbmt_yn='Y' AND a.use_yn = 'Y'"; + //3.2 강사 테이블 성인강사여부 Y인것만 조회 + selectCondition += "AND (b.adult_instr_yn ='Y' OR a.qlfct_end_yn = 'Y') "; + //3.3 이름 검색 시 + if(StringUtil.isNotEmpty(vEPrcsDetailVO.getSearchKeyword())){ + //selectCondition += "AND a.instr_nm LIKE CONCAT ('%', '" +vEInstrDetailVO.getSearchKeyword() + "', '%')"; + //이름 암호화 - comDefaultVO 검색단어 공통 암호화 + ComDefaultVO comDefaultVO = new ComDefaultVO(); + comDefaultVO.setSearchKeyword(vEPrcsDetailVO.getSearchKeyword()); + comDefaultVO = egovCryptoUtil.encryptComDefaultVO(comDefaultVO); + vEPrcsDetailVO.setSearchKeyword(comDefaultVO.getSearchKeyword()); + selectCondition += "AND a.instr_nm LIKE CONCAT ('%', '" +vEPrcsDetailVO.getSearchKeyword() + "', '%')"; + comDefaultVO = egovCryptoUtil.decryptComDefaultVO(comDefaultVO); + vEPrcsDetailVO.setSearchKeyword(comDefaultVO.getSearchKeyword()); + } + //3.4 요청일 시작일 검색 시 +// if(StringUtil.isNotEmpty(vEPrcsDetailVO.getSearchStartDt())){ +// selectCondition += "AND TO_CHAR(a.sbmt_pnttm, 'YYYYMMDD') >= REPLACE('"+vEPrcsDetailVO.getSearchStartDt()+"', '.', '')"; +// } + //3.5 요청일 종료일 검색 시 +// if(StringUtil.isNotEmpty(vEPrcsDetailVO.getSearchEndDt())){ +// selectCondition += "AND TO_CHAR(a.sbmt_pnttm, 'YYYYMMDD') <= REPLACE('"+vEPrcsDetailVO.getSearchEndDt()+"', '.', '')"; +// } + vEPrcsDetailVO.setInstrDiv("20"); + vEPrcsDetailVO.setSelectPagingListQuery(selectCondition); + + List vEInstrDetailVOList = vEPrcsAplctPrdService.selectinstrAsgnmPopupPagingList(vEPrcsDetailVO); + + try { + + vEInstrDetailVOList = egovCryptoUtil.decryptVEInstrDetailVOList(vEInstrDetailVOList); + } catch (Exception e) { + e.printStackTrace(); + // TODO: handle exception + } + + //4.pageing step3 + paginationInfo = this.setInstrPagingStep3(vEInstrDetailVOList, paginationInfo); + System.out.println(" ==== vEPrcsDetailVO.getPrcsAplctPrdOrd() :"+ vEPrcsDetailVO.getPrcsAplctPrdOrd()); + model.addAttribute("vEPrcsDetailVO", vEPrcsDetailVO); + model.addAttribute("paginationInfo", paginationInfo); + + //대상 리스트, 페이징 정보 전달 + model.addAttribute("list", vEInstrDetailVOList); + + return "/oprtn/fndthEnhanceTrn/popup/fndthInstrAsgnmPopup"; + } + + /** + * 강사배정 등록 처리 + */ + @RequestMapping("/kccadr/oprtn/fndthEnhanceTrn/fndthInstrAsgnmAjax.do") + public ModelAndView instrAsgnmAjaxinstrAsgnmAjax( + @ModelAttribute("vEAPrcsAplctPrdInstrAsgnmVO") VEAPrcsAplctPrdInstrAsgnmVO vEAPrcsAplctPrdInstrAsgnmVO + , 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(); //권한에 따른 로그인 정보 가져오기 + + try { + //선택한 강사 데이터 등록 처리 + vEAPrcsAplctPrdInstrAsgnmVO.setFrstRegisterId(loginVO.getUniqId()); //esntl_id + vEAPrcsAplctPrdInstrAsgnmService.instrInsert(vEAPrcsAplctPrdInstrAsgnmVO); + + + + } catch (Exception ex) { + ex.printStackTrace(); + } + + modelAndView.addObject("result", "success"); + + return modelAndView; + + } + + ////////////////////////////////////////////////////////////////////////////////////////////////////////////// // // @@ -510,7 +716,6 @@ public class FndthPrcsAplctPrdMngController { return paginationInfo; } - //페이징을 위한 처리 step2 - 게시물 리스트 수량 설정 및 검색 조건 초기화 private VEPrcsDetailVO setPagingStep2( @@ -544,4 +749,21 @@ public class FndthPrcsAplctPrdMngController { return p_paginationInfo; } + + + + + //페이징을 위한 처리 step3 - 전체 게시물 수량 설정하기 + private PaginationInfo setInstrPagingStep3( + List p_vEInstrDetailVOList + , PaginationInfo p_paginationInfo + )throws Exception{ + // pageing step3 + int totCnt = 0; + if(p_vEInstrDetailVOList.size() > 0) totCnt = p_vEInstrDetailVOList.get(0).getTotCnt(); + p_paginationInfo.setTotalRecordCount(totCnt); + + return p_paginationInfo; + } + } diff --git a/src/main/resources/egovframework/spring/com/context-idgen.xml b/src/main/resources/egovframework/spring/com/context-idgen.xml index 79f65f11..98a9bd13 100644 --- a/src/main/resources/egovframework/spring/com/context-idgen.xml +++ b/src/main/resources/egovframework/spring/com/context-idgen.xml @@ -2873,5 +2873,22 @@ - + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/egovframework/sqlmap/config/mysql/sql-map-config-cubrid-ve.xml b/src/main/resources/egovframework/sqlmap/config/mysql/sql-map-config-cubrid-ve.xml index 1d6376e5..323c0014 100644 --- a/src/main/resources/egovframework/sqlmap/config/mysql/sql-map-config-cubrid-ve.xml +++ b/src/main/resources/egovframework/sqlmap/config/mysql/sql-map-config-cubrid-ve.xml @@ -32,6 +32,7 @@ + @@ -111,4 +112,10 @@ + + + + + + \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Cubrid.xml b/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Cubrid.xml new file mode 100644 index 00000000..5a96a560 --- /dev/null +++ b/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Cubrid.xml @@ -0,0 +1,100 @@ + + + + + + + + + + + vea_sspn_idmt_trgt + + + + + sspn_idtmt_trgt_ord + , user_id + , trgt_state_cd + , frst_regist_pnttm + , frst_register_id + , last_updt_pnttm + , last_updusr_id + , trgt_nm + , clphone + , d_birth + , addr + , addr_detail + , email + + + + + + a.sspn_idtmt_trgt_ord AS sspnIdtmtTrgtOrd + , a.user_id AS userId + , a.trgt_state_cd AS trgtStateCd + , a.frst_regist_pnttm AS frstRegistPnttm + , a.frst_register_id AS frstRegisterId + , a.last_updt_pnttm AS lastUpdtPnttm + , a.last_updusr_id AS lastUpdusrId + , a.trgt_nm AS trgtNm + , a.clphone AS clphone + , a.d_birth AS dBirth + , a.addr AS addr + , a.addr_detail AS addrDetail + , a.email AS email + + + + + + + + + + + INSERT INTO ( + + )VALUES( + #sspnIdtmtTrgtOrd# + ,#userId# + ,#trgtStateCd# + ,now() + ,#frstRegisterId# + ,#lastUpdtPnttm# + ,#lastUpdusrId# + ,#trgtNm# + ,#clphone# + ,#dBirth# + ,#addr# + ,#addrDetail# + ,#email# + ) + + + + + + diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEAPrcsAplctPrdInstrAsgnm_SQL_Cubrid.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEAPrcsAplctPrdInstrAsgnm_SQL_Cubrid.xml new file mode 100644 index 00000000..38cb9da3 --- /dev/null +++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEAPrcsAplctPrdInstrAsgnm_SQL_Cubrid.xml @@ -0,0 +1,91 @@ + + + + + + + + + + + vea_prcs_aplct_prd_instr_asgnm a + + + + + + prcs_aplct_prd_ord + , user_id + , lctr_plan_atch_file_id + , doc_atch_file_id + , asgnm_aprvl_cd + , asgnm_aprvl_pnttm + , asgnm_aprvl_id + , rmrks + , frst_regist_pnttm + , frst_register_id + , last_updt_pnttm + , last_updusr_id + + + + + + a.prcs_aplct_prd_ord as prcsAplctPrdOrd + , a.user_id as userId + , a.lctr_plan_atch_file_id as lctrPlanAtchFileId + , a.doc_atch_file_id as docAtchFileId + , a.asgnm_aprvl_cd as asgnmAprvlCd + , a.asgnm_aprvl_pnttm as asgnmAprvlPnttm + , a.asgnm_aprvl_id as asgnmAprvlId + , a.rmrks as rmrks + , a.frst_regist_pnttm as frstRegistPnttm + , a.frst_register_id as frstRegisterId + , a.last_updt_pnttm as lastUpdtPnttm + , a.last_updusr_id as lastUpdusrId + + + + + + INSERT INTO ( + + )VALUES( + #prcsAplctPrdOrd# + , #userId# + , #lctrPlanAtchFileId# + , #docAtchFileId# + , #asgnmAprvlCd# + , NOW() + , #asgnmAprvlId# + , #rmrks# + , NOW() + , #frstRegisterId# + , NOW() + , #lastUpdusrId# + ) + + + + + + + + + + diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Cubrid.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Cubrid.xml index 6a37621a..8c68621e 100644 --- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Cubrid.xml +++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Cubrid.xml @@ -3,7 +3,8 @@ - + + @@ -37,6 +38,7 @@ ,ddln_cd ,edu_strt_pnttm ,edu_ddln_pnttm + ,edu_place @@ -62,7 +64,7 @@ ,a.dead_line_dt AS deadLineDt ,a.prcs_ord AS prcsOrd ,a.edu_part_cd AS eduPartCd - ,a.nos AS nos + ,NVL(a.nos, 0) AS nos ,a.ddln_cd AS ddlnCd ,a.edu_strt_pnttm AS eduStrtPnttm ,a.edu_ddln_pnttm AS eduDdlnPnttm @@ -100,6 +102,7 @@ ,#ddlnCd# ,#eduStrtPnttm# ,#eduDdlnPnttm# + ,#eduPlace# ) @@ -169,6 +172,9 @@ , edu_ddln_pnttm = #eduDdlnPnttm# + + , edu_place = #eduPlace# + WHERE prcs_aplct_prd_ord = #prcsAplctPrdOrd# @@ -281,6 +287,7 @@ , (SELECT user_nm FROM comvnusermaster WHERE esntl_id = a.frst_register_id) as frstRegisterNm , (SELECT orignl_file_nm FROM lettnfiledetail WHERE atch_file_id = a.atch_file_id LIMIT 1) as atchFileNm , b.prcs_nm as prcsNm + ,b.prcs_div as prcsDiv , (SELECT COUNT(*) FROM ve_edu_aplct x @@ -300,6 +307,10 @@ AND a.prcs_ord=b.prcs_ord + + AND b.prcs_div = #searchStatus# + + $selectPagingListQuery$ @@ -317,6 +328,16 @@ + + + /*등록일시*/ + AND replace(to_char(a.strt_pnttm, 'YYYYMMDD'), '.' , '') = ]]> REPLACE(#searchSmbtStartDt#, '.' , '') + + + + /*등록일시*/ + AND replace(to_char(a.strt_pnttm, 'YYYYMMDD'), '.' , '') REPLACE(#searchSmbtEndDt#, '.' , '') + ORDER BY 1=1 @@ -366,6 +387,99 @@ LIMIT 1 + + +
+
+ + +
+

교육 과정 등록

+
    +
    • +
  • +

    교육콘텐츠

    +
    • +
  • 교육 과정 관리
    • +
  • 교육 과정 등록
    • +
+
+ + +
+ +
+

교육과정관리

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
구분 + +
종류 + checked="checked"> + + checked="checked"> + + checked="checked"> + + <%-- 12 +
+ 34 +
+ 56 +
+ 78 --%> +
과정명 + +
세부과정 + +
+ ${status.count}. +
+ +
+
+ +
표시순서 + +
+
+ + + +
+
+
+
+
+
+ + +
+
+
+
+
+ + + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp new file mode 100644 index 00000000..8009cd05 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp @@ -0,0 +1,319 @@ + +<%@ 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"%> +<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> + +<% + /** + * @Class Name : cndtnEduPrcsMngList.jsp + * @Description : 조건부 기소유예 과정관리 목록 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2021.12.14 조용준 최초 생성 + * @author 조용준 + * @since 2021.12.14 + * @version 1.0 + * @see + * + */ +%> + + + + + + 교육과정관리 + + + + + " /> + " /> + + + +
+
+ + +
+

과정관리목록

+
    +
    • +
  • +

    조건부기소유예관리

    +
    • +
  • 과정관리목록
    • +
+
+ + +
+
+

교육 과정 관리

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

건의 접수가 검색되었습니다.

+
+ + <%----%> +
+
+ + + +
+ + + + + + + + + + + + + + + + +<%-- + + + + + + + + +
성명생년월일등록일
');" style="cursor:pointer;"> --%> +<%-- --%> + + + + + + + +
+
+ + + + <%--
+ +
--%> +
+
+
+
+
+
+ +
+
+ +
+
+
+ + + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMdfy.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMdfy.jsp new file mode 100644 index 00000000..8b104398 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMdfy.jsp @@ -0,0 +1,242 @@ + +<%@ 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="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> +<% + /** + * @Class Name : cndtnEduPrcsMngMdfy.jsp + * @Description : 조건부기소유예 수정 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2021.12.16 조용준 최초 생성 + * @author 조용주 + * @since 2021.12.16 + * @version 1.0 + * @see + * + */ +%> + + +교육과정관리 + + + + + + + + + + +
+
+ + +
+

교육 과정 등록

+
    +
    • +
  • +

    교육콘텐츠

    +
    • +
  • 교육 과정 관리
    • +
  • 교육 과정 등록
    • +
+
+ + +
+ +
+

교육과정관리

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
구분 + +
종류 + + checked="checked"> + + checked="checked"> + + checked="checked"> + +
과정명 + + +
세부과정 + +
+ ${status.count}. +
+ + +
+
+ +
표시순서 + +
+
+ + + +
+
+
+
+
+
+ + +
+
+
+
+
+ + + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtReg.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtReg.jsp new file mode 100644 index 00000000..52523458 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtReg.jsp @@ -0,0 +1,231 @@ + +<%@ 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="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> +<% + /** + * @Class Name : cndtnEduPrcsMngReg.jsp + * @Description : 조건부기소유예 과정 등록 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2021.12.16 조용준 최초 생성 + * @author 조용주 + * @since 2021.12.16 + * @version 1.0 + * @see + * + */ +%> + + +교육과정관리 + + + + + + + + + +
+
+ + +
+

교육 과정 등록

+
    +
    • +
  • +

    교육콘텐츠

    +
    • +
  • 교육 과정 관리
    • +
  • 교육 과정 등록
    • +
+
+ + +
+ +
+

교육과정관리

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
성명 + +
연락처(핸드폰) + + +
생년월일 + +
+

주소

+ 		+ + + +
+ + + + +
+
+
+ + + +
+
+
+
+
+
+ + +
+
+
+
+
+ + + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngDetail.jsp index 7fd75574..efa6937d 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngDetail.jsp @@ -31,24 +31,74 @@ +
+ + + + +
@@ -83,6 +133,12 @@ + + 교육부분 + + + + 과정 @@ -90,19 +146,18 @@ - - 교육부분코드 - - - - - 신청기간 ~ + + 교육장소 + + + + 교육기간 @@ -118,19 +173,19 @@ 상태 - - + + - - -

공개여부(사용여부)

- - - 예 - 아니오 - - + <%-- + +

공개여부(사용여부)

+ + + 예 + 아니오 + + --%> @@ -148,7 +203,69 @@ - + +
+

강사 배치 정보

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
강사명연락처확정여부
+ + + + + +
강사 배치 정보가 없습니다.
+
+ + +
+
+
+
+
+
+ +
+
+ +

교육신청자

@@ -166,35 +283,56 @@ 번호 신청자 - 제출일시 - + 신청일 + 확정여부 + 이수여부 신청상태 + 이수증 - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + 설문조사 + + + 출력 + + + 출력 + + + + + + + 신청자가 없습니다. + + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngList.jsp index 338bfaa7..f07c1925 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngList.jsp @@ -9,6 +9,7 @@ <%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> <%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> <% /** @@ -36,6 +37,37 @@ --%> + + + 강사배치 팝업 + + + + +
+
+ + + + + + + + + + + " /> + " /> + " /> + " /> + " /> + + +
+
+ +
+
+
+

강사검색

+
+ +
+ + +
+
+
+
+

강사 목록

(*선호분야 일치여부, 적은 할당시수 순입니다.) +
+ +
+ + + + +<%-- --%> + + + + <%-- --%> + + + + + + + + + + + + + + + + + + + +<%-- --%> + + + + + <%-- --%> + + + + + + + + +
이름거주
지역		선호분야온라인구분선택
Km + + + + + + + + + + - + + + + + + + + + +
+
+ +
+ +
+ + +
+
+
+
+ +
+
+
+
+
+
+ + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/popup/fndthInstrAsgnmPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/popup/fndthInstrAsgnmPopup.jsp new file mode 100644 index 00000000..03d699e5 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/popup/fndthInstrAsgnmPopup.jsp @@ -0,0 +1,207 @@ + +<%@ 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="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<% + /** + * @Class Name : instrAsgnmPopup.jsp + * @Description : 강사배치 팝업 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2021.08.09 김봉호 최초 생성 + * @author 안주영 + * @since 2022.1.8 + * @version 1.0 + * @see + * + */ +%> + + + + +<%-- --%> + + + 강사배치 팝업 + + + + +
+
+ + + + + + + " /> + + + + + + + +
+
+ +
+
+
+

강사검색

+
+<%-- +<%-- selectedText="${vEEduAplctVO.rsdne}" defaultValue='' --%> +<%-- defaultText='전체' --%> +<%-- /> --%> +
+ + +
+
+
+
+

강사 목록

(*선호분야 일치여부, 적은 할당시수 순입니다.) +
+ +
+ + + + + <%-- --%> + + + + <%-- --%> + + + + + + + + + + + + + + + + + + + + <%-- --%> + + + + + + + + + + + + +
이름거주
지역		선호분야온라인구분선택
Km + + + +
+
+ +
+ +
+ + +
+
+
+
+ +
+
+
+
+
+
+ + + +
+
+ + +