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 b62143cc..be3d760b 100644 --- a/src/main/java/kcc/kccadr/cmm/innorix/service/AdrInnorixFileVO.java +++ b/src/main/java/kcc/kccadr/cmm/innorix/service/AdrInnorixFileVO.java @@ -66,6 +66,8 @@ public class AdrInnorixFileVO extends ComDefaultVO implements Serializable { public String cnclCn = "";//기소유예 취소사유 + public String instrDetailOrd = "";//강사 고유PK + public String getFileType() { @@ -180,6 +182,14 @@ public class AdrInnorixFileVO extends ComDefaultVO implements Serializable { this.cnclCn = cnclCn; } + public String getInstrDetailOrd() { + return instrDetailOrd; + } + + public void setInstrDetailOrd(String instrDetailOrd) { + this.instrDetailOrd = instrDetailOrd; + } + diff --git a/src/main/java/kcc/kccadr/cmm/innorix/service/InnorixFileService.java b/src/main/java/kcc/kccadr/cmm/innorix/service/InnorixFileService.java index 9d3c67de..09955147 100644 --- a/src/main/java/kcc/kccadr/cmm/innorix/service/InnorixFileService.java +++ b/src/main/java/kcc/kccadr/cmm/innorix/service/InnorixFileService.java @@ -39,5 +39,7 @@ public interface InnorixFileService { RestResponse insertInnorixDocFile(AdrInnorixFileVO adrInnorixFileVO); RestResponse insertInnorixSspnCnClAjax(AdrInnorixFileVO adrInnorixFileVO); + + RestResponse insertInnorixInstrActvtAjax(AdrInnorixFileVO adrInnorixFileVO); } 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 3d3ffa1b..18b73f3f 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 @@ -32,6 +32,8 @@ import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctService; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduMIXService; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.impl.VEEduMIXDAO; +import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailActvtHstryVO; +import kcc.ve.instr.tngrVisitEdu.instrInfo.service.impl.VEInstrDetailActvtHstryDAO; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEAPrcsAplctPrdInstrAsgnmService; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEAPrcsAplctPrdInstrAsgnmVO; import kcc.ve.oprtn.cndtnSspnIdtmt.trgtMng.service.CndtnTrgtMngService; @@ -86,6 +88,10 @@ public class InnorixFileServiceImpl extends EgovAbstractServiceImpl implements I @Resource(name="docReqOrdGnrService") private EgovIdGnrService docReqOrdGnrService; + //서류요청 순번 + @Resource(name="instrActvtHstryOrdGnrService") + private EgovIdGnrService instrActvtHstryOrdGnrService; + // 교육 신청 정보 @Resource(name="sspnIdtmtService") private SspnIdtmtService sspnIdtmtService; @@ -98,6 +104,10 @@ public class InnorixFileServiceImpl extends EgovAbstractServiceImpl implements I @Resource(name = "vEEduMIXDAO") private VEEduMIXDAO vEEduMIXDAO; + // + @Resource(name = "vEInstrDetailActvtHstryDAO") + private VEInstrDetailActvtHstryDAO vEInstrDetailActvtHstryDAO; + /** * @methodName : fileDataUpload @@ -510,4 +520,35 @@ public class InnorixFileServiceImpl extends EgovAbstractServiceImpl implements I return new RestResponse(HttpStatus.OK, adrInnorixFileVO.getSuccessMsg(), LocalDateTime.now()); } + + @Override + public RestResponse insertInnorixInstrActvtAjax(AdrInnorixFileVO adrInnorixFileVO) { + + List result = null; + try { + // 파일 저장 후 저장할 file 정보를 받아옴 + result = this.insertFileData(adrInnorixFileVO); + + // 파일 정보 insert + String atchFileId = fileManageDAO.insertFileInfs(result); + + + VEInstrDetailActvtHstryVO vEInstrActvtHstryVO = new VEInstrDetailActvtHstryVO(); + vEInstrActvtHstryVO.setInstrDetailActvtHstryOrd(instrActvtHstryOrdGnrService.getNextStringId()); + vEInstrActvtHstryVO.setInstrDetailOrd(adrInnorixFileVO.getInstrDetailOrd()); +// vEInstrActvtHstryVO.setaplctPnttm(); + vEInstrActvtHstryVO.setStateCd("10"); // 상태코드 + vEInstrActvtHstryVO.setAplctAtchFileId(atchFileId); + vEInstrActvtHstryVO.setFrstRegisterId(adrInnorixFileVO.getUniqId()); + vEInstrActvtHstryVO.setLastUpdusrId(adrInnorixFileVO.getUniqId()); + + vEInstrDetailActvtHstryDAO.insert(vEInstrActvtHstryVO); + + } catch (Exception e) { + e.printStackTrace(); + return new RestResponse(HttpStatus.BAD_REQUEST, "등록에 실패하였습니다.", LocalDateTime.now()); + } + + return new RestResponse(HttpStatus.OK, adrInnorixFileVO.getSuccessMsg(), LocalDateTime.now()); + } } diff --git a/src/main/java/kcc/kccadr/cmm/innorix/web/InnorixFileController.java b/src/main/java/kcc/kccadr/cmm/innorix/web/InnorixFileController.java index d382281e..c2a31051 100644 --- a/src/main/java/kcc/kccadr/cmm/innorix/web/InnorixFileController.java +++ b/src/main/java/kcc/kccadr/cmm/innorix/web/InnorixFileController.java @@ -209,6 +209,30 @@ public class InnorixFileController { return ResponseEntity.ok(innorixService.insertInnorixSspnCnClAjax(adrInnorixFileVO)); } + /** + * @methodName : insertInnorixSspnCnClAjax + * @author : 이호영 + * @date : 2023.11.13 + * @description : + * @param adrInnorixFileVO + * @return + * @throws Exception + */ + @RequestMapping(value = {"/web/common/insertInnorixInstrActvtAjax.do"}, method = RequestMethod.POST) + public ResponseEntity insertInnorixInstrActvtAjax(@RequestBody AdrInnorixFileVO adrInnorixFileVO) throws Exception { + + //로그인 권한정보 불러오기 + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; + String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId()); + + if(userId.equals("")) { + return ResponseEntity.ok(new RestResponse(HttpStatus.UNAUTHORIZED, "로그인이 필요합니다.", LocalDateTime.now())); + } + adrInnorixFileVO.setUniqId(userId); + + return ResponseEntity.ok(innorixService.insertInnorixInstrActvtAjax(adrInnorixFileVO)); + } + /** * @methodName : insertReqDocInnorixFile * @author : 이지우 diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailActvtHstryService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailActvtHstryService.java new file mode 100644 index 00000000..0136e193 --- /dev/null +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailActvtHstryService.java @@ -0,0 +1,31 @@ +package kcc.ve.instr.tngrVisitEdu.instrInfo.service; + +public interface VEInstrDetailActvtHstryService { + + + + /* + //C + void insert(VEInstrDetailVO vEInstrDetailVO) throws Exception; + + //R + VEInstrDetailVO selectDetail(VEInstrDetailVO vEInstrDetailVO) throws Exception; + + //U + int update(VEInstrDetailVO vEInstrDetailVO) throws Exception; + + //D + int delete(VEInstrDetailVO vEInstrDetailVO) throws Exception; + + //L + List selectList(VEInstrDetailVO vEInstrDetailVO) throws Exception; + + //L page + List selectPagingList(VEInstrDetailVO vEInstrDetailVO) throws Exception; + */ + + //EgovMap selectAdrRpplInfo(AdjstChangeDateVO adjstChangeDateVO) throws Exception; + + //List selectPagingList(AdjstChangeDateVO adjstChangeDateVO) throws Exception; + +} diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailActvtHstryVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailActvtHstryVO.java new file mode 100644 index 00000000..81ef11c6 --- /dev/null +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailActvtHstryVO.java @@ -0,0 +1,111 @@ +package kcc.ve.instr.tngrVisitEdu.instrInfo.service; + +import java.io.Serializable; + +import kcc.com.cmm.ComDefaultVO; + +/** + * + * @author : 이호영 + * @fileName : VEInstrDetailActvtHstryVO.java + * @date : 2023.11.13 + * @description : 강사활동내역 신청서테이블 + * =========================================================== + * DATE AUTHOR NOTE + * ----------------------------------------------------------- * + * 2023.11.13 이호영 최초 생성 + * + * + * + */ +public class VEInstrDetailActvtHstryVO extends ComDefaultVO implements Serializable { + /** + * + */ + private static final long serialVersionUID = 1181681573174151517L; + + // VE_INSTR_DETAIL_ACTVT_HSTRY + private String instrDetailActvtHstryOrd; + private String instrDetailOrd; + private String aplctPnttm; + private String stateCd; + private String statePnttm; + private String aplctAtchFileId; + private String cmpnnCn; + private String frstRegistPnttm; + private String frstRegisterId; + private String lastUpdtPnttm; + private String lastUpdusrId; + + + + public String getInstrDetailActvtHstryOrd() { + return instrDetailActvtHstryOrd; + } + public void setInstrDetailActvtHstryOrd(String instrDetailActvtHstryOrd) { + this.instrDetailActvtHstryOrd = instrDetailActvtHstryOrd; + } + public String getInstrDetailOrd() { + return instrDetailOrd; + } + public void setInstrDetailOrd(String instrDetailOrd) { + this.instrDetailOrd = instrDetailOrd; + } + public String getAplctPnttm() { + return aplctPnttm; + } + public void setAplctPnttm(String aplctPnttm) { + this.aplctPnttm = aplctPnttm; + } + public String getStateCd() { + return stateCd; + } + public void setStateCd(String stateCd) { + this.stateCd = stateCd; + } + public String getStatePnttm() { + return statePnttm; + } + public void setStatePnttm(String statePnttm) { + this.statePnttm = statePnttm; + } + public String getAplctAtchFileId() { + return aplctAtchFileId; + } + public void setAplctAtchFileId(String aplctAtchFileId) { + this.aplctAtchFileId = aplctAtchFileId; + } + public String getCmpnnCn() { + return cmpnnCn; + } + public void setCmpnnCn(String cmpnnCn) { + this.cmpnnCn = cmpnnCn; + } + public String getFrstRegistPnttm() { + return frstRegistPnttm; + } + public void setFrstRegistPnttm(String frstRegistPnttm) { + this.frstRegistPnttm = frstRegistPnttm; + } + public String getFrstRegisterId() { + return frstRegisterId; + } + public void setFrstRegisterId(String frstRegisterId) { + this.frstRegisterId = frstRegisterId; + } + public String getLastUpdtPnttm() { + return lastUpdtPnttm; + } + public void setLastUpdtPnttm(String lastUpdtPnttm) { + this.lastUpdtPnttm = lastUpdtPnttm; + } + public String getLastUpdusrId() { + return lastUpdusrId; + } + public void setLastUpdusrId(String lastUpdusrId) { + this.lastUpdusrId = lastUpdusrId; + } + + + +} diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailActvtHstryDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailActvtHstryDAO.java new file mode 100644 index 00000000..1a2c9b79 --- /dev/null +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailActvtHstryDAO.java @@ -0,0 +1,27 @@ +package kcc.ve.instr.tngrVisitEdu.instrInfo.service.impl; + +import java.util.List; + +import org.springframework.stereotype.Repository; + +import egovframework.rte.psl.dataaccess.EgovAbstractDAO; +import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailActvtHstryVO; +import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO; + +@Repository("vEInstrDetailActvtHstryDAO") +public class VEInstrDetailActvtHstryDAO extends EgovAbstractDAO { + + public void insert(VEInstrDetailActvtHstryVO vEInstrActvtHstryVO) { + insert("VEInstrDetailActvtHstryDAO.insert", vEInstrActvtHstryVO); + } + + /** + * 등록 - C + * @param AdjstChangeDateVO + * @throws Exception + */ +// public void insert(VEInstrDetailVO vEInstrDetailVO) throws Exception { +// insert("VEInstrDetailActvtHstryDAO.insert", vEInstrDetailVO); +// } + +} diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailActvtHstryServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailActvtHstryServiceImpl.java new file mode 100644 index 00000000..cbbf5a6e --- /dev/null +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailActvtHstryServiceImpl.java @@ -0,0 +1,58 @@ +package kcc.ve.instr.tngrVisitEdu.instrInfo.service.impl; + + +import javax.annotation.Resource; + +import org.springframework.stereotype.Service; + +import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailActvtHstryService; + +@Service("vEInstrDetailActvtHstryService") +public class VEInstrDetailActvtHstryServiceImpl implements VEInstrDetailActvtHstryService { + + //강사 상세 + @Resource(name="vEInstrDetailActvtHstryDAO") + private VEInstrDetailActvtHstryDAO vEInstrDetailActvtHstryDAO; + /* + + //C + public void insert(VEInstrDetailVO vEInstrDetailVO) throws Exception { + vEInstrDetailApptHchkHstryDAO.insert(vEInstrDetailVO); + } + + //R + public VEInstrDetailVO selectDetail(VEInstrDetailVO vEInstrDetailVO) throws Exception { + return vEInstrDetailApptHchkHstryDAO.selectDetail(vEInstrDetailVO); + } + + //U + public int update(VEInstrDetailVO vEInstrDetailVO) throws Exception{ + + return vEInstrDetailApptHchkHstryDAO.update(vEInstrDetailVO); + } + + //D + public int delete(VEInstrDetailVO vEInstrDetailVO) throws Exception{ + return vEInstrDetailApptHchkHstryDAO.delete(vEInstrDetailVO); + } + + //List + public List selectList(VEInstrDetailVO vEInstrDetailVO) throws Exception{ + return vEInstrDetailApptHchkHstryDAO.selectList(vEInstrDetailVO); + } + + //paging List + public List selectPagingList(VEInstrDetailVO vEInstrDetailVO) throws Exception{ + return vEInstrDetailApptHchkHstryDAO.selectPagingList(vEInstrDetailVO); + } + */ + /* + //R + public EgovMap selectAdrRpplInfo(AdjstChangeDateVO adjstChangeDateVO) throws Exception { + return adjstChangeDateDAO.selectAdrRpplInfo(adjstChangeDateVO); + } + */ + + + +} diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailApptHchkHstryServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailApptHchkHstryServiceImpl.java index 42419403..cfe70bf6 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailApptHchkHstryServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailApptHchkHstryServiceImpl.java @@ -1,61 +1,61 @@ -package kcc.ve.instr.tngrVisitEdu.instrInfo.service.impl; - - -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - -import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailApptHchkHstryService; -import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO; - -@Service("vEInstrDetailApptHchkHstryService") -public class VEInstrDetailApptHchkHstryServiceImpl implements VEInstrDetailApptHchkHstryService { - - //강사 상세 - @Resource(name="vEInstrDetailApptHchkHstryDAO") - private VEInstrDetailApptHchkHstryDAO vEInstrDetailApptHchkHstryDAO; - - - //C - public void insert(VEInstrDetailVO vEInstrDetailVO) throws Exception { - vEInstrDetailApptHchkHstryDAO.insert(vEInstrDetailVO); - } - - //R - public VEInstrDetailVO selectDetail(VEInstrDetailVO vEInstrDetailVO) throws Exception { - return vEInstrDetailApptHchkHstryDAO.selectDetail(vEInstrDetailVO); - } - - //U - public int update(VEInstrDetailVO vEInstrDetailVO) throws Exception{ - - return vEInstrDetailApptHchkHstryDAO.update(vEInstrDetailVO); - } - - //D - public int delete(VEInstrDetailVO vEInstrDetailVO) throws Exception{ - return vEInstrDetailApptHchkHstryDAO.delete(vEInstrDetailVO); - } - - //List - public List selectList(VEInstrDetailVO vEInstrDetailVO) throws Exception{ - return vEInstrDetailApptHchkHstryDAO.selectList(vEInstrDetailVO); - } - - //paging List - public List selectPagingList(VEInstrDetailVO vEInstrDetailVO) throws Exception{ - return vEInstrDetailApptHchkHstryDAO.selectPagingList(vEInstrDetailVO); - } - - /* - //R - public EgovMap selectAdrRpplInfo(AdjstChangeDateVO adjstChangeDateVO) throws Exception { - return adjstChangeDateDAO.selectAdrRpplInfo(adjstChangeDateVO); - } - */ - - - -} +package kcc.ve.instr.tngrVisitEdu.instrInfo.service.impl; + + +import java.util.List; + +import javax.annotation.Resource; + +import org.springframework.stereotype.Service; + +import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailApptHchkHstryService; +import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO; + +@Service("vEInstrDetailApptHchkHstryService") +public class VEInstrDetailApptHchkHstryServiceImpl implements VEInstrDetailApptHchkHstryService { + + //강사 상세 + @Resource(name="vEInstrDetailApptHchkHstryDAO") + private VEInstrDetailApptHchkHstryDAO vEInstrDetailApptHchkHstryDAO; + + + //C + public void insert(VEInstrDetailVO vEInstrDetailVO) throws Exception { + vEInstrDetailApptHchkHstryDAO.insert(vEInstrDetailVO); + } + + //R + public VEInstrDetailVO selectDetail(VEInstrDetailVO vEInstrDetailVO) throws Exception { + return vEInstrDetailApptHchkHstryDAO.selectDetail(vEInstrDetailVO); + } + + //U + public int update(VEInstrDetailVO vEInstrDetailVO) throws Exception{ + + return vEInstrDetailApptHchkHstryDAO.update(vEInstrDetailVO); + } + + //D + public int delete(VEInstrDetailVO vEInstrDetailVO) throws Exception{ + return vEInstrDetailApptHchkHstryDAO.delete(vEInstrDetailVO); + } + + //List + public List selectList(VEInstrDetailVO vEInstrDetailVO) throws Exception{ + return vEInstrDetailApptHchkHstryDAO.selectList(vEInstrDetailVO); + } + + //paging List + public List selectPagingList(VEInstrDetailVO vEInstrDetailVO) throws Exception{ + return vEInstrDetailApptHchkHstryDAO.selectPagingList(vEInstrDetailVO); + } + + /* + //R + public EgovMap selectAdrRpplInfo(AdjstChangeDateVO adjstChangeDateVO) throws Exception { + return adjstChangeDateDAO.selectAdrRpplInfo(adjstChangeDateVO); + } + */ + + + +} diff --git a/src/main/resources/egovframework/spring/com/context-idgen.xml b/src/main/resources/egovframework/spring/com/context-idgen.xml index 643192a4..b9775d23 100644 --- a/src/main/resources/egovframework/spring/com/context-idgen.xml +++ b/src/main/resources/egovframework/spring/com/context-idgen.xml @@ -2982,4 +2982,19 @@ + + + + + + + + + + + + + + + diff --git a/src/main/resources/egovframework/sqlmap/config/tibero/sql-map-config-tibero-ve.xml b/src/main/resources/egovframework/sqlmap/config/tibero/sql-map-config-tibero-ve.xml index ec4ac2fa..55ac5e79 100644 --- a/src/main/resources/egovframework/sqlmap/config/tibero/sql-map-config-tibero-ve.xml +++ b/src/main/resources/egovframework/sqlmap/config/tibero/sql-map-config-tibero-ve.xml @@ -10,6 +10,7 @@ + diff --git a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetailActvtHstry_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetailActvtHstry_SQL_Tibero.xml new file mode 100644 index 00000000..d9564855 --- /dev/null +++ b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetailActvtHstry_SQL_Tibero.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + ve_instr_detail_actvt_hstry + + + + + instr_detail_actvt_hstry_ord + , instr_detail_ord + , aplct_pnttm + , state_cd + , state_pnttm + , aplct_atch_file_id + , cmpnn_cn + , frst_regist_pnttm + , frst_register_id + , last_updt_pnttm + , last_updusr_id + + + + + + a.instr_detail_actvt_hstry_ord as instrDetailActvtHstryOrd + , a.instr_detail_ord as instrDetailOrd + , a.aplct_pnttm as aplctPnttm + , a.state_cd as stateCd + , a.state_pnttm as statePnttm + , a.aplct_atch_file_id as aplctAtchFileId + , a.cmpnn_cn as cmpnnCn + , a.frst_regist_pnttm as frstRegistPnttm + , a.frst_register_id as frstRegisterId + , a.last_updt_pnttm as lastUpdtPnttm + , a.last_updusr_id as lastUpdusrId + + + + INSERT INTO ( + + )VALUES( + #instrDetailActvtHstryOrd# + , #instrDetailOrd# + , SYSDATE + , #stateCd# + , SYSDATE + , #aplctAtchFileId# + , #cmpnnCn# + , SYSDATE + , #frstRegisterId# + , SYSDATE + , #lastUpdusrId# + ) + + + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp index 4022783e..a06d7a71 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp @@ -1,401 +1,401 @@ -<%@ 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="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> -<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> - - -<% pageContext.setAttribute("replaceChar", "\n"); %> - - - - - -
- - - - -
- -
- - -
-
-
-

신청상세

-
- - -
-
-
- -
-

찾아가는 저작권 교육

- - ‘찾아가는 저작권 교육’은 저작권 교육이 필요한 공공기관, 대학, 문화예술단체 등을 대상으로 무료로 강의를 지원하는 맞춤형 교육 서비스입니다. -

담당자 연락처) 02-2669-0083

