diff --git a/src/main/java/kcc/com/cmm/ComDefaultVO.java b/src/main/java/kcc/com/cmm/ComDefaultVO.java index 72df2360..fabc2e78 100644 --- a/src/main/java/kcc/com/cmm/ComDefaultVO.java +++ b/src/main/java/kcc/com/cmm/ComDefaultVO.java @@ -172,6 +172,9 @@ public class ComDefaultVO implements Serializable { private String searchQuery; + private String searchStartRegistPnttm; + private String searchEndRegistPnttm; + public int getBeSort() { return beSort; } @@ -844,4 +847,20 @@ public class ComDefaultVO implements Serializable { this.searchQuery = searchQuery; } + public String getSearchStartRegistPnttm() { + return searchStartRegistPnttm; + } + + public void setSearchStartRegistPnttm(String searchStartRegistPnttm) { + this.searchStartRegistPnttm = searchStartRegistPnttm; + } + + public String getSearchEndRegistPnttm() { + return searchEndRegistPnttm; + } + + public void setSearchEndRegistPnttm(String searchEndRegistPnttm) { + this.searchEndRegistPnttm = searchEndRegistPnttm; + } + } diff --git a/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/service/ScholInfoVO.java b/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/service/ScholInfoVO.java index 0285ccbb..c8dc4e53 100644 --- a/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/service/ScholInfoVO.java +++ b/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/service/ScholInfoVO.java @@ -87,6 +87,10 @@ public class ScholInfoVO extends ComDefaultVO implements Serializable { private String selectPagingListQuery; private String orderByQuery; + private String isltnYn; //도서벽지학교여부 + private String isltn2Yn; //벽지지역여부 + private String isltn3Yn; //접적지역여부 + private String ppltnReducAreaYn; //인구감소지역여부 public String getScholId() { return scholId; } @@ -414,4 +418,38 @@ public class ScholInfoVO extends ComDefaultVO implements Serializable { public void setCallBackFnc(String callBackFnc) { this.callBackFnc = callBackFnc; } + + public String getIsltnYn() { + return isltnYn; + } + + public void setIsltnYn(String isltnYn) { + this.isltnYn = isltnYn; + } + + public String getIsltn2Yn() { + return isltn2Yn; + } + + public void setIsltn2Yn(String isltn2Yn) { + this.isltn2Yn = isltn2Yn; + } + + public String getIsltn3Yn() { + return isltn3Yn; + } + + public void setIsltn3Yn(String isltn3Yn) { + this.isltn3Yn = isltn3Yn; + } + + public String getPpltnReducAreaYn() { + return ppltnReducAreaYn; + } + + public void setPpltnReducAreaYn(String ppltnReducAreaYn) { + this.ppltnReducAreaYn = ppltnReducAreaYn; + } + + } diff --git a/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ExprnClsrmAplctController.java b/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ExprnClsrmAplctController.java index a333cfef..2ee29679 100644 --- a/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ExprnClsrmAplctController.java +++ b/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ExprnClsrmAplctController.java @@ -8,12 +8,15 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; +import org.apache.commons.collections.CollectionUtils; 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.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; @@ -474,6 +477,25 @@ public class ExprnClsrmAplctController { } + //체험교실 운영신청 초기화 시 첨부파일 삭제 + @RequestMapping(value = "/fmsfileMultipleDeleteAjax.do", method = RequestMethod.POST) + public ModelAndView fmsfileMultipleDeleteAjax(@RequestBody FileVO fileVo) throws Exception { + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + try { + if(CollectionUtils.isNotEmpty(fileVo.getFileList())){ + for(FileVO file : fileVo.getFileList()){ + fileService.deleteFmsFileInf(file); + } + } + modelAndView.addObject("result", "success"); + }catch (Exception e) { + modelAndView.addObject("result", "fail"); + System.out.println("Exception Occured!!!"); + return modelAndView; + } + return modelAndView; + } ////////////////////////////////////////////////////////////////////////////////////////////////////////////// // // 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 index cdbe1845..fd61b37b 100644 --- a/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/service/impl/FndtnEnhanceTrnDAO.java +++ b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/service/impl/FndtnEnhanceTrnDAO.java @@ -10,9 +10,9 @@ import kcc.ve.aplct.cpyrgExprnClsrm.exprnClsrmAplct.service.ScholInfoVO; @Repository("fndtnEnhanceTrnDAO") public class FndtnEnhanceTrnDAO extends EgovAbstractDAO { - public void insertIsltn(ScholInfoVO paramVO) throws Exception { +/* public void insertIsltn(ScholInfoVO paramVO) throws Exception { insert("ScholInfoDAO.insertIsltn", paramVO); - } + }*/ /** * L - Page @@ -20,7 +20,7 @@ public class FndtnEnhanceTrnDAO extends EgovAbstractDAO { * @return * @throws Exception */ - public List selectPagingList(ScholInfoVO paramVO) throws Exception { +/* public List selectPagingList(ScholInfoVO paramVO) throws Exception { @SuppressWarnings("unchecked") List list = (List) list("ScholInfoDAO.selectPagingList", paramVO); return list; @@ -56,5 +56,5 @@ public class FndtnEnhanceTrnDAO extends EgovAbstractDAO { public int insertSelectIsltn(ScholInfoVO scholInfoVO) throws Exception { return update("ScholInfoDAO.insertSelectIsltn", scholInfoVO); - } + }*/ } diff --git a/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java index 6190625d..36b39242 100644 --- a/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java +++ b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java @@ -475,6 +475,7 @@ public class FndtnEnhanceTrnController { } + ////////////////////////////////////////////////////////////////////////////////////////////////////////////// // // diff --git a/src/main/java/kcc/ve/aplct/sspnIdtmt/service/SspnIdtmtService.java b/src/main/java/kcc/ve/aplct/sspnIdtmt/service/SspnIdtmtService.java index c8e3b20c..01fe3db5 100644 --- a/src/main/java/kcc/ve/aplct/sspnIdtmt/service/SspnIdtmtService.java +++ b/src/main/java/kcc/ve/aplct/sspnIdtmt/service/SspnIdtmtService.java @@ -2,6 +2,7 @@ package kcc.ve.aplct.sspnIdtmt.service; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; +import kcc.ve.oprtn.cndtnSspnIdtmt.trgtMng.service.CndtnTrgtMngVO; public interface SspnIdtmtService { @@ -9,5 +10,7 @@ public interface SspnIdtmtService { VEEduAplctVO findByAprvlCd(VEEduAplctVO vEEduAplctReqVO); + String findByTrgtNm(CndtnTrgtMngVO cndtnTrgtInfoMngVO); + } diff --git a/src/main/java/kcc/ve/aplct/sspnIdtmt/service/impl/SspnIdtmtDAO.java b/src/main/java/kcc/ve/aplct/sspnIdtmt/service/impl/SspnIdtmtDAO.java index 8b40dd30..3dca6b7b 100644 --- a/src/main/java/kcc/ve/aplct/sspnIdtmt/service/impl/SspnIdtmtDAO.java +++ b/src/main/java/kcc/ve/aplct/sspnIdtmt/service/impl/SspnIdtmtDAO.java @@ -6,20 +6,21 @@ import org.springframework.stereotype.Repository; import egovframework.rte.psl.dataaccess.EgovAbstractDAO; import kcc.ve.aplct.cpyrgExprnClsrm.exprnClsrmAplct.service.ScholInfoVO; +import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; @Repository("sspnIdtmtDAO") public class SspnIdtmtDAO extends EgovAbstractDAO { - - public void insertIsltn(ScholInfoVO paramVO) throws Exception { - insert("ScholInfoDAO.insertIsltn", paramVO); - } - - /** +// +// 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); @@ -56,5 +57,9 @@ public class SspnIdtmtDAO extends EgovAbstractDAO { public int insertSelectIsltn(ScholInfoVO scholInfoVO) throws Exception { return update("ScholInfoDAO.insertSelectIsltn", scholInfoVO); - } + }*/ + +// public int findByTrgtNm(VEEduAplctVO vEEduAplctVO) { +// return (int) select("SspnIdtmtDAO.findByTrgtNm", vEEduAplctVO); +// } } diff --git a/src/main/java/kcc/ve/aplct/sspnIdtmt/service/impl/SspnIdtmtServiceImpl.java b/src/main/java/kcc/ve/aplct/sspnIdtmt/service/impl/SspnIdtmtServiceImpl.java index 8c7607dd..3d4ca594 100644 --- a/src/main/java/kcc/ve/aplct/sspnIdtmt/service/impl/SspnIdtmtServiceImpl.java +++ b/src/main/java/kcc/ve/aplct/sspnIdtmt/service/impl/SspnIdtmtServiceImpl.java @@ -7,6 +7,8 @@ import org.springframework.stereotype.Service; import kcc.ve.aplct.sspnIdtmt.service.SspnIdtmtService; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.impl.VEEduAplctDAO; +import kcc.ve.oprtn.cndtnSspnIdtmt.trgtMng.service.CndtnTrgtMngVO; +import kcc.ve.oprtn.cndtnSspnIdtmt.trgtMng.service.impl.CndtnTrgtMngDAO; @Service("sspnIdtmtService") public class SspnIdtmtServiceImpl implements SspnIdtmtService { @@ -16,14 +18,23 @@ public class SspnIdtmtServiceImpl implements SspnIdtmtService { @Resource(name="vEEduAplctDAO") private VEEduAplctDAO vEEduAplctDAO; + // 기소유예 관련 + @Resource(name="cndtnTrgtInfoMngDAO") + private CndtnTrgtMngDAO cndtnTrgtInfoMngDAO; + + @Override public void insertVeEduAplct(VEEduAplctVO paramVO) { - //C - vEEduAplctDAO.insertVeEduAplct(paramVO); + vEEduAplctDAO.insertVeEduAplct(paramVO); } @Override public VEEduAplctVO findByAprvlCd(VEEduAplctVO vEEduAplctReqVO) { return vEEduAplctDAO.findByAprvlCd(vEEduAplctReqVO); } + + @Override + public String findByTrgtNm(CndtnTrgtMngVO cndtnTrgtInfoMngVO) { + return cndtnTrgtInfoMngDAO.findByTrgtNm(cndtnTrgtInfoMngVO); + } } diff --git a/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java b/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java index 9f2ac84c..2188d447 100644 --- a/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java +++ b/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java @@ -40,6 +40,8 @@ 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; +import kcc.ve.oprtn.cndtnSspnIdtmt.trgtMng.service.CndtnTrgtMngService; +import kcc.ve.oprtn.cndtnSspnIdtmt.trgtMng.service.CndtnTrgtMngVO; /** * 교육신청(성인찾아가는교육) @@ -135,6 +137,11 @@ public class SspnIdtmtController { @Resource(name = "eduAplctAdultService") private EduAplctAdultService eduAplctAdultService; + + //과정 관리 + @Resource(name = "cndtnTrgtInfoMngService") + private CndtnTrgtMngService cndtnTrgtInfoMngService; + //코드 @Resource(name="cmmUseDAO") @@ -294,7 +301,7 @@ public class SspnIdtmtController { /** * 교육신청 목록 화면 */ - @RequestMapping("/web/ve/aplct/sspnIdtmt/fndtnEduAplctList.do") + /*@RequestMapping("/web/ve/aplct/sspnIdtmt/fndtnEduAplctList.do") public String fndtnEduAplctList( @ModelAttribute("vEPrcsDetailVO") VEPrcsDetailVO vEPrcsDetailVO , ModelMap model @@ -357,7 +364,7 @@ public class SspnIdtmtController { return "/web/ve/aplct/sspnIdtmt/fndtnEduAplctList"; } - /** + *//** * 교육상세 */ @RequestMapping("/web/ve/aplct/sspnIdtmt/eduAplctDetail.do") @@ -399,6 +406,9 @@ public class SspnIdtmtController { //로그인 처리==================================== //로그인 정보 가져오기 + + + String s_oprtnLoginCheckNInfo = checkLoginUtil.oprtnCheckNInfo(model); if (!"".equals(s_oprtnLoginCheckNInfo)) { @@ -410,12 +420,12 @@ public class SspnIdtmtController { LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 - + VEEduAplctVO vEEduAplctVO = new VEEduAplctVO(); vEEduAplctVO.setEduAplctOrd(eduAplctGnrService.getNextStringId()); - vEEduAplctVO.setLctrDivCd("60"); // 기반강화 + vEEduAplctVO.setLctrDivCd(VeConstants.LCTR_DIV_CD_60); // 기소유예 vEEduAplctVO.setAprvlCd("10"); // 승인코드 VE0003 10 - 요청, 20 - 승인, 30 - 반려 // sbmt_pnttm 제출일시 vEEduAplctVO.setSbmtYn("Y"); // 제출여부 @@ -424,15 +434,65 @@ public class SspnIdtmtController { vEEduAplctVO.setUserId(loginVO.getUniqId()); vEEduAplctVO.setPrcsOrd(vEPrcsDetailVO.getPrcsAplctPrdOrd()); - sspnIdtmtService.insertVeEduAplct(vEEduAplctVO); + String result = ""; + try { + + sspnIdtmtService.insertVeEduAplct(vEEduAplctVO); + + + CndtnTrgtMngVO cndtnTrgtMngVO = new CndtnTrgtMngVO(); + + cndtnTrgtMngVO.setUserId(loginVO.getUniqId()); + cndtnTrgtMngVO.setSspnIdtmtTrgtOrd(vEPrcsDetailVO.getSspnIdtmtTrgtOrd()); + + cndtnTrgtInfoMngService.updateUserId(cndtnTrgtMngVO); + + result = "success"; + } catch (Exception e) { + // TODO: handle exception + } + - modelAndView.addObject("result", "success"); + modelAndView.addObject("result", result); return modelAndView; } + /** + * 기반강화연수과정 신청기간 등록 + */ + @RequestMapping("/web/ve/aplct/sspnIdtmt/userConfirmAjax.do") + public ModelAndView userConfirmAjax( + @ModelAttribute("cndtnTrgtInfoMngVO") CndtnTrgtMngVO cndtnTrgtInfoMngVO + , ModelMap model + , 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; + } + + + String id = sspnIdtmtService.findByTrgtNm(cndtnTrgtInfoMngVO); + + + modelAndView.addObject("result", "success"); + modelAndView.addObject("id", id); + + return modelAndView; + + } + /** * 교육신청 목록 화면 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 195ea58c..989e6585 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 @@ -348,6 +348,10 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable { private String qestnrId; // 설문 private String aplctStateCd; // 교육이수 상태 + //관리자 화면 등록 여부 + private String adminInsert; + //운영계획 필요 교재 수량 + private String needTxtbNum; @@ -1507,6 +1511,18 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable { public void setAplctStateCd(String aplctStateCd) { this.aplctStateCd = aplctStateCd; } + public String getAdminInsert() { + return adminInsert; + } + public void setAdminInsert(String adminInsert) { + this.adminInsert = adminInsert; + } + public String getNeedTxtbNum() { + return needTxtbNum; + } + public void setNeedTxtbNum(String needTxtbNum) { + this.needTxtbNum = needTxtbNum; + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduOprtnVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduOprtnVO.java index 1fe72fba..49392d30 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduOprtnVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduOprtnVO.java @@ -51,6 +51,7 @@ public class VEEduOprtnVO extends ComDefaultVO implements Serializable { private String remoteYn; //벽지지역 private String clsCmbtYn; //접적지역 private String ppulDclnYn; //인구감소지역 + private String needTxtbNum; //필요 교재 수량 @@ -261,4 +262,13 @@ public class VEEduOprtnVO extends ComDefaultVO implements Serializable { public void setPpulDclnYn(String ppulDclnYn) { this.ppulDclnYn = ppulDclnYn; } + + public String getNeedTxtbNum() { + return needTxtbNum; + } + + public void setNeedTxtbNum(String needTxtbNum) { + this.needTxtbNum = needTxtbNum; + } + } 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 b7b946f6..31b55795 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 @@ -126,6 +126,8 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable { private String dateChk; private Boolean qestRsltExists; + private String trgtNm; + private String sspnIdtmtTrgtOrd; @@ -597,6 +599,18 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable { public void setQestRsltExists(Boolean qestRsltExists) { this.qestRsltExists = qestRsltExists; } + public String getTrgtNm() { + return trgtNm; + } + public void setTrgtNm(String trgtNm) { + this.trgtNm = trgtNm; + } + public String getSspnIdtmtTrgtOrd() { + return sspnIdtmtTrgtOrd; + } + public void setSspnIdtmtTrgtOrd(String sspnIdtmtTrgtOrd) { + this.sspnIdtmtTrgtOrd = sspnIdtmtTrgtOrd; + } } diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngService.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngService.java index 0d7d858e..1265001f 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngService.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngService.java @@ -2,6 +2,7 @@ package kcc.ve.oprtn.cndtnSspnIdtmt.trgtMng.service; import java.util.List; + public interface CndtnTrgtMngService { List selectPagingList(CndtnTrgtMngVO cndtnTrgtInfoMngVO); @@ -11,6 +12,8 @@ public interface CndtnTrgtMngService { CndtnTrgtMngVO selectDetail(CndtnTrgtMngVO cndtnTrgtInfoVO); void update(CndtnTrgtMngVO cndtnTrgtInfoMngVO); + + void updateUserId(CndtnTrgtMngVO cndtnTrgtMngVO); diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngDAO.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngDAO.java index 3fd3ad9a..42a7f562 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngDAO.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngDAO.java @@ -5,6 +5,7 @@ import java.util.List; import org.springframework.stereotype.Repository; import egovframework.rte.psl.dataaccess.EgovAbstractDAO; +import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEAPrcsAplctPrdInstrAsgnmVO; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; @@ -108,5 +109,13 @@ public class CndtnTrgtMngDAO extends EgovAbstractDAO { update("cndtnTrgtInfoMngDAO.update", cndtnTrgtInfoMngVO); } + public String findByTrgtNm(CndtnTrgtMngVO cndtnTrgtInfoMngVO) { + return (String) select("cndtnTrgtInfoMngDAO.findByTrgtNm", cndtnTrgtInfoMngVO); + } + + public void updateUserId(CndtnTrgtMngVO cndtnTrgtMngVO) { + update("cndtnTrgtInfoMngDAO.updateUserId", cndtnTrgtMngVO); + } + } diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngServiceImpl.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngServiceImpl.java index 0b6e9b98..439f1308 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngServiceImpl.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngServiceImpl.java @@ -8,6 +8,7 @@ import javax.annotation.Resource; import org.springframework.stereotype.Service; import egovframework.rte.fdl.idgnr.EgovIdGnrService; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; import kcc.ve.oprtn.cndtnSspnIdtmt.trgtMng.service.CndtnTrgtMngService; import kcc.ve.oprtn.cndtnSspnIdtmt.trgtMng.service.CndtnTrgtMngVO; @@ -46,6 +47,11 @@ public class CndtnTrgtMngServiceImpl implements CndtnTrgtMngService { cndtnTrgtInfoMngDAO.update(cndtnTrgtInfoMngVO); } + + @Override + public void updateUserId(CndtnTrgtMngVO cndtnTrgtMngVO) { + cndtnTrgtInfoMngDAO.updateUserId(cndtnTrgtMngVO); + } /* //C diff --git a/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/service/impl/OprtnAplctMngServiceImpl.java b/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/service/impl/OprtnAplctMngServiceImpl.java index cb84f362..e3dfffc5 100644 --- a/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/service/impl/OprtnAplctMngServiceImpl.java +++ b/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/service/impl/OprtnAplctMngServiceImpl.java @@ -118,8 +118,12 @@ public class OprtnAplctMngServiceImpl implements OprtnAplctMngService { vEEduAplctVO.setEduAplctOrd(eduAplctOrd); vEEduAplctVO.setLctrDivCd(VeConstants.LCTR_DIV_CD_30); //강의 구분 코드 체험교실 vEEduAplctVO.setOprtnFileId(s_scholSealAtchFileId); //학교장직인 첨부파일 - vEEduAplctVO.setUserId(loginVO.getUniqId()); - vEEduAplctVO.setFrstRegisterId(loginVO.getUniqId()); //esntl_id + if(!"Y".equals(vEEduAplctVO.getAdminInsert())) { + vEEduAplctVO.setUserId(loginVO.getUniqId()); + vEEduAplctVO.setFrstRegisterId(loginVO.getUniqId()); //esntl_id + }else { + vEEduAplctVO.setFrstRegisterId(vEEduAplctVO.getUserId()); + } //저장전 암호화 - VO 단위로 만들어서 사용 vEEduAplctVO = egovCryptoUtil.encryptVEEduAplctVOInfo(vEEduAplctVO); @@ -146,6 +150,9 @@ public class OprtnAplctMngServiceImpl implements OprtnAplctMngService { String s_scholSealAtchFileId = ""; s_scholSealAtchFileId = vEEduAplctVO.getScholSealAtchFileId(); + if("30".equals(vEEduAplctVO.getLctrDivCd())) { + s_scholSealAtchFileId = vEEduAplctVO.getOprtnFileId(); + } //DB에서 실제 첨부파일 존재 여부 확인 FileVO fileVO = new FileVO(); 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 2fd204e3..89a1727b 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 @@ -188,9 +188,9 @@ public class OprtnAplctAnncmMngController { //온라인차시 리스트 vEPrcsDetailVO.setUseYn("Y"); vEPrcsDetailVO.setLctrDivCd(VeConstants.LCTR_DIV_CD_30); - List vEPrcsDetailVOList = vEPrcsMIXService.selectPrcsList(vEPrcsDetailVO); + /*List vEPrcsDetailVOList = vEPrcsMIXService.selectPrcsList(vEPrcsDetailVO);*/ //대상 리스트, 페이징 정보 전달 - model.addAttribute("list", vEPrcsDetailVOList); + /*model.addAttribute("list", vEPrcsDetailVOList);*/ return "oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngReg"; } diff --git a/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/web/OprtnAplctMngController.java b/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/web/OprtnAplctMngController.java index 2c10a45c..cf42346b 100644 --- a/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/web/OprtnAplctMngController.java +++ b/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/web/OprtnAplctMngController.java @@ -52,6 +52,7 @@ 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.prcsInfo.service.VEPrcsAplctPrdService; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsMIXService; import kcc.ve.oprtn.asgnmnoti.service.VEAsgnmNotiService; @@ -122,6 +123,9 @@ public class OprtnAplctMngController { //NOTI 서비스 @Resource(name="vEAsgnmNotiService") private VEAsgnmNotiService vEAsgnmNotiService; + + @Resource(name = "vEPrcsAplctPrdService") + private VEPrcsAplctPrdService vEPrcsAplctPrdService; /** * 저작권체험교실 목록 화면 @@ -186,7 +190,10 @@ public class OprtnAplctMngController { model.addAttribute("loginVO", loginVO); //로그인 처리==================================== - + //신청서 양식다운로드 정보 가져오기(신청일자 기준 가장 최신 데이터, 1개 로우) + VEPrcsDetailVO detailVO = new VEPrcsDetailVO(); + detailVO = vEPrcsAplctPrdService.selectDetailNewOne(detailVO); + model.addAttribute("detailVO", detailVO); return "oprtn/cpyrgExprnClsrm/oprtnAplctMngReg"; } @@ -250,7 +257,7 @@ public class OprtnAplctMngController { * 체험교실 수정 화면 */ @RequestMapping("oprtnAplctMngMdfy.do") - public String oprtnAplctMngMdfy( @ModelAttribute("modelVO") VEEduAplctVO vEEduAplctVO , ModelMap model , HttpServletRequest request ) throws Exception { + public String oprtnAplctMngMdfy( @ModelAttribute("vEPrcsDetailVO") VEEduAplctVO vEEduAplctVO , ModelMap model , HttpServletRequest request ) throws Exception { vEEduAplctVO.setMode(VeConstants.MODE_UPT); @@ -264,7 +271,8 @@ public class OprtnAplctMngController { //파일 정보 가져오기 FileVO fileVO = new FileVO(); - fileVO.setAtchFileId(vEEduAplctVO.getScholSealAtchFileId()); + /*fileVO.setAtchFileId(vEEduAplctVO.getScholSealAtchFileId());*/ + fileVO.setAtchFileId(vEEduAplctVO.getOprtnFileId()); List result = fileService.selectFileInfs(fileVO); model.addAttribute("fileList", result); model.addAttribute("fileListCnt", result.size()); diff --git a/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnStateMng/web/OprtnStateMngController.java b/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnStateMng/web/OprtnStateMngController.java index b2e60d5c..7fbc6902 100644 --- a/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnStateMng/web/OprtnStateMngController.java +++ b/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnStateMng/web/OprtnStateMngController.java @@ -151,6 +151,7 @@ public class OprtnStateMngController { //2. pageing step2 vEEduAplctVO = this.setPagingStep2(vEEduAplctVO, paginationInfo); + vEEduAplctVO.setOrderByQuery("H.LAST_UPDT_PNTTM DESC, A.LAST_UPDT_PNTTM DESC , E.LAST_UPDT_PNTTM DESC"); List vEEduAplctVOList = vEEduMIXService.selectPagingList(vEEduAplctVO); //List복호화 diff --git a/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml index 7daf7b9b..17fd4f5b 100644 --- a/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml @@ -131,6 +131,18 @@ WHERE sspn_idtmt_trgt_ord = #sspnIdtmtTrgtOrd# + + + + /* cndtnTrgtInfoMngDAO.updateSspnIdtmtTrgtOrd */ + UPDATE + + SET + user_id = #userId# + , req_state_cd = #reqStateCd# + WHERE + sspn_idtmt_trgt_ord = #sspnIdtmtTrgtOrd# + + + + + diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml index 593b7096..31fed8f6 100644 --- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml @@ -387,7 +387,8 @@ ISLANDS_YN AS islandsYn, REMOTE_YN AS remoteYn, CLS_CMBT_YN clsCmbtYn, - PPUL_DCLN_YN AS ppulDclnYn + PPUL_DCLN_YN AS ppulDclnYn, + NEED_TXTB_NUM AS needTxtbNum , TO_CHAR(A.SBMT_PNTTM, 'YYYY-MM-DD HH24:MI:ss') AS sbmtPnttmDetail ,C.aprvl_cd AS exprnAprvlCd , C.orgnl_rslt_atch_file_id AS orgnlRsltAtchFileId @@ -1150,6 +1151,7 @@ FROM ve_prcs_aplct_prd a WHERE a.USE_YN = 'Y' - AND REPLACE(#sbmtPnttm#, '-', '') BETWEEN SUBSTR(a.strt_pnttm,1,6) AND SUBSTR(a.end_pnttm,1,6); + AND a.LCTR_DIV_CD = '30' + AND REPLACE(#sbmtPnttm#, '-', '') BETWEEN SUBSTR(a.strt_pnttm,3,6) AND SUBSTR(a.end_pnttm,3,6); diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduOptrn_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduOptrn_SQL_Tibero.xml index e3127fbc..b2f2b968 100644 --- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduOptrn_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduOptrn_SQL_Tibero.xml @@ -32,6 +32,7 @@ ,REMOTE_YN ,CLS_CMBT_YN ,PPUL_DCLN_YN + ,NEED_TXTB_NUM )VALUES( #eduAplctOrd# ,#chrgMjr# @@ -58,6 +59,7 @@ ,#remoteYn# ,#clsCmbtYn# ,#ppulDclnYn# + ,#needTxtbNum# ) @@ -86,6 +88,7 @@ ,REMOTE_YN = #remoteYn# ,CLS_CMBT_YN = #clsCmbtYn# ,PPUL_DCLN_YN = #ppulDclnYn# + ,NEED_TXTB_NUM = #needTxtbNum# WHERE 1=1 AND EDU_APLCT_ORD = #eduAplctOrd# diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml index cf6c77f0..6b7d6e52 100644 --- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml @@ -490,7 +490,9 @@ FROM ve_prcs_cmplt_detail GROUP BY edu_aplct_ord, edu_strt_dt, edu_end_dt , TO_CHAR(sbmt_pnttm,'YYYYMMDD') ) G - ON A.EDU_APLCT_ORD = G.EDU_APLCT_ORD + ON A.EDU_APLCT_ORD = G.EDU_APLCT_ORD + LEFT OUTER JOIN ve_edu_rslt_rprt H + ON A.EDU_APLCT_ORD = H.EDU_APLCT_ORD WHERE 1=1 /* @@ -542,6 +544,13 @@ AND TO_CHAR(A.SBMT_PNTTM,'YYYYMMDD') REPLACE(#searchEndSbmtPnttm#, '.' , '') + + AND TO_CHAR(A.FRST_REGIST_PNTTM,'YYYYMMDD') = ]]> REPLACE(#searchStartRegistPnttm#, '.' , '') + + + + AND TO_CHAR(A.FRST_REGIST_PNTTM,'YYYYMMDD') REPLACE(#searchEndRegistPnttm#, '.' , '') + AND TO_CHAR(A.APRVL_PNTTM, 'YYYYMMDD') = ]]> REPLACE(#searchStratAprvlPnttm#, '.' , '') diff --git a/src/main/resources/egovframework/sqlmap/ve/schol/ScholInfo_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/schol/ScholInfo_MIX_SQL_Tibero.xml index 16d61857..4b11abf9 100644 --- a/src/main/resources/egovframework/sqlmap/ve/schol/ScholInfo_MIX_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/schol/ScholInfo_MIX_SQL_Tibero.xml @@ -85,7 +85,11 @@ /* , IF(b.stndrd_schol_cd IS null,'N','Y') AS isltnScholYn */ , CASE WHEN b.schol_isltn_ord is null THEN 'N' ELSE 'Y' END isltnScholYn /* , DECODE(schol_grade_nm, '초등학교','10', '중학교','20', '고등학교','30',if (INSTR(schol_grade_nm,'각종학교')>0,'40','50')) AS scholDivCd */ - , DECODE(schol_grade_nm, '초등학교','10', '중학교','20', '고등학교','30',CASE WHEN INSTR(schol_grade_nm, '각종학교') > 0 THEN '40' ELSE '50' END) AS scholDivCd + , DECODE(schol_grade_nm, '초등학교','10', '중학교','20', '고등학교','30',CASE WHEN INSTR(schol_grade_nm, '각종학교') > 0 THEN '40' ELSE '50' END) AS scholDivCd + ,a.ISLTN_YN AS isltnYn + ,a.ISLTN2_YN AS isltn2Yn + ,a.ISLTN3_YN AS isltn3Yn + ,a.PPLTN_REDUC_AREA_YN AS ppltnReducAreaYn FROM a diff --git a/src/main/resources/egovframework/sqlmap/ve/schol/ScholInfo_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/schol/ScholInfo_SQL_Tibero.xml index 2ee893ab..b199a452 100644 --- a/src/main/resources/egovframework/sqlmap/ve/schol/ScholInfo_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/schol/ScholInfo_SQL_Tibero.xml @@ -82,6 +82,10 @@ ,A.ESTBS_DT AS estbsDt ,A.SCHOL_ANVSRY AS scholAnvsry ,A.LAST_UPDT_PNTTM AS lastUpdtPnttm + ,A.ISLTN_YN AS isltnYn + ,A.ISLTN2_YN AS isltn2Yn + ,A.ISLTN3_YN AS isltn3Yn + ,A.PPLTN_REDUC_AREA_YN AS ppltnReducAreaYn diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cmm/scholPopListBower.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cmm/scholPopListBower.jsp index 4d78e32c..66e54d2d 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cmm/scholPopListBower.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cmm/scholPopListBower.jsp @@ -109,6 +109,11 @@ + + + + + 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 651b7a14..66049b67 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngReg.jsp @@ -210,7 +210,7 @@ } function fncGoList(){ - var listForm = document.listForm ; + var listForm = document.listForm; listForm.action = ""; listForm.submit(); } @@ -254,9 +254,9 @@ - - " /> - " /> + + " /> + " />
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngDetail.jsp index 8d120e80..4dc1944b 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngDetail.jsp @@ -365,9 +365,11 @@

대상학생수

- - ${info.trgtPrsnl} - + ${info.trgtPrsnl} + +

필요 교재 수량

+ + ${info.needTxtbNum} @@ -428,9 +430,9 @@ - + <%-- --%> - + <%-- --%>
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngReg.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngReg.jsp index fda94e59..63dfd005 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngReg.jsp @@ -9,6 +9,7 @@ <%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> <%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> + <% /** * @Class Name : oprtnAplctAnncmMngReg.jsp @@ -42,52 +43,119 @@ }); }); - function fncSave(){ - - if($("#title").val() == ""){ - alert("제목을 입력해주세요."); - return false; - } - if($("#strtPnttm").val() == ""){ - alert("시작일을 입력해주세요."); - return false; - } - if($("#endPnttm").val() == ""){ - alert("종료일을 입력해주세요."); - return false; - } - /* if($("#anncmCn").val() == ""){ - alert("안내내용을 입력해주세요."); - return false; - } - if($("#popupCn").val() == ""){ - alert("팝업내용을 입력해주세요."); - return false; - } */ - - //첨부파일 등록 처리 - $('#file_temp').val(""); //첨부파일 중복 등록 방지를 위해 추가 - //var data = new FormData(form); - var data = new FormData(document.getElementById("createForm")); - - //첨부파일 등록 처리-step1 - //if(!data.get("fileSize")){ - if($('#tbody_fiielist tr').length*1<=0){ - alert("첨부파일을 등록해 주세요"); - return false; - - } - - //첨부파일 등록 처리-step2 - _fileForm2.forEach(function(obj, idx) { - if (obj) data.append("file"+idx, obj.fileObj); - + function birthSelectBoxDraw(){ + $('.birthYear').yearselect({ + start : 1900, + end : new Date().getFullYear(), + emptyOption: true, + emptyText: '선택', + selected:'', + order:'desc' + }) + // 년도를 바꾼다면 일자를 다시 선택하기 + $('.birthYear').change(function(){ + if($(this).next().next().next().next('select.birthDay')){ + if(Number($(this).next().next().next().next('select.birthDay').val()) > 28){ + dayDraw($(this).next().next().next().next('select.birthDay')); + } + } }); + $.each($(".birthMonth"), function(idx, elm){ + var selectValue = $(this).attr('selectValue'); + $(this).append($('