From 76cc5712042f938d2107f4fd20d19771383a2e9a Mon Sep 17 00:00:00 2001 From: hylee Date: Mon, 18 Sep 2023 11:54:12 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=20=EA=B8=B0?= =?UTF-8?q?=EB=B0=98=EA=B0=95=ED=99=94=20=EC=A7=84=ED=96=89=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/FndtnEnhanceTrnService.java | 13 + .../service/impl/FndtnEnhanceTrnDAO.java | 60 +++ .../impl/FndtnEnhanceTrnServiceImpl.java | 51 +++ .../web/FndtnEnhanceTrnController.java | 393 ++++++++++++++++++ .../eduInfo/service/VEEduAplctVO.java | 9 + .../eduInfo/service/impl/VEEduAplctDAO.java | 9 + .../prcsInfo/service/VEPrcsDetailVO.java | 10 + .../sqlmap/ve/edu/VEEduAplct_SQL_Cubrid.xml | 48 +++ .../aplct/fndtnEnhanceTrn/eduAplctDetail.jsp | 221 ++++++++++ .../ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp | 254 +++++++++++ .../jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp | 270 ++++++++++++ 11 files changed, 1338 insertions(+) create mode 100644 src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/service/FndtnEnhanceTrnService.java create mode 100644 src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/service/impl/FndtnEnhanceTrnDAO.java create mode 100644 src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/service/impl/FndtnEnhanceTrnServiceImpl.java create mode 100644 src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java create mode 100644 src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctDetail.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp diff --git a/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/service/FndtnEnhanceTrnService.java b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/service/FndtnEnhanceTrnService.java new file mode 100644 index 00000000..305e1998 --- /dev/null +++ b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/service/FndtnEnhanceTrnService.java @@ -0,0 +1,13 @@ +package kcc.ve.aplct.fndtnEnhanceTrn.service; + + +import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; + +public interface FndtnEnhanceTrnService { + + void insertVeEduAplct(VEEduAplctVO paramVO); + + VEEduAplctVO findByAprvlCd(VEEduAplctVO vEEduAplctReqVO); + + +} diff --git a/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/service/impl/FndtnEnhanceTrnDAO.java b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/service/impl/FndtnEnhanceTrnDAO.java new file mode 100644 index 00000000..cdbe1845 --- /dev/null +++ b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/service/impl/FndtnEnhanceTrnDAO.java @@ -0,0 +1,60 @@ +package kcc.ve.aplct.fndtnEnhanceTrn.service.impl; + +import java.util.List; + +import org.springframework.stereotype.Repository; + +import egovframework.rte.psl.dataaccess.EgovAbstractDAO; +import kcc.ve.aplct.cpyrgExprnClsrm.exprnClsrmAplct.service.ScholInfoVO; + +@Repository("fndtnEnhanceTrnDAO") +public class FndtnEnhanceTrnDAO extends EgovAbstractDAO { + + public void insertIsltn(ScholInfoVO paramVO) throws Exception { + insert("ScholInfoDAO.insertIsltn", paramVO); + } + + /** + * L - Page + * @param scholInfoVO + * @return + * @throws Exception + */ + public List selectPagingList(ScholInfoVO paramVO) throws Exception { + @SuppressWarnings("unchecked") + List list = (List) list("ScholInfoDAO.selectPagingList", paramVO); + return list; + } + + public ScholInfoVO selectDetail(ScholInfoVO paramVO) throws Exception { + return (ScholInfoVO) select("ScholInfoDAO.selectDetail", paramVO); + } + + public ScholInfoVO selectDetailWithQuery(ScholInfoVO paramVO) throws Exception { + return (ScholInfoVO) select("ScholInfoDAO.selectDetailWithQuery", paramVO); + } + + public ScholInfoVO select(ScholInfoVO paramVO) throws Exception { + return (ScholInfoVO) select("ScholInfoDAO.select", paramVO); + } + + public ScholInfoVO selectScholId(ScholInfoVO paramVO) throws Exception { + return (ScholInfoVO) select("ScholInfoDAO.selectScholId", paramVO); + } + + public void insert(ScholInfoVO paramVO) throws Exception{ + insert("ScholInfoDAO.insert" , paramVO); + } + + public int update(ScholInfoVO paramVO)throws Exception{ + return update("ScholInfoDAO.update", paramVO); + } + + public void deleteIsltn(ScholInfoVO paramVO) throws Exception { + insert("ScholInfoDAO.deleteIsltn", paramVO); + } + + public int insertSelectIsltn(ScholInfoVO scholInfoVO) throws Exception { + return update("ScholInfoDAO.insertSelectIsltn", scholInfoVO); + } +} diff --git a/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/service/impl/FndtnEnhanceTrnServiceImpl.java b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/service/impl/FndtnEnhanceTrnServiceImpl.java new file mode 100644 index 00000000..079e729d --- /dev/null +++ b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/service/impl/FndtnEnhanceTrnServiceImpl.java @@ -0,0 +1,51 @@ +package kcc.ve.aplct.fndtnEnhanceTrn.service.impl; + +import java.util.List; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; + +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; + +import egovframework.rte.fdl.idgnr.EgovIdGnrService; +import kcc.com.cmm.LoginVO; +import kcc.com.cmm.service.EgovFileMngService; +import kcc.com.cmm.service.FileVO; +import kcc.com.utl.user.service.CheckFileUtil; +import kcc.com.utl.user.service.CheckLoginUtil; +import kcc.let.utl.fcc.service.EgovCryptoUtil; +import kcc.ve.aplct.fndtnEnhanceTrn.service.FndtnEnhanceTrnService; +import kcc.ve.cmm.VeConstants; +import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctOnlnService; +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.eduInfo.service.impl.VEEduAplctDAO; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsMIXService; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsOnlnCntntService; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsService; + +@Service("fndtnEnhanceTrnService") +public class FndtnEnhanceTrnServiceImpl implements FndtnEnhanceTrnService { + + + //과정 + @Resource(name="vEEduAplctDAO") + private VEEduAplctDAO vEEduAplctDAO; + + @Override + public void insertVeEduAplct(VEEduAplctVO paramVO) { + //C + vEEduAplctDAO.insertVeEduAplct(paramVO); + } + + @Override + public VEEduAplctVO findByAprvlCd(VEEduAplctVO vEEduAplctReqVO) { + return vEEduAplctDAO.findByAprvlCd(vEEduAplctReqVO); + } +} diff --git a/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java new file mode 100644 index 00000000..5d5388ee --- /dev/null +++ b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java @@ -0,0 +1,393 @@ +package kcc.ve.aplct.fndtnEnhanceTrn.web; + +import java.util.List; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; + +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +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 org.springframework.web.servlet.ModelAndView; + +import egovframework.rte.fdl.idgnr.EgovIdGnrService; +import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; +import kcc.com.cmm.LoginVO; +import kcc.com.cmm.service.EgovFileMngService; +import kcc.com.cmm.service.impl.CmmUseDAO; +import kcc.com.cmm.util.StringUtil; +import kcc.com.utl.user.service.CheckFileUtil; +import kcc.com.utl.user.service.CheckLoginUtil; +import kcc.let.uat.uia.service.SsoLoginVO; +import kcc.let.utl.fcc.service.EgovCryptoUtil; +import kcc.ve.aplct.adultVisitEdu.eduAplct.service.EduAplctAdultService; +import kcc.ve.aplct.fndtnEnhanceTrn.service.FndtnEnhanceTrnService; +import kcc.ve.cmm.VeConstants; +import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctOnlnService; +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.VEEduMIXService; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsAplctPrdService; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsMIXService; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsOnlnCntntService; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsService; + +/** + * 교육신청(성인찾아가는교육) + * 교육신청에 관한 controller 클래스를 정의한다. + * @author 조용준 + * @since 2021.12.16 + * @version 1.0 + * @see + * + * 
+ * << 개정이력(Modification Information) >>
+ *
+ *   수정일      수정자           수정내용
+ *  -------    --------    ---------------------------
+ *   2021.12.16  조용준          최초 생성
+ *
+ *
+ */ + +@Controller +//@RequestMapping("/web/ve/aplct/fndtnEnhanceTrn") +public class FndtnEnhanceTrnController { + + private static final Logger LOGGER = LoggerFactory.getLogger(FndtnEnhanceTrnController.class); + + //암복호화 유틸 + @Resource(name = "egovCryptoUtil") + EgovCryptoUtil egovCryptoUtil; + + //파일 체크 util + @Resource(name = "checkFileUtil") + private CheckFileUtil checkFileUtil; + + //로그인 체크 util + @Resource(name = "checkLoginUtil") + private CheckLoginUtil checkLoginUtil; + + //파일정보의 관리 + @Resource(name = "EgovFileMngService") + private EgovFileMngService fileService; + + + //과정 관리 + @Resource(name = "vEPrcsService") + private VEPrcsService vEPrcsService; + + //온라인콘텐츠과정 관리 + @Resource(name = "vEPrcsOnlnCntntService") + private VEPrcsOnlnCntntService vEPrcsOnlnCntntService; + + //교육신청 + @Resource(name = "vEEduAplctService") + private VEEduAplctService vEEduAplctService; + + //차시 + @Resource(name = "vEEduChasiService") + private VEEduChasiService vVEEduChasiService; + + //교육과정신청 + @Resource(name = "vEEduMIXService") + private VEEduMIXService vEEduMIXService; + + //교육과정신청 + @Resource(name = "vEPrcsMIXService") + private VEPrcsMIXService vEPrcsMIXService; + + + //과정차시 관리 + @Resource(name = "vEPrcsAplctPrdService") + private VEPrcsAplctPrdService vEPrcsAplctPrdService; + + + + //교육과정순번 + @Resource(name="prcsGnrService") + private EgovIdGnrService prcsGnrService; + + //과정온라인콘텐츠순번 + @Resource(name="prcsOnlnGnrService") + private EgovIdGnrService prcsOnlnGnrService; + + //교육신청순번 + @Resource(name="eduAplctGnrService") + private EgovIdGnrService eduAplctGnrService; + + //교육차시순번 + @Resource(name="eduChasiGnrService") + private EgovIdGnrService eduChasiGnrService; + + //교육신청온라인 + @Resource(name = "vEEduAplctOnlnService") + private VEEduAplctOnlnService vEEduAplctOnlnService; + + @Resource(name = "eduAplctAdultService") + private EduAplctAdultService eduAplctAdultService; + + //코드 + @Resource(name="cmmUseDAO") + private CmmUseDAO cmmUseDAO; + + + //온라인콘텐츠과정 관리 + @Resource(name = "fndtnEnhanceTrnService") + private FndtnEnhanceTrnService fndtnEnhanceTrnService; + + + /** + * 교육신청 목록 화면 + */ + @RequestMapping("/web/ve/aplct/fndtnEnhanceTrn/main.do") + public String main( @ModelAttribute("vEEduAplctVO") VEEduAplctVO vEEduAplctVO , ModelMap model , HttpServletRequest request ) throws Exception { + //로그인 처리==================================== +/* LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 + + if (loginVO == null || ssoLoginVO == null) { + //이전 url 처리(beforeSiteUrl)_이준호_220228추가 + return checkLoginUtil.getUserLoginPage(model, request); //로그인 정보가 없으면 로그인 페이지로 이동한다. + } + vEEduAplctVO.setUserId(loginVO.getUniqId()); + // 성인 + vEEduAplctVO.setLctrDivCd(VeConstants.LCTR_DIV_CD_20); + vEEduAplctVO.setInstrDiv("20"); + //1.pageing step1 + PaginationInfo paginationInfo = this.setPagingStep1(vEEduAplctVO); + //2. pageing step2 + vEEduAplctVO = this.setPagingStep2(vEEduAplctVO, paginationInfo); + List vEEduAplctVOList = vEEduMIXService.selectPagingList(vEEduAplctVO); + //3.pageing step3 + paginationInfo = this.setPagingStep3(vEEduAplctVOList, paginationInfo); + model.addAttribute("paginationInfo", paginationInfo); + //대상 리스트, 페이징 정보 전달 + model.addAttribute("list", vEEduAplctVOList);*/ + + return "/web/ve/aplct/fndtnEnhanceTrn/main"; + } + /** + * 교육신청 목록 화면 + */ + @RequestMapping("/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.do") + public String eduAplctList( + @ModelAttribute("vEPrcsDetailVO") VEPrcsDetailVO vEPrcsDetailVO + , ModelMap model + , HttpServletRequest request ) throws Exception { + //로그인 처리==================================== + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 + + if (loginVO == null || ssoLoginVO == null) { + //이전 url 처리(beforeSiteUrl)_이준호_220228추가 + return checkLoginUtil.getUserLoginPage(model, request); //로그인 정보가 없으면 로그인 페이지로 이동한다. + } + //1.pageing step1 + PaginationInfo paginationInfo = this.setPagingStep1(vEPrcsDetailVO); + + + //로그인 처리==================================== + + //1.pageing step1 + + //임시로 페이징 처리를 안하기 위해서 RecordCountPerPage 수를 10000 으로 셋팅함 + //paginationInfo.setRecordCountPerPage(10000); + + //2. pageing step2 + vEPrcsDetailVO = this.setPagingStep2(vEPrcsDetailVO, paginationInfo); + + //기반강화 조회 + vEPrcsDetailVO.setLctrDivCd(VeConstants.LCTR_DIV_CD_50); //강의구분코드 VE0011 10-청소년강의, 20-성인강의, 30-체험, 50-기반강화, 60-조건부 + + if(StringUtil.isNotEmpty(vEPrcsDetailVO.getSearchKeyword())){ + String selectCondition = "AND b.PRCS_NM LIKE CONCAT ('%', '" +vEPrcsDetailVO.getSearchKeyword() + "', '%')"; + vEPrcsDetailVO.setSelectPagingListQuery(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 = vEPrcsAplctPrdService.selectPagingList4Fndth(vEPrcsDetailVO); + + + // 리스트 row마다 신청 확인하기 + vEPrcsDetailVOList.stream().forEach(t->{ + VEEduAplctVO vEEduAplctReqVO = new VEEduAplctVO(); + vEEduAplctReqVO.setUserId(loginVO.getUniqId()); + vEEduAplctReqVO.setLctrDivCd(t.getLctrDivCd()); + vEEduAplctReqVO.setPrcsAplctPrdOrd(t.getPrcsAplctPrdOrd()); + VEEduAplctVO vEEduAplctVO = fndtnEnhanceTrnService.findByAprvlCd(vEEduAplctReqVO); + // VO를 먼저 null 체크 후 진행해야 에러안남 + // vEEduAplctVO != null && + if(vEEduAplctVO != null && StringUtils.isNotEmpty(vEEduAplctVO.getAprvlCd())) { + t.setAprvlCd(vEEduAplctVO.getAprvlCd()); + } + }); + + //대상 리스트, 페이징 정보 전달 + model.addAttribute("list", vEPrcsDetailVOList); + + //3.pageing step3 + paginationInfo = this.setPagingStep3(vEPrcsDetailVOList, paginationInfo); + + + model.addAttribute("paginationInfo", paginationInfo); + + + + + return "/web/ve/aplct/fndtnEnhanceTrn/eduAplctList"; + } + /** + * 교육상세 + */ + @RequestMapping("/web/ve/aplct/fndtnEnhanceTrn/eduAplctDetail.do") + public String eduAplctDetail( + @ModelAttribute("vEPrcsDetailVO") VEPrcsDetailVO vEPrcsDetailVO + , ModelMap model + , HttpServletRequest request ) throws Exception { + //로그인 처리==================================== + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 + + if (loginVO == null || ssoLoginVO == null) { + //이전 url 처리(beforeSiteUrl)_이준호_220228추가 + return checkLoginUtil.getUserLoginPage(model, request); //로그인 정보가 없으면 로그인 페이지로 이동한다. + } + //1.pageing step1 + //과정 조회 + VEPrcsDetailVO vEPrcsDetailVODetail = vEPrcsAplctPrdService.selectDetailNewOne4Fndth(vEPrcsDetailVO); + + model.addAttribute("info", vEPrcsDetailVODetail); + + + return "/web/ve/aplct/fndtnEnhanceTrn/eduAplctDetail"; + } + + + /** + * 기반강화연수과정 신청기간 등록 + */ + @RequestMapping("/web/ve/aplct/fndtnEnhanceTrn/eduRegAjax.do") + public ModelAndView fndthEduPrcsAplctPrdMngRegAjax( + @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; + } + + //로그인 처리==================================== + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 + + + vEPrcsDetailVO.setFrstRegisterId(loginVO.getUniqId()); //esntl_id + vEPrcsDetailVO.setLctrDivCd("50"); //강의구분코드 VE0011 10-청소년강의, 20-성인강의, 30-체험, 50-기반강화, 60-조건부 + + + VEEduAplctVO vEEduAplctVO = new VEEduAplctVO(); + + vEEduAplctVO.setEduAplctOrd(eduAplctGnrService.getNextStringId()); + + vEEduAplctVO.setLctrDivCd("50"); // 기반강화 + vEEduAplctVO.setAprvlCd("10"); // 승인코드 VE0003 10 - 요청, 20 - 승인, 30 - 반려 +// sbmt_pnttm 제출일시 + vEEduAplctVO.setSbmtYn("Y"); // 제출여부 + vEEduAplctVO.setFrstRegisterId(loginVO.getUniqId()); +// frst_regist_pnttm + vEEduAplctVO.setUserId(loginVO.getUniqId()); + vEEduAplctVO.setPrcsOrd(vEPrcsDetailVO.getPrcsAplctPrdOrd()); + + fndtnEnhanceTrnService.insertVeEduAplct(vEEduAplctVO); + + + modelAndView.addObject("result", "success"); + + return modelAndView; + + } + + + + + ////////////////////////////////////////////////////////////////////////////////////////////////////////////// + // + // + // private function + // + // + + //페이징을 위한 처리 step1 - 페이징 기본 정보 설정 + private PaginationInfo setPagingStep1( + VEPrcsDetailVO p_vEPrcsDetailVO + )throws Exception{ + // pageing step1 + PaginationInfo paginationInfo = new PaginationInfo(); + paginationInfo.setCurrentPageNo(p_vEPrcsDetailVO.getPageIndex()); + paginationInfo.setRecordCountPerPage(p_vEPrcsDetailVO.getPageUnit()); + paginationInfo.setPageSize(p_vEPrcsDetailVO.getPageSize()); + + return paginationInfo; + } + + + //페이징을 위한 처리 step2 - 게시물 리스트 수량 설정 및 검색 조건 초기화 + private VEPrcsDetailVO setPagingStep2( + VEPrcsDetailVO p_vEPrcsDetailVO + , PaginationInfo p_paginationInfo + )throws Exception{ + // pageing step2 + p_vEPrcsDetailVO.setFirstIndex(p_paginationInfo.getFirstRecordIndex()); + p_vEPrcsDetailVO.setLastIndex(p_paginationInfo.getLastRecordIndex()); + p_vEPrcsDetailVO.setRecordCountPerPage(p_paginationInfo.getRecordCountPerPage()); + + if("".equals(p_vEPrcsDetailVO.getSearchSortCnd())){ //최초조회시 최신것 조회List + p_vEPrcsDetailVO.setSearchSortCnd("prcs_ord"); + p_vEPrcsDetailVO.setSearchSortOrd("desc"); + } + + return p_vEPrcsDetailVO; + } + + + //페이징을 위한 처리 step3 - 전체 게시물 수량 설정하기 + private PaginationInfo setPagingStep3( + List p_vEPrcsDetailVOList + + , PaginationInfo p_paginationInfo + )throws Exception{ + // pageing step3 + int totCnt = 0; + if(p_vEPrcsDetailVOList.size() > 0) totCnt = p_vEPrcsDetailVOList.get(0).getTotCnt(); + p_paginationInfo.setTotalRecordCount(totCnt); + + return p_paginationInfo; + } +} 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 48b09a0e..3ac74444 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 @@ -291,6 +291,15 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable { private String deadlineDt; //마감일자 + private String prcsAplctPrdOrd; + + + public String getPrcsAplctPrdOrd() { + return prcsAplctPrdOrd; + } + public void setPrcsAplctPrdOrd(String prcsAplctPrdOrd) { + this.prcsAplctPrdOrd = prcsAplctPrdOrd; + } public String getDeadlineDt() { return deadlineDt; } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduAplctDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduAplctDAO.java index 60e8f7c8..b2cde90c 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduAplctDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduAplctDAO.java @@ -6,6 +6,7 @@ import org.springframework.stereotype.Repository; import egovframework.rte.psl.dataaccess.EgovAbstractDAO; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; @Repository("vEEduAplctDAO") public class VEEduAplctDAO extends EgovAbstractDAO { @@ -117,4 +118,12 @@ public class VEEduAplctDAO extends EgovAbstractDAO { return (int) select("VEEduAplctDAO.selectCntAplctPrd",veEduAplctVO); } + public void insertVeEduAplct(VEEduAplctVO paramVO) { + insert("VEEduAplctDAO.insertVeEduAplct", paramVO); + } + + public VEEduAplctVO findByAprvlCd(VEEduAplctVO vEEduAplctReqVO) { + return (VEEduAplctVO) select("VEEduAplctDAO.findByAprvlCd", vEEduAplctReqVO); + } + } 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 7038f7e4..5f46559e 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 @@ -116,6 +116,10 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable { + private String aprvlCd; + + + public String getPrcsOrd() { return prcsOrd; @@ -549,6 +553,12 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable { public void setUserId(String userId) { this.userId = userId; } + public String getAprvlCd() { + return aprvlCd; + } + public void setAprvlCd(String aprvlCd) { + this.aprvlCd = aprvlCd; + } } diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Cubrid.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Cubrid.xml index 853335b4..7c858259 100644 --- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Cubrid.xml +++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Cubrid.xml @@ -240,6 +240,54 @@ ) + + + + INSERT INTO ( + EDU_APLCT_ORD, + LCTR_DIV_CD, + USER_ID, + PRCS_ORD, + + SBMT_YN, + SBMT_PNTTM, + APRVL_CD, + APRVL_PNTTM, + APRVL_CN, + + FRST_REGIST_PNTTM, + FRST_REGISTER_ID + )VALUES( + #eduAplctOrd#, + #lctrDivCd#, + #userId#, + #prcsOrd#, + + #sbmtYn#, + IF(#sbmtYn# = 'Y', NOW(), NULL), + #aprvlCd#, + IF(#aprvlCd# IS NOT NULL, NOW(), NULL), + #aprvlCn#, + + NOW(), + #frstRegisterId# + ) + + + + + + +
+ +
+ + + + " /> + " /> + + +
+

교육신청목록

+
+ + +
+
+
+
+ + +
+
+
+ <%-- --%> + +
+ ~ +
+ <%-- --%> + +
+ + + +
+
+ + + +
+ + +<%-- --%> + + + + + + + + + + + + + + + + + + + + + + + +<%-- + + + + + + + +<%-- --%> + + + + + + + +
교육구분과정명신청기간교육기간신청자/정원상태교육신청
');" style="cursor:pointer;"> --%> +<%-- --%> + + + + ');" style="cursor:pointer;"> + () + + ~ + + ~ + + / + + + + + + + + + + + + +<%-- --%> +
+
+ +
+
+
+
+
+
+ +
+
+ + +
+ +
+ + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp new file mode 100644 index 00000000..5bd991ad --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp @@ -0,0 +1,270 @@ +<%@ page contentType="text/html; charset=utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> + +교육신청 목록 > 성인 찾아가는 저작권 교육 > 한국저작권위원회 저작권 교육 시스템 + + + + +
+ + + + " /> + " /> + + +
+