-
-
-
- -
-
-

교육신청 내용

-
- <%-- - -
- -
-
- --%> -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
교육부분 - -
과정 - - -
신청기간 - ~ -
교육장소 - -
교육기간 - ~ -
상세교육과정 - -
정원 - -
상태 - - - - - - - - -
-
-
-
-
-
-
-
- -
-
- -
- - - -
- -
- +<%@ 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="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> + + +<% pageContext.setAttribute("replaceChar", "\n"); %> + + + + + +
+ + + + +
+ +
+ + +
+
+
+

신청상세

+
+ + +
+
+
+ +
+

찾아가는 저작권 교육

+ + ‘찾아가는 저작권 교육’은 저작권 교육이 필요한 공공기관, 대학, 문화예술단체 등을 대상으로 무료로 강의를 지원하는 맞춤형 교육 서비스입니다. +

담당자 연락처) 02-2669-0083

+
+
+
+ +
+
+

교육신청 내용

+
+ <%-- + +
+ +
+
+ --%> +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
교육부분 + +
과정 + + +
신청기간 + ~ +
교육장소 + +
교육기간 + +
상세교육과정 + +
정원 + +
상태 + + + + + + + + +
+
+
+
+
+
+
+
+ +
+
+ +
+ + + +
+ +
+ diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp index 54899ed5..d887de64 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp @@ -504,5 +504,4 @@ $(document).ready(function(){ viewer.openFile('json_subject.mrd', '/rfn [jsonsample_red_2.json]'); }; */ ->>>>>>> refs/heads/hylee \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/instrInfo/instrPrflDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/instrInfo/instrPrflDetail.jsp index 04b5769f..e2b9be21 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/instrInfo/instrPrflDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/instrInfo/instrPrflDetail.jsp @@ -565,13 +565,10 @@

활동확인서 내역

- -
-
-
+
@@ -617,7 +614,7 @@ @@ -671,7 +668,7 @@ - + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/instrPrflDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/instrPrflDetail.jsp index 767c3f61..6dc059b6 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/instrPrflDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/instrPrflDetail.jsp @@ -32,6 +32,10 @@ + + + + @@ -43,6 +47,9 @@ input:read-only { background-color: #f9f9f9 !important; } + #fileControl{margin: 8px 0 0 0; border: 1px solid #d5d5d5; border-radius: 5px; height: 150px !important; background-color: #fafafa;} + .innorix_basic div.irx_filetree.empty-uploader{background: url(/offedu/visitEdu/usr/publish/images/content/dropzone_file_before.png) no-repeat center; height: 150px !important;} + .irx_filetree,.innorix_basic div.irx_infoBox{height: 150px !important;}
@@ -313,6 +382,7 @@ + " /> @@ -675,6 +745,72 @@ + + +
+
+

활동확인서 내역

+
+
+
+
+
+
+ +<%-- --%> +
+
+
+
- +
+ + + + + <%-- --%> + + + + + + + + + + + + + + + + + + + +<%-- --%> +<%-- --%> + + <%-- --%> +<%-- --%> + + + + + + +
강의 설정 정보 번호, 요청일, 구분, 신청상태, 승인일(반려일), 비고 을/를 제공하는 표
번호신청일발급일발급상태양식
+ ${status.count} + + 2023-11-02 + + 2023-11-03 + + 완료 / 처리중 / 반려 + + + + +
+
@@ -691,3 +827,64 @@
+ + +
+ +
+ diff --git a/src/main/webapp/visitEdu/usr/publish/css/main.css b/src/main/webapp/visitEdu/usr/publish/css/main.css index 48acb3de..f702873a 100644 --- a/src/main/webapp/visitEdu/usr/publish/css/main.css +++ b/src/main/webapp/visitEdu/usr/publish/css/main.css @@ -74,6 +74,8 @@ .wrap .data_notice .notice_list li:hover .title,.wrap .data_notice .notice_list li:hover .date{color:#e95504;transition:all 0.05s ease-in-out;} /* 알림판 */ +.wrap .notify .notify_slide{height:100%;} +.wrap .notify .notify_slide .swiper-slide img{width:100%;height:100%;} .wrap .notify .notify_control{display:flex;height:30px;background-color:#fff;border:1px solid #d5d5d5;border-radius:5px;padding:0 4px 0 0;} .wrap .notify .notify_control>*{position:unset;width:23px;height:30px;font-size:16px;color:#888;text-align:center;line-height:28px;letter-spacing:-1.7px;margin: 0 0 0 -1px;} .wrap .notify .notify_control .slide_number{width:35px;} @@ -106,7 +108,9 @@ .visual_slide .slide_control{bottom:-20px;} .container .main_banner_link{height:auto;} - .container .main_banner_link li{width:calc((100% - 20px)/2);margin:0 0 10px 0;padding:15px 0;} + .container .main_banner_link li{width:calc((100% - 20px)/2);margin:0 0 10px 0;padding:15px 0;} + + .wrap .notify .content{height:auto;} } @media all and (max-width: 767px){