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 be3d760b..e527905c 100644
--- a/src/main/java/kcc/kccadr/cmm/innorix/service/AdrInnorixFileVO.java
+++ b/src/main/java/kcc/kccadr/cmm/innorix/service/AdrInnorixFileVO.java
@@ -69,7 +69,14 @@ public class AdrInnorixFileVO extends ComDefaultVO implements Serializable {
public String instrDetailOrd = "";//강사 고유PK
+ //강의활동확인서 컬럼 추가
+ private String sex = ""; //성별
+ private String purpose = ""; //용도
+ private String bsnsNmbr = ""; //사업자등록번호
+ private String bsnsNm = ""; //사업자명
+ private String docuNmbr = ""; //문서번호
+
public String getFileType() {
return fileType;
}
@@ -190,6 +197,46 @@ public class AdrInnorixFileVO extends ComDefaultVO implements Serializable {
this.instrDetailOrd = instrDetailOrd;
}
+ public String getSex() {
+ return sex;
+ }
+
+ public void setSex(String sex) {
+ this.sex = sex;
+ }
+
+ public String getPurpose() {
+ return purpose;
+ }
+
+ public void setPurpose(String purpose) {
+ this.purpose = purpose;
+ }
+
+ public String getBsnsNm() {
+ return bsnsNm;
+ }
+
+ public void setBsnsNm(String bsnsNm) {
+ this.bsnsNm = bsnsNm;
+ }
+
+ public String getBsnsNmbr() {
+ return bsnsNmbr;
+ }
+
+ public void setBsnsNmbr(String bsnsNmbr) {
+ this.bsnsNmbr = bsnsNmbr;
+ }
+
+ public String getDocuNmbr() {
+ return docuNmbr;
+ }
+
+ public void setDocuNmbr(String docuNmbr) {
+ this.docuNmbr = docuNmbr;
+ }
+
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 15a10b27..736a4860 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
@@ -545,6 +545,14 @@ public class InnorixFileServiceImpl extends EgovAbstractServiceImpl implements I
vEInstrActvtHstryVO.setFrstRegisterId(adrInnorixFileVO.getUniqId());
vEInstrActvtHstryVO.setLastUpdusrId(adrInnorixFileVO.getUniqId());
+
+ vEInstrActvtHstryVO.setSex(adrInnorixFileVO.getSex());
+ vEInstrActvtHstryVO.setPurpose(adrInnorixFileVO.getPurpose());
+ vEInstrActvtHstryVO.setBsnsNmbr(adrInnorixFileVO.getBsnsNmbr());
+ vEInstrActvtHstryVO.setBsnsNm(adrInnorixFileVO.getBsnsNm());
+ vEInstrActvtHstryVO.setDocuNmbr(adrInnorixFileVO.getDocuNmbr());
+
+
vEInstrDetailActvtHstryDAO.insert(vEInstrActvtHstryVO);
} catch (Exception e) {
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
index 97e48ae4..8d8a78e4 100644
--- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailActvtHstryVO.java
+++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailActvtHstryVO.java
@@ -47,6 +47,16 @@ public class VEInstrDetailActvtHstryVO extends ComDefaultVO implements Serializa
private String selectPagingListQuery;
private String userId;
+ //강의활동확인서 컬럼 추가
+ private String sex = ""; //성별
+ private String purpose = ""; //용도
+ private String bsnsNmbr = ""; //사업자등록번호
+ private String bsnsNm = ""; //사업자명
+ private String docuNmbr = ""; //문서번호
+
+ private String docuNmbrDp = ""; //문서번호-표시용
+
+
public String getInstrDetailActvtHstryOrd() {
return instrDetailActvtHstryOrd;
@@ -162,6 +172,42 @@ public class VEInstrDetailActvtHstryVO extends ComDefaultVO implements Serializa
public void setUserId(String userId) {
this.userId = userId;
}
+ public String getSex() {
+ return sex;
+ }
+ public void setSex(String sex) {
+ this.sex = sex;
+ }
+ public String getPurpose() {
+ return purpose;
+ }
+ public void setPurpose(String purpose) {
+ this.purpose = purpose;
+ }
+ public String getBsnsNmbr() {
+ return bsnsNmbr;
+ }
+ public void setBsnsNmbr(String bsnsNmbr) {
+ this.bsnsNmbr = bsnsNmbr;
+ }
+ public String getBsnsNm() {
+ return bsnsNm;
+ }
+ public void setBsnsNm(String bsnsNm) {
+ this.bsnsNm = bsnsNm;
+ }
+ public String getDocuNmbr() {
+ return docuNmbr;
+ }
+ public void setDocuNmbr(String docuNmbr) {
+ this.docuNmbr = docuNmbr;
+ }
+ public String getDocuNmbrDp() {
+ return docuNmbrDp;
+ }
+ public void setDocuNmbrDp(String docuNmbrDp) {
+ this.docuNmbrDp = docuNmbrDp;
+ }
diff --git a/src/main/java/kcc/ve/oprtn/adultVisitEdu/instrActvtHstryMng/InstrActvtHstryAdultMngController.java b/src/main/java/kcc/ve/oprtn/adultVisitEdu/instrActvtHstryMng/InstrActvtHstryAdultMngController.java
index a43f1a3f..846ad7d3 100644
--- a/src/main/java/kcc/ve/oprtn/adultVisitEdu/instrActvtHstryMng/InstrActvtHstryAdultMngController.java
+++ b/src/main/java/kcc/ve/oprtn/adultVisitEdu/instrActvtHstryMng/InstrActvtHstryAdultMngController.java
@@ -1,289 +1,287 @@
-package kcc.ve.oprtn.adultVisitEdu.instrActvtHstryMng;
-
-import java.util.List;
-import java.util.Properties;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.servlet.ModelAndView;
-
-import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo;
-import kcc.com.cmm.LoginVO;
-import kcc.com.cmm.service.EgovCmmUseService;
-import kcc.com.cmm.service.EgovFileMngService;
-import kcc.com.cmm.service.EgovFileMngUtil;
-import kcc.com.utl.user.service.CheckLoginUtil;
-import kcc.let.uat.uia.service.SsoLoginVO;
-import kcc.let.utl.fcc.service.EgovCryptoUtil;
-import kcc.ve.cmm.VeConstants;
-import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO;
-import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailActvtHstryService;
-import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailActvtHstryVO;
-
-/**
- * 교육일정관리(관리자-청소년찾아가는저작권교육)
- * 교육일정관리에 관한 controller 클래스를 정의한다.
- * @author 조용준
- * @since 2021.12.16
- * @version 1.0
- * @see
- *
- *
- * << 개정이력(Modification Information) >>
- *
- * 수정일 수정자 수정내용
- * ------- -------- ---------------------------
- * 2021.12.16 조용준 최초 생성
- *
- *
- */
-
-@Controller
-public class InstrActvtHstryAdultMngController {
-
- private static final Logger LOGGER = LoggerFactory.getLogger(InstrActvtHstryAdultMngController.class);
-
- //로그인 체크 util
- @Resource(name = "checkLoginUtil")
- private CheckLoginUtil checkLoginUtil;
-
- // eGov 공통코드
- @Resource(name = "EgovCmmUseService")
- private EgovCmmUseService cmmUseService;
-
- @Resource(name = "EgovFileMngService")
- private EgovFileMngService fileService;
-
- // global 프로퍼티
- @Resource(name="globalSettings")
- protected Properties propertiesService;
-
- //첨부파일 경로, realPath 설정
- @Resource(name="EgovFileMngUtil")
- private EgovFileMngUtil fileUtil;
-
- // 첨부파일 정보
- @Resource(name="EgovFileMngService")
- private EgovFileMngService fileMngService;
-
- // 첨부파일 정보
- @Resource(name="vEInstrDetailActvtHstryService")
- private VEInstrDetailActvtHstryService vEInstrDetailActvtHstryService;
-
- //암복호화 유틸
- @Resource(name = "egovCryptoUtil")
- EgovCryptoUtil egovCryptoUtil;
-
-
-
- /**
- * 강사활동확인서신청관리 목록
- */
- @RequestMapping("/kccadr/oprtn/adultVisitEdu/instrActvtHstryMngList.do")
- public String instrActvtHstryMngList(
- @ModelAttribute("vEInstrActvtHstryVO") VEInstrDetailActvtHstryVO vEInstrDetailActvtHstryVO
- , ModelMap model
- , HttpServletRequest request
- ) throws Exception {
-
- //로그인 처리====================================
- //로그인 정보 가져오기
- LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기
- SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기
-
-// if (loginVO == null || ssoLoginVO == null) {
-// return checkLoginUtil.getUserLoginPage(model); //로그인 정보가 없으면 로그인 페이지로 이동한다.
-// }
- //로그인 처리====================================
- vEInstrDetailActvtHstryVO.setInstrDiv(VeConstants.LCTR_DIV_CD_20); //성인
-
- //1.pageing step1
- PaginationInfo paginationInfo = this.setPagingStep1(vEInstrDetailActvtHstryVO);
- //2. pageing step2
- vEInstrDetailActvtHstryVO = this.setPagingStep2(vEInstrDetailActvtHstryVO, paginationInfo);
- vEInstrDetailActvtHstryVO.setSearchKeyword(egovCryptoUtil.encrypt(vEInstrDetailActvtHstryVO.getSearchKeyword()));
- List vEInstrDetailActvtHstryVOList = vEInstrDetailActvtHstryService.selectPagingList(vEInstrDetailActvtHstryVO);
-
- vEInstrDetailActvtHstryVOList.stream().forEach(t-> t.setInstrNm(egovCryptoUtil.decrypt(t.getInstrNm())));
-
- //3.pageing step3
- paginationInfo = this.setPagingStep3(vEInstrDetailActvtHstryVOList, paginationInfo);
- model.addAttribute("paginationInfo", paginationInfo);
-
- // 검색어 복호화
- vEInstrDetailActvtHstryVO.setSearchKeyword(egovCryptoUtil.decrypt(vEInstrDetailActvtHstryVO.getSearchKeyword()));
- //대상 리스트, 페이징 정보 전달
- model.addAttribute("list", vEInstrDetailActvtHstryVOList);
-
-
-
- return "oprtn/adultVisitEdu/instrActvtHstryMngList";
- }
-
-
- /**
- * 강사활동확인서신청관리 상세
- */
- @RequestMapping("/kccadr/oprtn/adultVisitEdu/instrActvtHstryMngDetail.do")
- public String instrActvtHstryMngDetail(
- @ModelAttribute("vEInstrActvtHstryVO") VEInstrDetailActvtHstryVO vEInstrDetailActvtHstryVO
- , ModelMap model
- , HttpServletRequest request
- ) throws Exception {
-
- //로그인 처리====================================
- //로그인 정보 가져오기
-// String s_oprtnLoginCheckNInfo = checkLoginUtil.oprtnCheckNInfo(model);
-// if (!"".equals(s_oprtnLoginCheckNInfo)) return s_oprtnLoginCheckNInfo;
-
- //로그인 처리====================================
- //로그인 정보 가져오기
- LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기
- SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기
-
-// if (loginVO == null || ssoLoginVO == null) {
-// return checkLoginUtil.getUserLoginPage(model); //로그인 정보가 없으면 로그인 페이지로 이동한다.
-// }
- vEInstrDetailActvtHstryVO.setInstrDiv(VeConstants.LCTR_DIV_CD_10); //청소년
-
- VEInstrDetailActvtHstryVO vEInstrActvtHstryVO = vEInstrDetailActvtHstryService.findById(vEInstrDetailActvtHstryVO);
-
- vEInstrActvtHstryVO.setInstrNm(egovCryptoUtil.decrypt(vEInstrActvtHstryVO.getInstrNm()));
- vEInstrActvtHstryVO.setPhone(egovCryptoUtil.decrypt(vEInstrActvtHstryVO.getPhone()));
-
- //대상 리스트, 페이징 정보 전달
- model.addAttribute("info", vEInstrActvtHstryVO);
-
-
-
- return "oprtn/adultVisitEdu/instrActvtHstryMngDetail";
- }
-
- /**
- * 강사활동확인서신청관리 상세
- */
- @RequestMapping("/kccadr/oprtn/adultVisitEdu/popup/instrCnclPopup.do")
- public String instrCnclPopup(
- @ModelAttribute("vEInstrActvtHstryVO") VEInstrDetailActvtHstryVO vEInstrDetailActvtHstryVO
- , ModelMap model
- , HttpServletRequest request
- ) throws Exception {
-
- //로그인 처리====================================
- //로그인 정보 가져오기
- LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기
- SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기
-
-// if (loginVO == null || ssoLoginVO == null) {
-// return checkLoginUtil.getUserLoginPage(model); //로그인 정보가 없으면 로그인 페이지로 이동한다.
-// }
- //대상 리스트, 페이징 정보 전달
- model.addAttribute("info", vEInstrDetailActvtHstryVO);
-
-
-
- return "oprtn/adultVisitEdu/popup/instrCnclPopup";
- }
-
-
-
- @RequestMapping("/kccadr/oprtn/adultVisitEdu/updateStateCd.do")
- public ModelAndView updateStateCd(
- @ModelAttribute("vEInstrActvtHstryVO") VEInstrDetailActvtHstryVO vEInstrDetailActvtHstryVO
- , ModelMap model
- //, RedirectAttributes redirectAttributes
- , HttpServletRequest request
- ) throws Exception {
-
- ModelAndView modelAndView = new ModelAndView();
- modelAndView.setViewName("jsonView");
-
- //로그인 처리====================================
- //로그인 정보 가져오기
-
- String s_oprtnLoginCheckNInfo = checkLoginUtil.oprtnCheckNInfo(model);
- if (!"".equals(s_oprtnLoginCheckNInfo)) {
- modelAndView.addObject("result", "loginFail");
- return modelAndView;
- }
-
- //로그인 처리====================================
-
-
- LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기
- SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기
-
-
- vEInstrDetailActvtHstryVO.setLastUpdusrId(loginVO.getUniqId());
- vEInstrDetailActvtHstryService.updateStateCd(vEInstrDetailActvtHstryVO);
-
- modelAndView.addObject("result", "success");
-
- return modelAndView;
-
- }
-
-
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////
- //
- //
- // private function
- //
- //
-
- //페이징을 위한 처리 step1 - 페이징 기본 정보 설정
- private PaginationInfo setPagingStep1(
- VEInstrDetailActvtHstryVO p_vEEduAplctVO
- )throws Exception{
- // pageing step1
- PaginationInfo paginationInfo = new PaginationInfo();
- paginationInfo.setCurrentPageNo(p_vEEduAplctVO.getPageIndex());
- paginationInfo.setRecordCountPerPage(p_vEEduAplctVO.getPageUnit());
- paginationInfo.setPageSize(p_vEEduAplctVO.getPageSize());
-
- return paginationInfo;
- }
-
-
- //페이징을 위한 처리 step2 - 게시물 리스트 수량 설정 및 검색 조건 초기화
- private VEInstrDetailActvtHstryVO setPagingStep2(
- VEInstrDetailActvtHstryVO p_vEEduAplctVO
- , PaginationInfo p_paginationInfo
- )throws Exception{
- // pageing step2
- p_vEEduAplctVO.setFirstIndex(p_paginationInfo.getFirstRecordIndex());
- p_vEEduAplctVO.setLastIndex(p_paginationInfo.getLastRecordIndex());
- p_vEEduAplctVO.setRecordCountPerPage(p_paginationInfo.getRecordCountPerPage());
-
- if("".equals(p_vEEduAplctVO.getSearchSortCnd())){ //최초조회시 최신것 조회List
- p_vEEduAplctVO.setSearchSortCnd("prcs_ord");
- p_vEEduAplctVO.setSearchSortOrd("desc");
- }
-
- return p_vEEduAplctVO;
- }
-
-
- //페이징을 위한 처리 step3 - 전체 게시물 수량 설정하기
- private PaginationInfo setPagingStep3(
- List p_vEEduAplctVOList
-
- , PaginationInfo p_paginationInfo
- )throws Exception{
- // pageing step3
- int totCnt = 0;
- if(p_vEEduAplctVOList.size() > 0) totCnt = p_vEEduAplctVOList.get(0).getTotCnt();
- p_paginationInfo.setTotalRecordCount(totCnt);
-
- return p_paginationInfo;
- }
-}
+package kcc.ve.oprtn.adultVisitEdu.instrActvtHstryMng;
+
+import java.util.List;
+import java.util.Properties;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.servlet.ModelAndView;
+
+import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo;
+import kcc.com.cmm.LoginVO;
+import kcc.com.cmm.service.EgovCmmUseService;
+import kcc.com.cmm.service.EgovFileMngService;
+import kcc.com.cmm.service.EgovFileMngUtil;
+import kcc.com.utl.user.service.CheckLoginUtil;
+import kcc.let.uat.uia.service.SsoLoginVO;
+import kcc.let.utl.fcc.service.EgovCryptoUtil;
+import kcc.ve.cmm.VeConstants;
+import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailActvtHstryService;
+import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailActvtHstryVO;
+
+/**
+ * 교육일정관리(관리자-청소년찾아가는저작권교육)
+ * 교육일정관리에 관한 controller 클래스를 정의한다.
+ * @author 조용준
+ * @since 2021.12.16
+ * @version 1.0
+ * @see
+ *
+ *
+ * << 개정이력(Modification Information) >>
+ *
+ * 수정일 수정자 수정내용
+ * ------- -------- ---------------------------
+ * 2021.12.16 조용준 최초 생성
+ *
+ *
+ */
+
+@Controller
+public class InstrActvtHstryAdultMngController {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(InstrActvtHstryAdultMngController.class);
+
+ //로그인 체크 util
+ @Resource(name = "checkLoginUtil")
+ private CheckLoginUtil checkLoginUtil;
+
+ // eGov 공통코드
+ @Resource(name = "EgovCmmUseService")
+ private EgovCmmUseService cmmUseService;
+
+ @Resource(name = "EgovFileMngService")
+ private EgovFileMngService fileService;
+
+ // global 프로퍼티
+ @Resource(name="globalSettings")
+ protected Properties propertiesService;
+
+ //첨부파일 경로, realPath 설정
+ @Resource(name="EgovFileMngUtil")
+ private EgovFileMngUtil fileUtil;
+
+ // 첨부파일 정보
+ @Resource(name="EgovFileMngService")
+ private EgovFileMngService fileMngService;
+
+ // 첨부파일 정보
+ @Resource(name="vEInstrDetailActvtHstryService")
+ private VEInstrDetailActvtHstryService vEInstrDetailActvtHstryService;
+
+ //암복호화 유틸
+ @Resource(name = "egovCryptoUtil")
+ EgovCryptoUtil egovCryptoUtil;
+
+
+
+ /**
+ * 강사활동확인서신청관리 목록
+ */
+ @RequestMapping("/kccadr/oprtn/adultVisitEdu/instrActvtHstryMngList.do")
+ public String instrActvtHstryMngList(
+ @ModelAttribute("vEInstrActvtHstryVO") VEInstrDetailActvtHstryVO vEInstrDetailActvtHstryVO
+ , ModelMap model
+ , HttpServletRequest request
+ ) throws Exception {
+
+ //로그인 처리====================================
+ //로그인 정보 가져오기
+ LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기
+ SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기
+
+// if (loginVO == null || ssoLoginVO == null) {
+// return checkLoginUtil.getUserLoginPage(model); //로그인 정보가 없으면 로그인 페이지로 이동한다.
+// }
+ //로그인 처리====================================
+ vEInstrDetailActvtHstryVO.setInstrDiv(VeConstants.LCTR_DIV_CD_20); //성인
+
+ //1.pageing step1
+ PaginationInfo paginationInfo = this.setPagingStep1(vEInstrDetailActvtHstryVO);
+ //2. pageing step2
+ vEInstrDetailActvtHstryVO = this.setPagingStep2(vEInstrDetailActvtHstryVO, paginationInfo);
+ vEInstrDetailActvtHstryVO.setSearchKeyword(egovCryptoUtil.encrypt(vEInstrDetailActvtHstryVO.getSearchKeyword()));
+ List vEInstrDetailActvtHstryVOList = vEInstrDetailActvtHstryService.selectPagingList(vEInstrDetailActvtHstryVO);
+
+ vEInstrDetailActvtHstryVOList.stream().forEach(t-> t.setInstrNm(egovCryptoUtil.decrypt(t.getInstrNm())));
+
+ //3.pageing step3
+ paginationInfo = this.setPagingStep3(vEInstrDetailActvtHstryVOList, paginationInfo);
+ model.addAttribute("paginationInfo", paginationInfo);
+
+ // 검색어 복호화
+ vEInstrDetailActvtHstryVO.setSearchKeyword(egovCryptoUtil.decrypt(vEInstrDetailActvtHstryVO.getSearchKeyword()));
+ //대상 리스트, 페이징 정보 전달
+ model.addAttribute("list", vEInstrDetailActvtHstryVOList);
+
+
+
+ return "oprtn/adultVisitEdu/instrActvtHstryMngList";
+ }
+
+
+ /**
+ * 강사활동확인서신청관리 상세
+ */
+ @RequestMapping("/kccadr/oprtn/adultVisitEdu/instrActvtHstryMngDetail.do")
+ public String instrActvtHstryMngDetail(
+ @ModelAttribute("vEInstrActvtHstryVO") VEInstrDetailActvtHstryVO vEInstrDetailActvtHstryVO
+ , ModelMap model
+ , HttpServletRequest request
+ ) throws Exception {
+
+ //로그인 처리====================================
+ //로그인 정보 가져오기
+// String s_oprtnLoginCheckNInfo = checkLoginUtil.oprtnCheckNInfo(model);
+// if (!"".equals(s_oprtnLoginCheckNInfo)) return s_oprtnLoginCheckNInfo;
+
+ //로그인 처리====================================
+ //로그인 정보 가져오기
+ LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기
+ SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기
+
+// if (loginVO == null || ssoLoginVO == null) {
+// return checkLoginUtil.getUserLoginPage(model); //로그인 정보가 없으면 로그인 페이지로 이동한다.
+// }
+ vEInstrDetailActvtHstryVO.setInstrDiv(VeConstants.LCTR_DIV_CD_10); //청소년
+
+ VEInstrDetailActvtHstryVO vEInstrActvtHstryVO = vEInstrDetailActvtHstryService.findById(vEInstrDetailActvtHstryVO);
+
+ vEInstrActvtHstryVO.setInstrNm(egovCryptoUtil.decrypt(vEInstrActvtHstryVO.getInstrNm()));
+ vEInstrActvtHstryVO.setPhone(egovCryptoUtil.decrypt(vEInstrActvtHstryVO.getPhone()));
+
+ //대상 리스트, 페이징 정보 전달
+ model.addAttribute("info", vEInstrActvtHstryVO);
+
+
+
+ return "oprtn/adultVisitEdu/instrActvtHstryMngDetail";
+ }
+
+ /**
+ * 강사활동확인서신청관리 상세
+ */
+ @RequestMapping("/kccadr/oprtn/adultVisitEdu/popup/instrCnclPopup.do")
+ public String instrCnclPopup(
+ @ModelAttribute("vEInstrActvtHstryVO") VEInstrDetailActvtHstryVO vEInstrDetailActvtHstryVO
+ , ModelMap model
+ , HttpServletRequest request
+ ) throws Exception {
+
+ //로그인 처리====================================
+ //로그인 정보 가져오기
+ LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기
+ SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기
+
+// if (loginVO == null || ssoLoginVO == null) {
+// return checkLoginUtil.getUserLoginPage(model); //로그인 정보가 없으면 로그인 페이지로 이동한다.
+// }
+ //대상 리스트, 페이징 정보 전달
+ model.addAttribute("info", vEInstrDetailActvtHstryVO);
+
+
+
+ return "oprtn/adultVisitEdu/popup/instrCnclPopup";
+ }
+
+
+
+ @RequestMapping("/kccadr/oprtn/adultVisitEdu/updateStateCd.do")
+ public ModelAndView updateStateCd(
+ @ModelAttribute("vEInstrActvtHstryVO") VEInstrDetailActvtHstryVO vEInstrDetailActvtHstryVO
+ , ModelMap model
+ //, RedirectAttributes redirectAttributes
+ , HttpServletRequest request
+ ) throws Exception {
+
+ ModelAndView modelAndView = new ModelAndView();
+ modelAndView.setViewName("jsonView");
+
+ //로그인 처리====================================
+ //로그인 정보 가져오기
+
+ String s_oprtnLoginCheckNInfo = checkLoginUtil.oprtnCheckNInfo(model);
+ if (!"".equals(s_oprtnLoginCheckNInfo)) {
+ modelAndView.addObject("result", "loginFail");
+ return modelAndView;
+ }
+
+ //로그인 처리====================================
+
+
+ LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기
+ SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기
+
+
+ vEInstrDetailActvtHstryVO.setLastUpdusrId(loginVO.getUniqId());
+ vEInstrDetailActvtHstryService.updateStateCd(vEInstrDetailActvtHstryVO);
+
+ modelAndView.addObject("result", "success");
+
+ return modelAndView;
+
+ }
+
+
+
+ //////////////////////////////////////////////////////////////////////////////////////////////////////////////
+ //
+ //
+ // private function
+ //
+ //
+
+ //페이징을 위한 처리 step1 - 페이징 기본 정보 설정
+ private PaginationInfo setPagingStep1(
+ VEInstrDetailActvtHstryVO p_vEEduAplctVO
+ )throws Exception{
+ // pageing step1
+ PaginationInfo paginationInfo = new PaginationInfo();
+ paginationInfo.setCurrentPageNo(p_vEEduAplctVO.getPageIndex());
+ paginationInfo.setRecordCountPerPage(p_vEEduAplctVO.getPageUnit());
+ paginationInfo.setPageSize(p_vEEduAplctVO.getPageSize());
+
+ return paginationInfo;
+ }
+
+
+ //페이징을 위한 처리 step2 - 게시물 리스트 수량 설정 및 검색 조건 초기화
+ private VEInstrDetailActvtHstryVO setPagingStep2(
+ VEInstrDetailActvtHstryVO p_vEEduAplctVO
+ , PaginationInfo p_paginationInfo
+ )throws Exception{
+ // pageing step2
+ p_vEEduAplctVO.setFirstIndex(p_paginationInfo.getFirstRecordIndex());
+ p_vEEduAplctVO.setLastIndex(p_paginationInfo.getLastRecordIndex());
+ p_vEEduAplctVO.setRecordCountPerPage(p_paginationInfo.getRecordCountPerPage());
+
+ if("".equals(p_vEEduAplctVO.getSearchSortCnd())){ //최초조회시 최신것 조회List
+ p_vEEduAplctVO.setSearchSortCnd("prcs_ord");
+ p_vEEduAplctVO.setSearchSortOrd("desc");
+ }
+
+ return p_vEEduAplctVO;
+ }
+
+
+ //페이징을 위한 처리 step3 - 전체 게시물 수량 설정하기
+ private PaginationInfo setPagingStep3(
+ List p_vEEduAplctVOList
+
+ , PaginationInfo p_paginationInfo
+ )throws Exception{
+ // pageing step3
+ int totCnt = 0;
+ if(p_vEEduAplctVOList.size() > 0) totCnt = p_vEEduAplctVOList.get(0).getTotCnt();
+ p_paginationInfo.setTotalRecordCount(totCnt);
+
+ return p_paginationInfo;
+ }
+}
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
index 93447577..64b2ff2e 100644
--- a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetailActvtHstry_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetailActvtHstry_SQL_Tibero.xml
@@ -1,151 +1,189 @@
-
-
-
-
-
-
-
-
-
-
- ve_instr_detail_actvt_hstry
-
-
-
-
- instr_detail_actvt_hstry_ord
- , user_id
- , 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.user_id as userId
- , a.instr_detail_ord as instrDetailOrd
- , TO_CHAR(a.aplct_pnttm,'YYYY-MM-DD') AS aplctPnttm
- , a.state_cd as stateCd
- , TO_CHAR(a.state_pnttm,'YYYY-MM-DD') AS statePnttm
- , a.aplct_atch_file_id as aplctAtchFileId
- , a.cmpnn_cn as cmpnnCn
- , TO_CHAR(a.frst_regist_pnttm,'YYYY-MM-DD') AS frstRegistPnttm
- , a.frst_register_id as frstRegisterId
- , TO_CHAR(a.last_updt_pnttm,'YYYY-MM-DD') AS frstRegistPnttm
- , a.last_updusr_id as lastUpdusrId
-
-
-
- /* VEInstrDetailActvtHstryDAO.insert */
- INSERT INTO (
-
- )VALUES(
- #instrDetailActvtHstryOrd#
- , #userId#
- , #instrDetailOrd#
- , SYSDATE
- , #stateCd#
- , SYSDATE
- , #aplctAtchFileId#
- , #cmpnnCn#
- , SYSDATE
- , #frstRegisterId#
- , ''
- , #lastUpdusrId#
- )
-
-
-
-
-
-
-
-
- UPDATE
-
- SET
- state_cd = #stateCd#
-
- , cmpnn_cn = #cmpnnCn#
-
- , state_pnttm = SYSDATE
- , LAST_UPDT_PNTTM = SYSDATE
- , LAST_UPDUSR_ID = #lastUpdusrId#
- WHERE
- instr_detail_actvt_hstry_ord = #instrDetailActvtHstryOrd#
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ ve_instr_detail_actvt_hstry
+
+
+
+
+ instr_detail_actvt_hstry_ord
+ , user_id
+ , 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
+
+ , docu_nmbr
+ , sex
+ , purpose
+ , bsns_nmbr
+ , bsns_nm
+
+
+
+
+
+ a.instr_detail_actvt_hstry_ord as instrDetailActvtHstryOrd
+ , a.user_id as userId
+ , a.instr_detail_ord as instrDetailOrd
+ , TO_CHAR(a.aplct_pnttm,'YYYY-MM-DD') AS aplctPnttm
+ , a.state_cd as stateCd
+ , TO_CHAR(a.state_pnttm,'YYYY-MM-DD') AS statePnttm
+ , a.aplct_atch_file_id as aplctAtchFileId
+ , a.cmpnn_cn as cmpnnCn
+ , TO_CHAR(a.frst_regist_pnttm,'YYYY-MM-DD') AS frstRegistPnttm
+ , a.frst_register_id as frstRegisterId
+ , TO_CHAR(a.last_updt_pnttm,'YYYY-MM-DD') AS frstRegistPnttm
+ , a.last_updusr_id as lastUpdusrId
+
+ , a.docu_nmbr AS docuNmbr
+ , a.sex
+ , a.purpose
+ , a.bsns_nmbr AS bsnsNmbr
+ , a.bsns_nm AS bsnsNm
+
+
+
+ /* VEInstrDetailActvtHstryDAO.insert */
+ INSERT INTO (
+
+ )VALUES(
+ #instrDetailActvtHstryOrd#
+ , #userId#
+ , #instrDetailOrd#
+ , SYSDATE
+ , #stateCd#
+ , SYSDATE
+ , #aplctAtchFileId#
+ , #cmpnnCn#
+ , SYSDATE
+ , #frstRegisterId#
+ , ''
+ , #lastUpdusrId#
+
+ , #docuNmbr#
+ , #sex#
+ , #purpose#
+ , #bsnsNmbr#
+ , #bsnsNm#
+ )
+
+
+
+
+
+
+
+
+ UPDATE
+
+ SET
+ state_cd = #stateCd#
+
+
+ , docu_nmbr = NVL(
+ (
+ SELECT nvl(max(docu_nmbr),0) AS docuNmbr
+ FROM ve_instr_detail_actvt_hstry a
+ WHERE state_cd='30'
+ AND to_char(a.state_pnttm,'YYYY')=(
+ SELECT to_char(sysdate,'YYYY')
+ FROM dual
+ )
+ GROUP BY to_char(a.state_pnttm,'YYYY')
+ ),0
+ )+1
+
+
+
+ , cmpnn_cn = #cmpnnCn#
+
+ , state_pnttm = SYSDATE
+ , LAST_UPDT_PNTTM = SYSDATE
+ , LAST_UPDUSR_ID = #lastUpdusrId#
+ WHERE
+ instr_detail_actvt_hstry_ord = #instrDetailActvtHstryOrd#
+
+
+
+
+
+
+
+
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrActvtHstryMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrActvtHstryMngDetail.jsp
index bcbaaf54..1a06eadc 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrActvtHstryMngDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrActvtHstryMngDetail.jsp
@@ -89,6 +89,11 @@
+