diff --git a/src/main/java/kcc/com/cmm/web/EgovFileMngController.java b/src/main/java/kcc/com/cmm/web/EgovFileMngController.java index 2626b087..bd13270d 100644 --- a/src/main/java/kcc/com/cmm/web/EgovFileMngController.java +++ b/src/main/java/kcc/com/cmm/web/EgovFileMngController.java @@ -343,4 +343,30 @@ public class EgovFileMngController { return "cmm/fms/selectSimpleDownInfs"; } + /** + * 저작권 체험교실 결과보고 파일 조회 + * + * @param fileVO + * @param commandMap + * @param model + * @return + * @throws Exception + */ + @RequestMapping("/cmm/fms/selectRsltRprtFile.do") + public String selectRsltRprtFile(@ModelAttribute("searchVO") FileVO fileVO, @RequestParam Map commandMap, ModelMap model) throws Exception { + String atchFileId = (String) commandMap.get("param_atchFileId"); + String eduAplctOrd = (String) commandMap.get("eduAplctOrd"); + String type = (String) commandMap.get("type"); + + fileVO.setAtchFileId(atchFileId); + List result = fileService.selectFileInfs(fileVO); + model.addAttribute("fileList", result); + model.addAttribute("updateFlag", "N"); + model.addAttribute("fileListCnt", result.size()); + model.addAttribute("atchFileId", atchFileId); + model.addAttribute("eduAplctOrd", eduAplctOrd); + model.addAttribute("type", type); + + return "cmm/fms/selectRsltRprtFile"; + } } diff --git a/src/main/java/kcc/kccadr/cmm/innorix/service/AdrInnorixFileVO.java b/src/main/java/kcc/kccadr/cmm/innorix/service/AdrInnorixFileVO.java index 98aae1fa..9bcb9e18 100644 --- a/src/main/java/kcc/kccadr/cmm/innorix/service/AdrInnorixFileVO.java +++ b/src/main/java/kcc/kccadr/cmm/innorix/service/AdrInnorixFileVO.java @@ -55,7 +55,8 @@ public class AdrInnorixFileVO extends ComDefaultVO implements Serializable { public List innorixFileListVO = new ArrayList(); - + // 전체 교육인원 - 저작권 체험교실 결과보고서 항목 + public String trgtPrsnlReal = ""; public String getFileType() { @@ -122,6 +123,14 @@ public class AdrInnorixFileVO extends ComDefaultVO implements Serializable { this.atchFileId = atchFileId; } + public String getTrgtPrsnlReal() { + return trgtPrsnlReal; + } + + public void setTrgtPrsnlReal(String trgtPrsnlReal) { + this.trgtPrsnlReal = trgtPrsnlReal; + } + diff --git a/src/main/java/kcc/kccadr/cmm/innorix/service/impl/InnorixFileServiceImpl.java b/src/main/java/kcc/kccadr/cmm/innorix/service/impl/InnorixFileServiceImpl.java index 32402bab..c9669212 100644 --- a/src/main/java/kcc/kccadr/cmm/innorix/service/impl/InnorixFileServiceImpl.java +++ b/src/main/java/kcc/kccadr/cmm/innorix/service/impl/InnorixFileServiceImpl.java @@ -234,6 +234,7 @@ public class InnorixFileServiceImpl extends EgovAbstractServiceImpl implements I vEEduAplctVO.setFrstRegisterId(adrInnorixFileVO.getUniqId()); vEEduAplctVO.setLastUpdusrId(adrInnorixFileVO.getUniqId()); vEEduAplctVO.setEduAplctOrd(adrInnorixFileVO.getEduAplctOrd()); + vEEduAplctVO.setTrgtPrsnlReal(adrInnorixFileVO.getTrgtPrsnlReal()); //저장 vEEduMIXService.insertExprnClsrmEndInfo(vEEduAplctVO); @@ -354,6 +355,7 @@ public class InnorixFileServiceImpl extends EgovAbstractServiceImpl implements I vEEduAplctVO.setAprvlCd(adrInnorixFileVO.getAprvlCd()); vEEduAplctVO.setLastUpdusrId(adrInnorixFileVO.getUniqId()); vEEduAplctVO.setEduAplctOrd(adrInnorixFileVO.getEduAplctOrd()); + vEEduAplctVO.setTrgtPrsnlReal(adrInnorixFileVO.getTrgtPrsnlReal()); //저장 vEEduMIXService.updateRsltRprtFileId(vEEduAplctVO); 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 2ee29679..ef4e1cdb 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 @@ -339,7 +339,12 @@ public class ExprnClsrmAplctController { vEEduAplctVO = egovCryptoUtil.decryptVEEduAplctVOInfo(vEEduAplctVO); model.addAttribute("info", vEEduAplctVO); - + VEPrcsDetailVO vEPrcsDetailVO = new VEPrcsDetailVO(); + vEPrcsDetailVO.setPrcsAplctPrdOrd(vEEduAplctVO.getPrcsOrd()); + vEPrcsDetailVO = vEPrcsAplctPrdService.selectDetailByOrd(vEPrcsDetailVO); + if(vEPrcsDetailVO != null) { + model.addAttribute("endPnttm", vEPrcsDetailVO.getEndPnttm()); + } //등록일이 과정신청기간에 포함 되는지 확인 - 신청기간에 포함되며 신청 단계의 경우 수정 기능 추가 int cnt = vEEduAplctService.selectCntAplctPrd(vEEduAplctVO); model.addAttribute("cnt", cnt); @@ -477,6 +482,126 @@ public class ExprnClsrmAplctController { } + /** + * 체험교실 대시보드 + */ + @RequestMapping("exprnClsrmAplctDashboard.do") + public String exprnClsrmAplctDashboard( @ModelAttribute("vEEduAplctVO") VEEduAplctVO vEEduAplctVO , ModelMap model , HttpServletRequest request ) throws Exception { + //현재 진행중인 체험교실 운영 조회 + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + String eduAplctOrd = vEEduAplctService.selectProceedingOrd(loginVO.getUniqId()); + + if(eduAplctOrd != null) { + //데이터 복호화 - VO 단위로 만들어서 사용 + vEEduAplctVO.setEduAplctOrd(eduAplctOrd); + vEEduAplctVO = vEEduAplctService.selectOprtnDetail(vEEduAplctVO); + vEEduAplctVO = egovCryptoUtil.decryptVEEduAplctVOInfo(vEEduAplctVO); + + model.addAttribute("info", vEEduAplctVO); + + //등록일이 과정신청기간에 포함 되는지 확인 - 신청기간에 포함되며 신청 단계의 경우 수정 기능 추가 + int cnt = vEEduAplctService.selectCntAplctPrd(vEEduAplctVO); + model.addAttribute("cnt", cnt); + } + return "/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDashboard"; + } + + /** + * 체험교실 대시보드 load + */ + @RequestMapping("exprnDashboardLoadAjax.do") + public String exprnDashboardLoadAjax( @ModelAttribute("vEEduAplctVO") VEEduAplctVO vEEduAplctVO , ModelMap model , HttpServletRequest request ) throws Exception { + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + + //탭 종류 + String Type = vEEduAplctVO.getLoadType(); + //기본데이터 불러오기 + vEEduAplctVO = vEEduAplctService.selectOprtnDetail(vEEduAplctVO); + //데이터 복호화 - VO 단위로 만들어서 사용 + vEEduAplctVO = egovCryptoUtil.decryptVEEduAplctVOInfo(vEEduAplctVO); + model.addAttribute("info", vEEduAplctVO); + + //접수종료일 조회 - 교육신청과정기간 종료일 + VEPrcsDetailVO vEPrcsDetailVO = new VEPrcsDetailVO(); + vEPrcsDetailVO.setPrcsAplctPrdOrd(vEEduAplctVO.getPrcsOrd()); + vEPrcsDetailVO = vEPrcsAplctPrdService.selectDetailByOrd(vEPrcsDetailVO); + if(vEPrcsDetailVO != null) { + model.addAttribute("endPnttm", vEPrcsDetailVO.getEndPnttm()); + } + if("1".equals(Type)) { //type1 - 신청정보 + return "/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnAplctDashboard"; + }else if("2".equals(Type)) { //type2 - 운영계획 + return "/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnPlanDashboard"; + }else if("3".equals(Type)) { //type3 - 거래선 + //거래선 파일 정보 가져오기 + FileVO fileVO = new FileVO(); + fileVO.setAtchFileId(vEEduAplctVO.getTransAtchFileId()); + List result = fileService.selectFileInfs(fileVO); + model.addAttribute("transFileList", result); + model.addAttribute("transFileListCnt", result.size()); + + //서약서 파일 정보 가져오기 + fileVO.setAtchFileId(vEEduAplctVO.getOathAtchFileId()); + result = fileService.selectFileInfs(fileVO); + model.addAttribute("oathFileList", result); + model.addAttribute("oathFileListCnt", result.size()); + + //계획서 파일 정보 가져오기 + fileVO.setAtchFileId(vEEduAplctVO.getPlanAtchFileId()); + result = fileService.selectFileInfs(fileVO); + model.addAttribute("planFileList", result); + model.addAttribute("planFileListCnt", result.size()); + return "/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnDocumentDashboard"; + }else if("4".equals(Type)) { //type4 - 결과보고 + FileVO fileVO = new FileVO(); + if(vEEduAplctVO.getOrgnlRsltAtchFileId() != null){ + fileVO.setAtchFileId(vEEduAplctVO.getOrgnlRsltAtchFileId()); + fileVO.setFileSn("0"); + vEEduAplctVO.setOrgnlRsltAtchFileDetail(fileService.selectFileInf(fileVO)); + } + if(vEEduAplctVO.getCpyRsltAtchFileId() != null){ + fileVO.setAtchFileId(vEEduAplctVO.getCpyRsltAtchFileId()); + fileVO.setFileSn("0"); + vEEduAplctVO.setCpyRsltAtchFileDetail(fileService.selectFileInf(fileVO)); + } + if(vEEduAplctVO.getEvdncPhtAtchFileId() != null){ + fileVO.setAtchFileId(vEEduAplctVO.getEvdncPhtAtchFileId()); + fileVO.setFileSn("0"); + vEEduAplctVO.setEvdncPhtAtchFileDetail(fileService.selectFileInf(fileVO)); + } + if(vEEduAplctVO.getRmtTrnAtchFileId() != null){ + fileVO.setAtchFileId(vEEduAplctVO.getRmtTrnAtchFileId()); + fileVO.setFileSn("0"); + vEEduAplctVO.setRmtTrnAtchFileDetail(fileService.selectFileInf(fileVO)); + } + return "/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnRprtDashboard"; + }else { //type5 - 최종결과 + + FileVO fileVO = new FileVO(); + if(vEEduAplctVO.getOrgnlRsltAtchFileId() != null){ + fileVO.setAtchFileId(vEEduAplctVO.getOrgnlRsltAtchFileId()); + fileVO.setFileSn("0"); + vEEduAplctVO.setOrgnlRsltAtchFileDetail(fileService.selectFileInf(fileVO)); + } + if(vEEduAplctVO.getCpyRsltAtchFileId() != null){ + fileVO.setAtchFileId(vEEduAplctVO.getCpyRsltAtchFileId()); + fileVO.setFileSn("0"); + vEEduAplctVO.setCpyRsltAtchFileDetail(fileService.selectFileInf(fileVO)); + } + if(vEEduAplctVO.getEvdncPhtAtchFileId() != null){ + fileVO.setAtchFileId(vEEduAplctVO.getEvdncPhtAtchFileId()); + fileVO.setFileSn("0"); + vEEduAplctVO.setEvdncPhtAtchFileDetail(fileService.selectFileInf(fileVO)); + } + if(vEEduAplctVO.getRmtTrnAtchFileId() != null){ + fileVO.setAtchFileId(vEEduAplctVO.getRmtTrnAtchFileId()); + fileVO.setFileSn("0"); + vEEduAplctVO.setRmtTrnAtchFileDetail(fileService.selectFileInf(fileVO)); + } + return "/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnRsltDashboard"; + } + } + //체험교실 운영신청 초기화 시 첨부파일 삭제 @RequestMapping(value = "/fmsfileMultipleDeleteAjax.do", method = RequestMethod.POST) public ModelAndView fmsfileMultipleDeleteAjax(@RequestBody FileVO fileVo) throws Exception { diff --git a/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/web/ExprnClsrmEndController.java b/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/web/ExprnClsrmEndController.java index 440a4ae6..f9c80d24 100644 --- a/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/web/ExprnClsrmEndController.java +++ b/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/web/ExprnClsrmEndController.java @@ -40,6 +40,8 @@ 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; @@ -146,6 +148,9 @@ public class ExprnClsrmEndController { @Resource(name = "egovQustnrRespondManageService") private EgovQustnrRespondManageService egovQustnrRespondManageService; + @Resource(name = "vEPrcsAplctPrdService") + private VEPrcsAplctPrdService vEPrcsAplctPrdService; + /** * 체험교실 완료목록 */ @@ -211,6 +216,13 @@ public class ExprnClsrmEndController { model.addAttribute("planFileListCnt", result.size()); model.addAttribute("info", vEEduAplctVO); + + VEPrcsDetailVO vEPrcsDetailVO = new VEPrcsDetailVO(); + vEPrcsDetailVO.setPrcsAplctPrdOrd(vEEduAplctVO.getPrcsOrd()); + vEPrcsDetailVO = vEPrcsAplctPrdService.selectDetailByOrd(vEPrcsDetailVO); + if(vEPrcsDetailVO != null) { + model.addAttribute("endPnttm", vEPrcsDetailVO.getEndPnttm()); + } return "/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndDetail"; } 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 2188d447..99d32a45 100644 --- a/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java +++ b/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java @@ -485,10 +485,14 @@ public class SspnIdtmtController { String id = sspnIdtmtService.findByTrgtNm(cndtnTrgtInfoMngVO); - - modelAndView.addObject("result", "success"); + String result=""; + if(StringUtils.isNotEmpty(id)) { + result = "success"; + } + modelAndView.addObject("result", result); modelAndView.addObject("id", id); + return modelAndView; } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctService.java index 30ea3a42..abd342b5 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctService.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctService.java @@ -45,4 +45,7 @@ public interface VEEduAplctService { int selectMngNoMax(VEEduAplctVO veEduAplctVO) throws Exception; int selectCntAplctPrd(VEEduAplctVO veEduAplctVO) throws Exception; + + //사용자 진행중인 체험교실 조회하기 + String selectProceedingOrd(String userId) throws Exception; } 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 eb43d708..5195329a 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 @@ -303,6 +303,8 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable { private String vs_clphone; //기소유예 대상자 폰번호 + private String lastYear; //불성실여부 작년 + public String getPrcsAplctPrdOrd() { return prcsAplctPrdOrd; @@ -356,8 +358,12 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable { private String adminInsert; //운영계획 필요 교재 수량 private String needTxtbNum; - - + //결과보고 제출 코드 + private String rprtAprvlCd; + //대시보드 load 타입 + private String loadType; + //전체 교육인원(결과보고 제출 시) + private String trgtPrsnlReal; public String getSpecialWorkAllow() { return specialWorkAllow; @@ -1539,6 +1545,31 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable { public void setVs_clphone(String vs_clphone) { this.vs_clphone = vs_clphone; } + public String getRprtAprvlCd() { + return rprtAprvlCd; + } + public void setRprtAprvlCd(String rprtAprvlCd) { + this.rprtAprvlCd = rprtAprvlCd; + } + public String getLoadType() { + return loadType; + } + public void setLoadType(String loadType) { + this.loadType = loadType; + } + public String getTrgtPrsnlReal() { + return trgtPrsnlReal; + } + public void setTrgtPrsnlReal(String trgtPrsnlReal) { + this.trgtPrsnlReal = trgtPrsnlReal; + } + public String getLastYear() { + return lastYear; + } + public void setLastYear(String lastYear) { + this.lastYear = lastYear; + } + } 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 49392d30..f1f01f56 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 @@ -270,5 +270,5 @@ public class VEEduOprtnVO extends ComDefaultVO implements Serializable { public void setNeedTxtbNum(String needTxtbNum) { this.needTxtbNum = needTxtbNum; } - + } 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 1ecf9fd7..8c04ff84 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 @@ -130,5 +130,9 @@ public class VEEduAplctDAO extends EgovAbstractDAO { public VEEduAplctVO findByAprvlCd(VEEduAplctVO vEEduAplctReqVO) { return (VEEduAplctVO) select("VEEduAplctDAO.findByAprvlCd", vEEduAplctReqVO); } + + public String selectProceedingOrd(String userId) { + return (String) select("VEEduAplctDAO.selectProceedingOrd", userId); + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduAplctServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduAplctServiceImpl.java index a2ae2a7b..4b7be46a 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduAplctServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduAplctServiceImpl.java @@ -158,4 +158,9 @@ public class VEEduAplctServiceImpl implements VEEduAplctService { public int selectCntAplctPrd(VEEduAplctVO veEduAplctVO) throws Exception { return vEEduAplctDAO.selectCntAplctPrd(veEduAplctVO); } + + @Override + public String selectProceedingOrd(String userId) throws Exception { + return vEEduAplctDAO.selectProceedingOrd(userId); + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailService.java index 19f9e87e..9d57ec8a 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailService.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailService.java @@ -2,6 +2,8 @@ package kcc.ve.instr.tngrVisitEdu.instrInfo.service; import java.util.List; +import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; + public interface VEInstrDetailService { //C @@ -41,5 +43,6 @@ public interface VEInstrDetailService { //EgovMap selectAdrRpplInfo(AdjstChangeDateVO adjstChangeDateVO) throws Exception; //List selectPagingList(AdjstChangeDateVO adjstChangeDateVO) throws Exception; - + + VEInstrDetailVO selectLastYearDetail(VEEduAplctVO vEEduAplctVO) throws Exception; } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailVO.java index c057abb5..6d9fc633 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailVO.java @@ -134,6 +134,7 @@ public class VEInstrDetailVO extends ComDefaultVO implements Serializable { private String unfthYn; // 불성실여부 private String extraPayYn; // 수당지급여부 private String rmrks; // 비고 + private String rprtScore; // 보고서 평가 //강사거리 private String onewayDstnc; @@ -803,5 +804,11 @@ public class VEInstrDetailVO extends ComDefaultVO implements Serializable { public void setSigMemo(String sigMemo) { this.sigMemo = sigMemo; } + public String getRprtScore() { + return rprtScore; + } + public void setRprtScore(String rprtScore) { + this.rprtScore = rprtScore; + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailDAO.java index c2a79f89..dd24231d 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailDAO.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; @Repository("vEInstrDetailDAO") @@ -104,4 +105,7 @@ public class VEInstrDetailDAO extends EgovAbstractDAO { } */ + public VEInstrDetailVO selectLastYearDetail(VEEduAplctVO vEEduAplctVO) throws Exception { + return (VEInstrDetailVO) select("VEInstrDetailDAO.selectLastYearDetail", vEEduAplctVO); + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailServiceImpl.java index 96f9390e..d3a37e11 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailServiceImpl.java @@ -8,6 +8,8 @@ import javax.annotation.Resource; import org.springframework.stereotype.Service; import egovframework.rte.fdl.idgnr.EgovIdGnrService; +import kcc.com.cmm.service.impl.FileManageDAO; +import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailService; import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO; @@ -22,6 +24,9 @@ public class VEInstrDetailServiceImpl implements VEInstrDetailService { @Resource(name = "instrDetailGnrService") private EgovIdGnrService instrDetailGnrService; + //첨부파일 + @Resource(name = "FileManageDAO") + private FileManageDAO fileMngDAO; //C public void insert(VEInstrDetailVO vEInstrDetailVO) throws Exception { @@ -90,7 +95,8 @@ public class VEInstrDetailServiceImpl implements VEInstrDetailService { return vEInstrDetailDAO.updateInstrSigMemo(vEInstrDetailVO); } - - + public VEInstrDetailVO selectLastYearDetail(VEEduAplctVO vEEduAplctVO) throws Exception { + return vEInstrDetailDAO.selectLastYearDetail(vEEduAplctVO); + } } 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 b29fe11b..fee9d320 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 @@ -42,5 +42,7 @@ public interface VEPrcsAplctPrdService { List findByAprvlList(VEPrcsDetailVO vEPrcsDetailVO); Map findAllDashboardCnt(VEPrcsDetailVO vEPrcsDetailVO); + + VEPrcsDetailVO selectDetailByOrd(VEPrcsDetailVO vEPrcsDetailVO) throws Exception; } 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 1dca6aa5..1cb6ec38 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 @@ -100,5 +100,8 @@ public class VEPrcsAplctPrdDAO extends EgovAbstractDAO { return (Map) select("VEPrcsAplctPrdDAO.findAllDashboardCnt", vEPrcsDetailVO); } + public VEPrcsDetailVO selectDetailByOrd(VEPrcsDetailVO vEPrcsDetailVO) throws Exception { + return (VEPrcsDetailVO) select("VEPrcsAplctPrdDAO.selectDetailByOrd", 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 bacdb13e..bf726525 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 @@ -100,4 +100,7 @@ public class VEPrcsAplctPrdServiceImpl implements VEPrcsAplctPrdService { return vEPrcsAplctPrdDAO.findAllDashboardCnt(vEPrcsDetailVO); } + public VEPrcsDetailVO selectDetailByOrd(VEPrcsDetailVO vEPrcsDetailVO) throws Exception { + return vEPrcsAplctPrdDAO.selectDetailByOrd(vEPrcsDetailVO); + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/rprtInfo/service/VEEduRprtVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/rprtInfo/service/VEEduRprtVO.java index 1f4d5e2f..08988ffb 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/rprtInfo/service/VEEduRprtVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/rprtInfo/service/VEEduRprtVO.java @@ -49,6 +49,8 @@ public class VEEduRprtVO extends ComDefaultVO implements Serializable { private String userId; // 강사ID + private String rprtFileType;// 결과보고 첨부파일 종류 + public String getUserId() { return userId; } @@ -199,5 +201,11 @@ public class VEEduRprtVO extends ComDefaultVO implements Serializable { public void setOrderByQuery(String orderByQuery) { this.orderByQuery = orderByQuery; } + public String getRprtFileType() { + return rprtFileType; + } + public void setRprtFileType(String rprtFileType) { + this.rprtFileType = rprtFileType; + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/rprtInfo/service/VEEduRsltRprtService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/rprtInfo/service/VEEduRsltRprtService.java index 73a4aa1c..ebca0c62 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/rprtInfo/service/VEEduRsltRprtService.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/rprtInfo/service/VEEduRsltRprtService.java @@ -2,6 +2,9 @@ package kcc.ve.instr.tngrVisitEdu.rprtInfo.service; import java.util.List; +import kcc.com.cmm.service.FileVO; +import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduOprtnVO; + public interface VEEduRsltRprtService { //C @@ -21,5 +24,8 @@ public interface VEEduRsltRprtService { //Page List List selectPagingList(VEEduRprtVO paramVO) throws Exception; - + + //결과보고 첨부파일 삭제 처리 + public void deleteRsltRprtFileInf(FileVO fileVO, VEEduRprtVO vEEduRprtVO) throws Exception; + } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/rprtInfo/service/impl/VEEduRsltRprtDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/rprtInfo/service/impl/VEEduRsltRprtDAO.java index d2ea375d..157909bf 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/rprtInfo/service/impl/VEEduRsltRprtDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/rprtInfo/service/impl/VEEduRsltRprtDAO.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.VEEduOprtnVO; import kcc.ve.instr.tngrVisitEdu.rprtInfo.service.VEEduRprtVO; @Repository("vEEduRsltRprtDAO") @@ -66,4 +67,8 @@ public class VEEduRsltRprtDAO extends EgovAbstractDAO { return tlist; } + public int updateNullFile(VEEduRprtVO vEEduRprtVO) throws Exception { + return update("VEEduRsltRprtDAO.updateNullFile", vEEduRprtVO); + } + } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/rprtInfo/service/impl/VEEduRsltRprtServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/rprtInfo/service/impl/VEEduRsltRprtServiceImpl.java index 9f855bb2..b1cb1bd7 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/rprtInfo/service/impl/VEEduRsltRprtServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/rprtInfo/service/impl/VEEduRsltRprtServiceImpl.java @@ -1,12 +1,16 @@ package kcc.ve.instr.tngrVisitEdu.rprtInfo.service.impl; +import java.io.File; import java.util.List; import javax.annotation.Resource; import org.springframework.stereotype.Service; +import kcc.com.cmm.service.FileVO; +import kcc.com.cmm.service.impl.FileManageDAO; +import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduOprtnVO; import kcc.ve.instr.tngrVisitEdu.rprtInfo.service.VEEduRprtVO; import kcc.ve.instr.tngrVisitEdu.rprtInfo.service.VEEduRsltRprtService; @@ -17,6 +21,9 @@ public class VEEduRsltRprtServiceImpl implements VEEduRsltRprtService { @Resource(name="vEEduRsltRprtDAO") private VEEduRsltRprtDAO vEEduRsltRprtDAO; + //첨부파일 + @Resource(name = "FileManageDAO") + private FileManageDAO fileMngDAO; //C public void insert(VEEduRprtVO paramVO) throws Exception { @@ -49,4 +56,17 @@ public class VEEduRsltRprtServiceImpl implements VEEduRsltRprtService { return vEEduRsltRprtDAO.selectPagingList(paramVO); } + public void deleteRsltRprtFileInf(FileVO fileVO, VEEduRprtVO vEEduRprtVO) throws Exception { + //결과 보고 첨부파일 ID 삭제 처리 + vEEduRsltRprtDAO.updateNullFile(vEEduRprtVO); + + //파일 삭제처리 + FileVO returnFileVO = new FileVO(); + returnFileVO = fileMngDAO.selectFileInf(fileVO); + if(returnFileVO !=null) { + File delFile = new File(returnFileVO.getFileStreCours()+returnFileVO.getStreFileNm()); + delFile.delete(); + } + fileMngDAO.deleteFileInf(fileVO); //DB삭제 + } } diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java index e9a4431d..ef83435c 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java @@ -174,7 +174,6 @@ public class CndtnTrgtMngController { //3.pageing step3 paginationInfo = this.setCndtnPagingStep3(cndtnTrgtInfoMngVOList, paginationInfo); - System.out.println("paginationInfo :: "+ paginationInfo.getTotalRecordCount()); model.addAttribute("paginationInfo", paginationInfo); 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 e3dfffc5..b73667af 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 @@ -192,8 +192,12 @@ public class OprtnAplctMngServiceImpl implements OprtnAplctMngService { //step3.파일 처리==================================== 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); 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 cf42346b..eff8a55f 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 @@ -9,6 +9,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.PrintWriter; import java.net.URLEncoder; +import java.time.LocalDate; import java.util.ArrayList; import java.util.List; import java.util.Locale; @@ -158,6 +159,13 @@ public class OprtnAplctMngController { vEEduAplctVO.setMenuNo(session.getAttribute("menuNo").toString()); //List vEEduAplctVOList = vEEduMIXService.selectPagingList(vEEduAplctVO); vEEduAplctVO.setLctrDivCd("30"); + + //작년도 불성실 여부 조건 + LocalDate now = LocalDate.now(); + int nowYear = now.getYear(); + String lastYear = Integer.toString(nowYear-1); + vEEduAplctVO.setLastYear(lastYear); + List vEEduAplctVOList = vEEduMIXService.selectExprnPagingList(vEEduAplctVO); //List복호화 vEEduAplctVOList = egovCryptoUtil.decryptVEEduAplctVOList(vEEduAplctVOList); @@ -233,6 +241,13 @@ public class OprtnAplctMngController { model.addAttribute("info", vEEduAplctVO); + //접수종료일 조회 - 교육신청과정기간 종료일 + VEPrcsDetailVO vEPrcsDetailVO = new VEPrcsDetailVO(); + vEPrcsDetailVO.setPrcsAplctPrdOrd(vEEduAplctVO.getPrcsOrd()); + vEPrcsDetailVO = vEPrcsAplctPrdService.selectDetailByOrd(vEPrcsDetailVO); + if(vEPrcsDetailVO != null) { + model.addAttribute("endPnttm", vEPrcsDetailVO.getEndPnttm()); + } //20220223 우영두 추가 //강의내역 NOTI 입력 VEAsgnmNotiVO vEAsgnmNotiVO = new VEAsgnmNotiVO(); 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 7fbc6902..e7a2b420 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 @@ -1,5 +1,6 @@ package kcc.ve.oprtn.cpyrgExprnClsrm.oprtnStateMng.web; +import java.time.LocalDate; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -13,6 +14,7 @@ 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.bind.annotation.RequestParam; import org.springframework.web.servlet.ModelAndView; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; @@ -20,6 +22,7 @@ import kcc.com.cmm.LoginVO; import kcc.com.cmm.service.EgovFileMngService; import kcc.com.cmm.service.EgovFileMngUtil; import kcc.com.cmm.service.FileVO; +import kcc.com.uss.ion.fms.service.FmsFileVO; import kcc.com.utl.user.service.CheckLoginUtil; import kcc.let.uss.olp.qri.service.EgovQustnrRespondInfoService; import kcc.let.uss.olp.qri.service.QustnrRespondInfoVO; @@ -191,6 +194,7 @@ public class OprtnStateMngController { //로그인 처리==================================== + //기본데이터 불러오기 vEEduAplctVO = vEEduAplctService.selectOprtnDetail(vEEduAplctVO); @@ -199,13 +203,15 @@ public class OprtnStateMngController { model.addAttribute("info", vEEduAplctVO); - + // 결과보고 VEEduRprtVO vEEduRprtVOInfo = new VEEduRprtVO(); vEEduRprtVOInfo.setEduAplctOrd(vEEduAplctVO.getEduAplctOrd()); vEEduRprtVOInfo = vEEduRsltRprtService.selectDetail(vEEduRprtVOInfo); model.addAttribute("resultInfo",vEEduRprtVOInfo); + + // 첨부파일 조회 int fileCnt = 0; List result = null; @@ -229,7 +235,14 @@ public class OprtnStateMngController { model.addAttribute("vEInstrDetailVO",vEInstrDetailVO); - + //작년도 선정교사 정보 + LocalDate now = LocalDate.now(); + int nowYear = now.getYear(); + String lastYear = Integer.toString(nowYear-1); + vEEduAplctVO.setLastYear(lastYear); + VEInstrDetailVO lastVEInstrDetailVO = vEInstrDetailService.selectLastYearDetail(vEEduAplctVO); + model.addAttribute("lastVEInstrDetailVO",lastVEInstrDetailVO); + return "oprtn/cpyrgExprnClsrm/oprtnStateMngDetail"; } @@ -452,6 +465,31 @@ public class OprtnStateMngController { } + /* 관리자 결과보고 첨부파일 삭제 */ + @RequestMapping(value = "rsltRprtfileDeleteAjax.do") + public ModelAndView fmsfileDeleteAjax( + FmsFileVO fmsFileVO, + @ModelAttribute("fileVO") FileVO fileVO, + VEEduRprtVO vEEduRprtVO + ) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + + vEEduRprtVO.setLastUpdusrId(loginVO.getUniqId()); + try { + vEEduRsltRprtService.deleteRsltRprtFileInf(fileVO, vEEduRprtVO); + modelAndView.addObject("result", "success"); + }catch (Exception e) { + modelAndView.addObject("result", "fail"); + System.out.println("Exception Occured!!!"); + return modelAndView; + } + return modelAndView; + } + //페이징을 위한 처리 step1 - 페이징 기본 정보 설정 private PaginationInfo setPagingStep1( VEEduAplctVO p_vEEduAplctVO 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 77fee4fe..b08a251b 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 @@ -72,7 +72,7 @@ #sspnIdtmtTrgtOrd# , #userId# , #eduStateCd# - , now() + , SYSDATE , #frstRegisterId# , #lastUpdtPnttm# , #lastUpdusrId# 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 27df1027..31ab2905 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 @@ -396,6 +396,7 @@ , C.evdnc_pht_atch_file_id AS evdncPhtAtchFileId , C.rmt_trn_atch_file_id AS rmtTrnAtchFileId , C.frst_regist_pnttm AS cpyrprtSbmtDt + , C.trgt_prsnl_real AS trgtPrsnlReal ,(SELECT F.qustnr_respond_id FROM @@ -1157,4 +1158,20 @@ 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/VEEdu_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml index c83cc38b..41c1f254 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 @@ -300,6 +300,8 @@ , A.CORPS_EDU AS corpsEdu , A.BROADROOM_EDU AS broadroomEdu , A.ADMIN_UPDT_YN AS adminUpdtYn + , A.OATH_ATCH_FILE_ID AS oathAtchFileId + , A.PLAN_ATCH_FILE_ID AS planAtchFileId ,( SELECT MAX(S2.PRCS_NM)|| @@ -340,6 +342,7 @@ , E.OPRTN_STRT_DT AS oprtnStrtDt , E.OPRTN_END_DT AS oprtnEndDt , E.OPRTN_FILE_ID AS oprtnFileId + , H.APRVL_CD AS rprtAprvlCd , ( SELECT S3.end_pnttm @@ -2794,6 +2797,7 @@ INTO ve_edu_rslt_rprt ,cpy_rslt_atch_file_id ,evdnc_pht_atch_file_id ,rmt_trn_atch_file_id + ,trgt_prsnl_real ,frst_regist_pnttm ,frst_register_id @@ -2810,6 +2814,7 @@ VALUES , #cpyRsltAtchFileId# , #evdncPhtAtchFileId# , #rmtTrnAtchFileId# +, #trgtPrsnlReal# , SYSDATE , #frstRegisterId# @@ -3524,6 +3529,7 @@ VALUES rmt_trn_atch_file_id = #rmtTrnAtchFileId#, + trgt_prsnl_real = #trgtPrsnlReal#, last_updusr_id = #lastUpdusrId#, last_updt_pnttm = SYSDATE WHERE @@ -3586,15 +3592,27 @@ VALUES LEFT OUTER JOIN VE_EDU_OPRTN C ON A.EDU_APLCT_ORD = C.EDU_APLCT_ORD LEFT JOIN ( - SELECT MAX(dd.edu_aplct_ord) AS edu_aplct_ord - FROM ve_edu_aplct dd - JOIN ve_edu_scltn_teacher ddd - ON dd.edu_aplct_ord = ddd.edu_aplct_ord - GROUP BY dd.FRST_REGISTER_ID - ) dddd - ON a.EDU_APLCT_ORD = dddd.EDU_APLCT_ORD - LEFT JOIN ve_edu_scltn_teacher D - ON D.EDU_APLCT_ORD = dddd.EDU_APLCT_ORD + SELECT + DD.EDU_APLCT_ORD, DD.UNFTH_YN, DDD.USER_ID + FROM + VE_EDU_SCLTN_TEACHER DD + LEFT JOIN + VE_EDU_APLCT DDD + ON + DD.EDU_APLCT_ORD = DDD.EDU_APLCT_ORD + WHERE + DD.EDU_APLCT_ORD IN( + SELECT + MAX(EDU_APLCT_ORD) + FROM + VE_EDU_APLCT + WHERE + TO_CHAR(SBMT_PNTTM,'YYYY') = #lastYear# + GROUP BY + USER_ID) + + )D + ON a.USER_ID = D.USER_ID WHERE 1=1 A.lctr_div_cd = #lctrDivCd# diff --git a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetail_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetail_SQL_Tibero.xml index 5ae9bfdc..848dfa72 100644 --- a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetail_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetail_SQL_Tibero.xml @@ -505,7 +505,7 @@ ,rmrks ,frst_regist_pnttm ,frst_register_id - + ,rprt_score )VALUES( #eduAplctOrd#, #divCd#, @@ -514,7 +514,8 @@ #extraPayYn#, #rmrks#, SYSDATE, - #frstRegisterId# + #frstRegisterId#, + #rprtScore# ) @@ -537,6 +538,7 @@ ,a.unfth_yn AS unfthYn ,a.extra_pay_yn AS extraPayYn ,a.rmrks AS rmrks + ,a.rprt_score AS rprtScore ,TO_CHAR(a.frst_regist_pnttm,'YYYY-MM-DD') AS frstRegistPnttm ,a.frst_register_id AS frstRegisterId FROM @@ -573,5 +575,25 @@ AND INSTR_DIV = #instrDiv# - + + diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEAPrcsAplctPrdInstrAsgnm_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEAPrcsAplctPrdInstrAsgnm_SQL_Tibero.xml index 46fb7a61..ae7f8e87 100644 --- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEAPrcsAplctPrdInstrAsgnm_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEAPrcsAplctPrdInstrAsgnm_SQL_Tibero.xml @@ -121,8 +121,7 @@ UPDATE VE_EDU_APLCT SET aprvl_cd = #aprvlCd# - WHERE prcs_aplct_prd_ord = #prcsAplctPrdOrd# - AND edu_aplct_ord IN + WHERE edu_aplct_ord IN #eduAplctOrdList[]# @@ -134,8 +133,7 @@ UPDATE VEA_APLCT_DETAIL_INFO SET aplct_state_cd = #aplctStateCd# - WHERE prcs_aplct_prd_ord = #prcsAplctPrdOrd# - AND edu_aplct_ord IN + WHERE edu_aplct_ord IN #eduAplctOrdList[]# 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 44ddaa68..61bb6fd9 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 @@ -615,5 +615,38 @@ a.lctr_div_cd = #lctrDivCd# AND a.user_id = #userId# - + + diff --git a/src/main/resources/egovframework/sqlmap/ve/rprt/VEEduRsltRprt_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/rprt/VEEduRsltRprt_SQL_Tibero.xml index 2c49f623..a225182e 100644 --- a/src/main/resources/egovframework/sqlmap/ve/rprt/VEEduRsltRprt_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/rprt/VEEduRsltRprt_SQL_Tibero.xml @@ -249,4 +249,28 @@ + + + UPDATE + + SET + APRVL_CD = '230' + ,LAST_UPDT_PNTTM = SYSDATE + ,LAST_UPDUSR_ID = #lastUpdusrId# + + ,ORGNL_RSLT_ATCH_FILE_ID = null + + + ,CPY_RSLT_ATCH_FILE_ID = null + + + ,EVDNC_PHT_ATCH_FILE_ID = null + + + ,RMT_TRN_ATCH_FILE_ID = null + + + WHERE + edu_aplct_ord = #eduAplctOrd# + diff --git a/src/main/webapp/WEB-INF/decorators.xml b/src/main/webapp/WEB-INF/decorators.xml index 7aed2f4e..0535ab3d 100644 --- a/src/main/webapp/WEB-INF/decorators.xml +++ b/src/main/webapp/WEB-INF/decorators.xml @@ -155,6 +155,8 @@ */kccadr/oprtn/cpyrgExprnClsrm/cautionGuidePreView.do + */kccadr/oprtn/cpyrgExprnClsrm/popup/slctnTeacherPopup.do + diff --git a/src/main/webapp/WEB-INF/jsp/cmm/fms/selectRsltRprtFile.jsp b/src/main/webapp/WEB-INF/jsp/cmm/fms/selectRsltRprtFile.jsp new file mode 100644 index 00000000..29fcced5 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/cmm/fms/selectRsltRprtFile.jsp @@ -0,0 +1,93 @@ +<%@ 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"%> +<% + +/** + * @Class Name : selectScholSealInfs.jsp + * @Description : 파일 목록화면 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ---------- ------ --------------------------- + * @ 2009.03.26 이삼섭 최초 생성 + * @ 2011.07.20 옥찬우 Tag id속성 추가( Line : 68 ) + * + * @author 공통서비스 개발팀 이삼섭 + * @since 2009.03.26 + * @version 1.0 + * @see + * + */ +%> + + + + + + + + + + + + + ','')" class="file_download_a" title="다운로드" style="display:inline-block;"> + + + ','', ''); return false;" alt="첨부파일"> +
+ + + + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp index b30442a5..29220534 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp @@ -342,9 +342,9 @@ - <%--
+
-
--%> +
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtReg.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtReg.jsp index 01f57f7b..335ae884 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtReg.jsp @@ -31,7 +31,7 @@ + +
+ " /> + +
+
" /> @@ -332,8 +363,10 @@

결과보고서 원본

- + + + @@ -342,8 +375,10 @@

결과보고서 평가용

- + + + @@ -352,8 +387,10 @@

증빙사진

- + + + @@ -362,8 +399,10 @@

원격연수 이수증

- + + + @@ -408,16 +447,12 @@
- - + + + + - - - - + + + + + + + + + + +
-

수상이력

-

불성실 여부

@@ -431,6 +466,52 @@

+ 		+

전년도 불성실 여부

+ 		+

+ + 불성실 + 성실 + - + +

+
+

보고서 평가

+ 		+

+ + 상 + 중 + 하 + - + +

+ 		+

전년도 보고서 평가

+ 		+

+ + 상 + 중 + 하 + - + +

+
+

수상이력

+
@@ -457,6 +538,30 @@
+ +
+

비공개 메모

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

내용

+ 		+
+ + +
+
+
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnStateMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnStateMngList.jsp index 984090b7..c64dd337 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnStateMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnStateMngList.jsp @@ -271,27 +271,33 @@ - <%-- --%> + + - - 운영신청 + + 운영진행 - - 수정요청 - - - 수정완료 + + 운영종료 - 운영확정 + 운영확정 - - 운영미확정 + + 운영취소 - - + - + + + (결과보고) + + + (서류제출) + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/popup/slctnTeacherPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/popup/slctnTeacherPopup.jsp index 61c12b9a..b81d2662 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/popup/slctnTeacherPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/popup/slctnTeacherPopup.jsp @@ -7,6 +7,7 @@ <%@ 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"%> + @@ -59,6 +60,11 @@ return false; } + if (!$('input:radio[name=rprtScore]').is(':checked')) { + alert("보고서 평가를 선택해주세요."); + return false; + } + if ($("[name='rmrks']").val() == '') { alert("비고를 입력해주세요."); @@ -104,6 +110,23 @@
+
+

보고서 평가${vEInstrDetailVO.extraPayYn}

+
+
+
+ checked> + +
+
+ checked> + +
+
+ checked> + +
+

비고

diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndDetail.jsp index 1be7497f..8f5f1b91 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndDetail.jsp @@ -283,15 +283,7 @@

접수종료일

- - - - - - - - - - + @@ -701,6 +693,14 @@ + + +

전체 교육인원

+ + + ${info.trgtPrsnlReal} + + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndList.jsp index 966439da..0e1c8b0c 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndList.jsp @@ -128,26 +128,32 @@ + + - - 운영신청 + + 운영진행 - - 수정요청 - - - 수정완료 + + 운영종료 운영확정 - - 운영미확정 + + 운영취소 - - + + + + (결과보고) + + + (서류제출) + @@ -197,25 +203,30 @@ 처리상태 - - 운영신청 + + 운영진행 - - 수정요청 - - - 수정요청완료 + + 운영종료 - 교육확정 + 운영확정 - - 교육미확정 + + 운영취소 - + + + (결과보고) + + + (서류제출) + + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndRslt.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndRslt.jsp index 96131cd1..50295a61 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndRslt.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndRslt.jsp @@ -298,6 +298,7 @@ var sendData = { "eduAplctOrd": $('#eduAplctOrd').val() , "aprvlCd" : $('#aprvlCd').val() //결과제출 - 10, 임시제출 - 230 + , "trgtPrsnlReal" : $('#trgtPrsnlRealTxt').val() , "innorixFileListVO": data , "successMsg" : "제출 완료되었습니다." } @@ -359,6 +360,7 @@ var sendData = { "eduAplctOrd": $('#eduAplctOrd').val() , "aprvlCd" : $('#aprvlCd').val() + , "trgtPrsnlReal" : $('#trgtPrsnlRealTxt').val() , "successMsg" : "제출 완료되었습니다." } if(fn_innorixCmmAjax(sendData, url) == "OK") @@ -405,6 +407,7 @@ document.getElementById('aprvlCd').value = '230'; + document.getElementById('trgtPrsnlReal').value = $("trgtPrsnlRealTxt").val() //업로드 경로 설정 -upload.jsp에서 uploader.setDirectory(innoDirPath) 식으로 사용 //230810 기준 : innoDirPath = globals_local.properties = /usr/local/tomcat/file/sht/ 경로지만 //upload.jsp에서 /app/doc/offedu/sht/로 다시 set. context-properties.xml에서 파일 경로도 /app/doc/offedu/sht/ @@ -418,6 +421,7 @@ + " /> @@ -523,6 +527,13 @@ +
+
전체 교육인원
+
+ + +
+
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnAplctDashboard.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnAplctDashboard.jsp new file mode 100644 index 00000000..b9fdf932 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnAplctDashboard.jsp @@ -0,0 +1,281 @@ +<%@ 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="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> + +<% pageContext.setAttribute("replaceChar", "\n"); %> + + + + + + + + + +
+
+
+

운영신청 상세

+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
운영신청 상세 (th 명)을 보여주는 표
+

신청일

+ 		+ + + + + + + - + + + +

접수종료일

+ 		+ +
+

신청일

+ 		+ + + + + + + - + + +
+

접수종료일

+ 		+ + + + + + + - + + +
+

처리상태

+ 		+ + + 운영신청 + + + 수정요청 + + + 수정요청완료 + + + 교육확정 + + + 교육미확정 + + + - + + +
+

반려사유

+ 		${info.aprvlCn}
+
+ +
+
+

신청자 정보

+
+ <%-- +
+ +
+ --%> +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

학교(기관)명

+ 		${info.scholInsttNm}
+

학교지역특성

+ 		+ checked /> + checked /> + checked /> + checked /> +
+

교사명

+ 		${info.chrgNm}
+

성별

+ 		+ +
+

이메일

+ 		${info.email}
+

휴대폰

+ 		${info.clphone}
+

전화

+ 		${info.phone}
+

주소

+ 		(${info.post}) ${info.addr} ${info.addrDetail}
+

담당교과

+ 		${info.chrgMjr}
+

생년월일

+ 		+ + + + + + ${birthYear}년 ${birthMonth}월 ${birthDay}일 +
+

체험교실운영여부

+ 		+ 운영구분코드 :
+ 운영구분년도 : ${info.exprnClsrnYear} +
+

신청경로

+ 		+ + +    (기타 내용 : ${info.exprnClsrnAplctCn}) + + +
+
+ + +
+
+
+
+
+
+ + + + + + + +
+
+
+ diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDashboard.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDashboard.jsp new file mode 100644 index 00000000..7d2ea2a0 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDashboard.jsp @@ -0,0 +1,75 @@ +<%@ 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="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> + +<% pageContext.setAttribute("replaceChar", "\n"); %> + + + + + + + + + + +
+
+

체험교실 대시보드

+
+ + +
+ +
+
+ diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDetail.jsp index b5423352..77dee52c 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDetail.jsp @@ -162,15 +162,7 @@

접수종료일

- - - - - - - - - - + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctList.jsp index 422efc3a..2f3ccb50 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctList.jsp @@ -154,17 +154,8 @@ - - - <%-- - - - - - - - - - --%> + + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctReg.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctReg.jsp index 68e167b8..fe3c931b 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctReg.jsp @@ -968,7 +968,7 @@ - + <%-- diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnDocumentDashboard.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnDocumentDashboard.jsp new file mode 100644 index 00000000..b66f5df3 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnDocumentDashboard.jsp @@ -0,0 +1,129 @@ +<%@ 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="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> + +<% pageContext.setAttribute("replaceChar", "\n"); %> + + + + + + + + + + + " /> + " /> + " /> + + + + + + + +
+
+
+

거래선 및 서약서 정보

+
+
+
+ + + + + + + + + + + + + + + + +
거래선 및 서약서 (th 명)을 보여주는 표

거래선 양식

 + +

+ ※ 거래선 파일은 개인정보 수집 및 보호를 위해 반드시 메일(entt@copyright.or.kr)로 제출하시기 바랍니다. +

+

서약서 제출

 + + + + + + + + + + + + +
+
+ +
+
+
+
+
+
+
+
+
+
+ + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnPlanDashboard.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnPlanDashboard.jsp new file mode 100644 index 00000000..f295b7b9 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnPlanDashboard.jsp @@ -0,0 +1,184 @@ +<%@ 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="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> + + + + +<% pageContext.setAttribute("replaceChar", "\n"); %> + + + + + + + + + +
+
+
+

운영계획

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

대상학년

+ 		${info.trgtGrade} +

대상반

+ 		${info.trgtClsrm}
+

대상학년

+ 		${info.trgtGrade}
+

대상반

+ 		${info.trgtClsrm}
+

대상학생수

+ 		+ ${info.trgtPrsnl} + +

운영시기

+ 		+ + + ~ + + +
+

대상학생수

+ 		+ ${info.trgtPrsnl} +
+

운영시기

+ 		+ + + ~ + + +
+

필요 교재 수량

+ 		+ ${info.needTxtbNum} +
+

필요 교재 수량

+ 		+ ${info.needTxtbNum} +
+

첨부파일

+ 		+ + + +

차시별 계획서 제출

 + + + + + + + +
+
+ +
+
+
+
+
+
+ + + + + + + +
+
+
+ diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnRprtDashboard.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnRprtDashboard.jsp new file mode 100644 index 00000000..4495e09e --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnRprtDashboard.jsp @@ -0,0 +1,610 @@ +<%@ 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="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> + +<% pageContext.setAttribute("replaceChar", "\n"); %> + + + + + + + + + + + + + + + " /> + + + +
+
+
+

결과보고

+
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
결과보고 (th 명)을 보여주는 표
+

결과보고서 원본

+ 		+ + + +
+

결과보고서 평가용

+ 		+ + + +
+

증빙사진

+ 		+ + + +
+

원격연수 이수증

+ 		+ + + +
+

전체 교육인원

+ 		+ ${info.trgtPrsnlReal} +
+
+ + +
+
+ ※ 업로드 가능한 용량은 전체 파일을 합산한 기준으로 500MB 제한이 있습니다. +
    용량을 초과할 경우, 오류 발생으로 인해 업로드가 되지 않으니 유의하시기 바랍니다. +
+
+
+
+

필수입력 항목*

원본 결과보고서
+
+
+ + + + +
+

+
+
+

최대 1개

+
+
+

등록된 파일 0개

+ 0MB +
+
+
+
+ +
+

필수입력 항목*

평가용 결과보고서
+
+
+ + + + +
+

+
+
+

최대 1개

+
+
+

등록된 파일 0개

+ 0MB +
+
+
+
+
+

필수입력 항목*

증빙사진
+
+
+ + + + +
+

+
+
+

최대 1개

+
+
+

등록된 파일 0개

+ 0MB +
+
+
+
+
+
원격연수 이수증
+
+
+ + + + +
+

+
+
+

최대 1개

+
+
+

등록된 파일 0개

+ 0MB +
+
+
+
+
+
전체 교육인원
+
+ + +
+
+
+ +
+
+
+ + +
+
+ +
+
+ +
+ diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnRsltDashboard.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnRsltDashboard.jsp new file mode 100644 index 00000000..0af39958 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnRsltDashboard.jsp @@ -0,0 +1,714 @@ +<%@ 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="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> + +<% pageContext.setAttribute("replaceChar", "\n"); %> + + + + + + + + + + + " /> + " /> + " /> + + + + + + + +
+
+ +
+
+ +
+
+
+

운영내역 상세

+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
운영내역 상세 (th 명)을 보여주는 표
+

신청일

+ 		+ + + + + + + - + + + +

접수종료일

+ 		+ +
+

처리상태

+ 		+ + + 교육신청 + + + 교육승인 + + + 교육반려 + + + 교육취소 + + + 선정완료 + + + 수정요청 + + + 수정요청완료 + + + 교육확정 + + + 임시저장 + + +
+

반려사유

+ 		${info.aprvlCn}
+
+ +
+
+

신청자 정보

+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
신청자 정보 (th 명)을 보여주는 표
+

학교(기관)명

+ 		${info.scholInsttNm}
+

교사명

+ 		${info.chrgNm}
+

성별

+ 		+ +
+

이메일

+ 		${info.email}
+

휴대폰

+ 		${info.clphone}
+

전화

+ 		${info.phone}
+

주소

+ 		(${info.post}) ${info.addr} ${info.addrDetail}
+

담당교과

+ 		${info.chrgMjr}
+

생년월일

+ 		+ + + + + + ${birthYear}년 ${birthMonth}월 ${birthDay}일 +
+

체험교실운영여부

+ 		+ 운영구분코드 :
+ 운영구분년도 : ${info.exprnClsrnYear} +
+

신청경로

+ 		+ + +    (기타 내용 : ${info.exprnClsrnAplctCn}) + + +

거래선 양식

 + + <%-- + + + + + + + + + + + + --%> + +

+ ※ 거래선 파일은 개인정보 수집 및 보호를 위해 반드시 메일(entt@copyright.or.kr)로 제출하시기 바랍니다. +

+

서약서 제출

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

운영계획

+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
운영계획 (th 명)을 보여주는 표
+

대상학년

+ 		${info.trgtGrade} +

대상반

+ 		${info.trgtClsrm}
+

대상학생수

+ 		+ ${info.trgtPrsnl} + +

운영시기

+ 		+ + + ~ + + +
+

필요 교재 수량

+ 		+ ${info.needTxtbNum} +
+

첨부파일

+ 		+ + + +

차시별 계획서 제출

 + + + + + + + +
+
+ + + <%--
+
+

설문조사

+
+
+
+ + + + + + + + + + + + + + + + + + + + + + +
결과보고 (th 명)을 보여주는 표
+

사전 설문조사

+ 		+ + + + + + + + + +

설문지 보기

+ 		+ +
+

사후 설문조사

+ 		+ + + + + + + + + +

설문지 보기

+ 		+ +
+
--%> + +
+
+

결과보고

+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
결과보고 (th 명)을 보여주는 표
+

결과보고서 원본

+ 		+ + + +
+

결과보고서 평가용

+ 		+ + + +
+

증빙사진

+ 		+ + + +
+

원격연수 이수증

+ 		+ + + +
+

전체 교육인원

+ 		+ ${info.trgtPrsnlReal} +
+
+ +
+
+
+
+ + + + +
+
+
+
+
+ diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp index 88af2017..c0bd0488 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp @@ -132,6 +132,7 @@ $(document).ready(function(){ function fn_confirm(){ + console.log('??'); var form = document.confirmForm; var dBirth = $('#dBirth').val().replace(/\./g, ''); @@ -154,6 +155,7 @@ $(document).ready(function(){ contentType: false, cache: false, success:function(returnData){ + console.log('returnData : ', returnData); if(returnData.result == "success"){ // 대상자 테이블 pk 값 var sspnIdtmtTrgtOrd = returnData.id; @@ -166,6 +168,8 @@ $(document).ready(function(){ } else { alert("대상자에 없습니다."); } + }else{ + alert("대상자에 없습니다."); } fn_target_confirm_clean(); diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main.jsp index de3da55f..d72591d6 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main.jsp @@ -54,9 +54,9 @@

기소유예 대시보드

    -
  • 신청중 강의

    건

    • -
  • 수강중 강의

    건

    • -
  • 종료된 강의

    건

    • +
  • 신청중 강의

    건

    • +
  • 수강중 강의

    건

    • +
  • 종료된 강의

    건

diff --git a/src/main/webapp/visitEdu/usr/publish/css/common.css b/src/main/webapp/visitEdu/usr/publish/css/common.css index 459b7f48..8b2ff2a8 100644 --- a/src/main/webapp/visitEdu/usr/publish/css/common.css +++ b/src/main/webapp/visitEdu/usr/publish/css/common.css @@ -10,8 +10,8 @@ body {color: #222;} .logo img {width: 200px;} /* header */ -header{width: 100%; height: 130px; position: fixed; top: 0; left: 0; transition: height .4s ease-in-out, background-color .4s ease-in-out, margin .4s ease-in-out; overflow: hidden; box-sizing: border-box;z-index: 20; background-color: #fff;} -header.on{background-color: #fff; box-shadow: 0 3px 10px rgba(0,0,0,0.1);} +header{width: 100%; height: 130px; position: fixed; top: 0; left: 0; transition: height .4s ease-in-out, background-color .4s ease-in-out, margin .4s ease-in-out; overflow: hidden; box-sizing: border-box;z-index: 20; background-color: #fff; border-bottom: 1px solid #e2e4e6;max-height: 350px;} +header.on{background-color: #fff; box-shadow: 0 3px 10px rgba(0,0,0,0.1); max-height: 350px;} header::before{position: absolute; content: " "; display: block; top: 130px; left: 0; height: 1px; background-color: #ddd; opacity: 0; transition: opacity .4s ease-in-out;} header::after{position: absolute; content: " "; display: block; width: 100%; height: 1px; background-color: #d5d5d5; top: 130px; left: 0; opacity: 0; transition: opacity .4s ease-in-out;} header.on::after{top: 130px; opacity: 1;} @@ -54,20 +54,22 @@ header.scroll{box-shadow: 0 5px 8px rgba(0,0,0,0.15);} .header_inner .depth01 {display: flex; height: 100%;} .header_inner .dep_li_01,.header_inner .dep_li_02,.header_inner .dep_li_03 {justify-content:flex-start;} .header_inner .dep_li_04,.header_inner .dep_li_05,.header_inner .dep_li_06,.header_inner .dep_li_07 {justify-content:space-between;} -.header_inner .depth01_li{position: relative; padding: 0; box-sizing: border-box;} +.header_inner .depth01_li{position: relative; height:100%; padding: 0; box-sizing: border-box;} .header_inner .dep_li_04 .depth01_li{width: calc((100% - 40px)/4);} .header_inner .dep_li_01 .depth01_li{width: 100%;} .header_inner .dep_li_02 .depth01_li{width: calc((100% - 20px)/2);} .header_inner .dep_li_03 .depth01_li{width: calc((100% - 30px)/3);max-width:270px;} .header_inner .dep_li_05 .depth01_li{width: calc(100%/5);} .header_inner .dep_li_06 .depth01_li{width: calc((100% - 60px)/6);} -.header_inner .dep_li_07 .depth01_li{width: auto;} -.header_inner .menu_link{font-size: 20px; font-weight: 600; letter-spacing: -0.5px; display: flex; align-items: center; justify-content: center; flex-flow: column; height: 100%; position: relative;font-family: 'nanumsquare', 'Noto Sans KR', sans-serif; line-height: 1.25;} +.header_inner .dep_li_07 .depth01_li:nth-child(n+2):nth-child(-n+4){width: 16%;} +.header_inner .dep_li_07 .depth01_li:nth-child(n+5){width: 12%; min-width: 85px;} +.header_inner .dep_li_07 .depth01_li:nth-child(1),.header_inner .dep_li_07 .depth01_li:nth-child(2){width:170px;} +.header_inner .menu_link{font-size: 18px; font-weight: 600; letter-spacing: -0.5px; display: flex; align-items: center; justify-content: center; flex-flow: column; height: 100%; position: relative;font-family: 'nanumsquare', 'Noto Sans KR', sans-serif; line-height: 1.25;} .header_inner .menu_link::before{position: absolute; content: " "; display: block; width: 0; height: 4px; background-color: #E95504; left: 50%; transform: translateX(-50%); transition: width .4s ease-in-out; top: 87px; z-index: 1;} .header_inner .menu_link .menu_link_br {color: #E95504;font-family: 'nanumsquare', 'Noto Sans KR', sans-serif; } .header_inner .on .menu_link{color: #E95504;} .on .nav_wrap .on .menu_link::before{width: 100%;} -.header_inner .depth02{position: absolute; text-align: center; padding: 15px 0; width: 100%; left: 50%; transform: translateX(-50%);border-right: 1px solid #d5d5d5;} +.header_inner .depth02{position: absolute; text-align: center; padding: 15px 0; width: 100%; left: 50%; transform: translateX(-50%);border-right: 1px solid #d5d5d5; max-height: 350px;} .header_inner .depth01_li:first-child .depth02{border-left: 1px solid #d5d5d5;} .header_inner .depth01_li:hover .depth02::after{position:absolute;content:"";width:calc(100% + 4px);height:100%;background-color:#fff8f4;left:-2px;top:0;} .header_inner .depth01_li:hover .depth02 li{position:relative;z-index:1;} diff --git a/src/main/webapp/visitEdu/usr/publish/script/common.js b/src/main/webapp/visitEdu/usr/publish/script/common.js index 0a0541c5..80d0a3ce 100644 --- a/src/main/webapp/visitEdu/usr/publish/script/common.js +++ b/src/main/webapp/visitEdu/usr/publish/script/common.js @@ -159,16 +159,23 @@ function header() { function open_gnb(item) { var depth01 = item; var depth01_li = depth01.closest(".depth01_li"); + var depth02 = depth01_li.find(".depth02"); var height_array = gnb.find('.depth02').map(function(){ return $(this).outerHeight(); }); - if($("body").hasClass("renewal") == true){ - var h=Math.max.apply(Math, height_array)+130; + + var h = Math.max.apply(Math, height_array)+150; + //console.log(height_array,Math.max.apply(Math, height_array)+150); + if(h+1>=Math.max.apply(Math, height_array)){ + h; + header.addClass("on").css('height',h + 'px'); + $("header .depth02").css('height',h+'px'); + //console.log("1"); }else{ - var h=Math.max.apply(Math, height_array)+180; + header.addClass("on").css('height',h + 'px'); + $("header .depth02").css('height',h+'px'); + //console.log("2"); } - - header.addClass("on").css('height',h + 'px'); depth01_li.addClass("on"); } @@ -197,6 +204,7 @@ function header() { header.on("mouseleave", function () { header.removeClass("on").attr('style',''); $(".depth01_li").removeClass("on"); + $("header .depth02").animate({height:'auto'},1000); }); $("#menu .depth01_li:last-child .depth02 li:last-child").on("focusout", function () { @@ -283,7 +291,6 @@ function gnbOpen() { var depth = target.find('.gnb .depth01'); var h = target.find('.gnb').outerHeight() - 60; h += 178; - function gnbActive() { target.addClass('active').css('height', h + 'px');