대시보드 (개발해야함)

+
+ + +
+
+
+
+ + +
+
+
+ <%-- --%> + +
+ ~ +
+ <%-- --%> + +
+ + + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
번호교육희망일기관구분기관(단체)명신청유형신청상태
+ + + + + + + + + + - + + + + + + + + + + + + + + + + + + + 교육신청 + + + 교육승인 + + + 교육반려 + + + 교육취소 + + + 선정완료 + + + 수정요청 + + + 수정완료 + + + 교육확정 + + + - + + +
+
+ +
+ +
    +
  • + 번호 + +
    • +
  • + 교육희망일 + + + + + + + + - + + + +
    • +
  • + 기관구분 + +
    • +
  • + 기관(단체)명 + +
    • +
  • + 신청유형 + +
    • +
  • + 신청상태 + + + + + 교육신청 + + + 교육승인 + + + 교육반려 + + + 교육취소 + + + 선정완료 + + + 수정요청 + + + 수정완료 + + + 교육확정 + + + - + + + + +
    • +
+ +
+ +
+
+
+
+
+
+ +
+
+ + +<%--
+ +
--%> + +
\ No newline at end of file From d6a7927309f931844d63a38d73519b5b11063562 Mon Sep 17 00:00:00 2001 From: jiwoo Date: Mon, 18 Sep 2023 11:56:09 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EC=B2=B4?= =?UTF-8?q?=ED=97=98=EA=B5=90=EC=8B=A4=20=EA=B4=80=EB=A6=AC=EC=9E=90=20?= =?UTF-8?q?=EC=9E=91=EC=97=85=20=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../let/uat/uia/web/APILoginContoller.java | 3 ++- .../web/OprtnAplctAnncmMngController.java | 5 ++++- .../let/cmm/fms/EgovFile_SQL_Tibero.xml | 4 ++-- .../ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml | 6 +++--- .../sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml | 2 +- .../oprtnAplctAnncmMngDetail.jsp | 8 ++++++-- .../oprtnAplctAnncmMngList.jsp | 5 +---- .../cpyrgExprnClsrm/oprtnAplctAnncmMngReg.jsp | 20 +++++++++++++++++-- .../oprtnAplctAnncmMngUpdate.jsp | 6 +----- .../adm/publish/datepicker/classic.css | 2 +- 10 files changed, 39 insertions(+), 22 deletions(-) diff --git a/src/main/java/kcc/let/uat/uia/web/APILoginContoller.java b/src/main/java/kcc/let/uat/uia/web/APILoginContoller.java index 591b92ff..2b1a5c4b 100644 --- a/src/main/java/kcc/let/uat/uia/web/APILoginContoller.java +++ b/src/main/java/kcc/let/uat/uia/web/APILoginContoller.java @@ -70,7 +70,8 @@ public class APILoginContoller { public String loginKeyChkForOffedu(Map paramRequest, RedirectAttributes redirectAttributes, HttpServletRequest request, HttpServletResponse response,HttpSession session) throws Exception { String userId = paramRequest.get("user_id"); String key = paramRequest.get("key"); - String returnUrl = paramRequest.get("returnUrl"); + //String returnUrl = paramRequest.get("returnUrl"); //e-배움터 문의결과 returnUrl 컨트롤은 불가능하다고 함 + String returnUrl = ""; System.out.println("@@@@@@@e배움터 로그인 페이지에서 오는 메소드 or e배움터 로그인 상태에서 오는 메소드@@@@@@@@"); //테스트를 위한 값 선언 diff --git a/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/web/OprtnAplctAnncmMngController.java b/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/web/OprtnAplctAnncmMngController.java index 229bb045..4b218487 100644 --- a/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/web/OprtnAplctAnncmMngController.java +++ b/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/web/OprtnAplctAnncmMngController.java @@ -132,7 +132,7 @@ public class OprtnAplctAnncmMngController { */ @RequestMapping("oprtnAplctAnncmMngList.do") public String OprtnAplctAnncmMngList( - @ModelAttribute("vEPrcsDetailVO") VEPrcsDetailVO vEPrcsDetailVO + VEPrcsDetailVO vEPrcsDetailVO , ModelMap model ) throws Exception { @@ -144,6 +144,9 @@ public class OprtnAplctAnncmMngController { //로그인 처리==================================== + //체험교실 구분값 + vEPrcsDetailVO.setLctrDivCd("30"); + //1.pageing step1 PaginationInfo paginationInfo = this.setPagingStep1(vEPrcsDetailVO); diff --git a/src/main/resources/egovframework/sqlmap/let/cmm/fms/EgovFile_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/let/cmm/fms/EgovFile_SQL_Tibero.xml index 8082e0c5..11aae0cb 100644 --- a/src/main/resources/egovframework/sqlmap/let/cmm/fms/EgovFile_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/let/cmm/fms/EgovFile_SQL_Tibero.xml @@ -37,7 +37,7 @@ diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml index 598bd2cd..232c0c4c 100644 --- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml @@ -90,9 +90,9 @@ #endPnttm#, #useYn#, - NOW(), + SYSDATE, #frstRegisterId#, - NOW(), + SYSDATE, #lastUpdusrId#, #anncmCn#, @@ -129,7 +129,7 @@ SET - LAST_UPDT_PNTTM = NOW() + LAST_UPDT_PNTTM = SYSDATE ,LAST_UPDUSR_ID = #lastUpdusrId# diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml index 29bd1c83..582b19f7 100644 --- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml @@ -84,7 +84,7 @@ SET - LAST_UPDT_PNTTM = NOW() + LAST_UPDT_PNTTM = SYSDATE ,LAST_UPDUSR_ID = #lastUpdusrId# , prcs_kind = #prcsKind# diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngDetail.jsp index df10e22d..91f18b7c 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngDetail.jsp @@ -211,6 +211,7 @@ function fncGoList(){ var listForm = document.listForm ; + listForm.prcsAplctPrdOrd.value = ""; //목록 이동 시 searchKeyword 초기화 listForm.action = ""; listForm.submit(); } @@ -220,6 +221,10 @@ listForm.action = ""; listForm.submit(); } + + function fncPreview(){ + alert("개발전") + } @@ -326,7 +331,6 @@ - <%--

안내내용

@@ -344,7 +348,6 @@ - --%>

사용여부

@@ -369,6 +372,7 @@
+
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngList.jsp index 48b86ee8..3c11e708 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngList.jsp @@ -289,10 +289,7 @@ - - - ~ - + ${list.strtPnttm}~${list.endPnttm} diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngReg.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngReg.jsp index bb11f7fc..b14d6d1a 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngReg.jsp @@ -153,7 +153,6 @@ alert("종료일을 입력해주세요."); return false; } - /* if($("#anncmCn").val() == ""){ alert("안내내용을 입력해주세요."); return false; @@ -162,7 +161,6 @@ alert("팝업내용을 입력해주세요."); return false; } - */ //첨부파일 등록 처리 $('#file_temp').val(""); //첨부파일 중복 등록 방지를 위해 추가 @@ -467,6 +465,24 @@ --> + + +

필수입력 항목*

+

안내내용

+ + + + + + + +

필수입력 항목*

+

팝업내용

+ + + + +

필수입력 항목*

diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngUpdate.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngUpdate.jsp index d6c2eba0..944388db 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngUpdate.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngUpdate.jsp @@ -126,7 +126,6 @@ alert("종료일을 입력해주세요."); return false; } - /* if($("#anncmCn").val() == ""){ alert("안내내용을 입력해주세요."); return false; @@ -135,7 +134,6 @@ alert("팝업내용을 입력해주세요."); return false; } - */ //첨부파일 등록 처리 $('#file_temp').val(""); //첨부파일 중복 등록 방지를 위해 추가 @@ -299,7 +297,7 @@

제목

- + @@ -428,7 +426,6 @@ - <%--

필수입력 항목*

@@ -448,7 +445,6 @@ - --%>

필수입력 항목*

diff --git a/src/main/webapp/visitEdu/adm/publish/datepicker/classic.css b/src/main/webapp/visitEdu/adm/publish/datepicker/classic.css index 62bbd469..7ad48cb5 100644 --- a/src/main/webapp/visitEdu/adm/publish/datepicker/classic.css +++ b/src/main/webapp/visitEdu/adm/publish/datepicker/classic.css @@ -23,7 +23,7 @@ .picker__input { width: 180px; cursor: default; - background-image: url(../../image/content/calendarIcon.png); + background-image: url(../image/content/calendarIcon.png); background-repeat: no-repeat; background-position: 90% 45%; }