diff --git a/src/main/java/kcc/com/cmm/service/EgovCmmUseService.java b/src/main/java/kcc/com/cmm/service/EgovCmmUseService.java
index 2cfc4525..eab0888a 100644
--- a/src/main/java/kcc/com/cmm/service/EgovCmmUseService.java
+++ b/src/main/java/kcc/com/cmm/service/EgovCmmUseService.java
@@ -1,79 +1,81 @@
-package kcc.com.cmm.service;
-
-import java.util.List;
-import java.util.Map;
-
-import kcc.com.cmm.ComDefaultCodeVO;
-
-
-
-/**
- *
- * 공통코드등 전체 업무에서 공용해서 사용해야 하는 서비스를 정의하기 위한 서비스 인터페이스
- * @author 공통서비스 개발팀 이삼섭
- * @since 2009.04.01
- * @version 1.0
- * @see
- *
- *
- * << 개정이력(Modification Information) >>
- *
- * 수정일 수정자 수정내용
- * ------- -------- ---------------------------
- * 2009.03.11 이삼섭 최초 생성
- *
- *
- */
-public interface EgovCmmUseService {
-
- /**
- * 공통코드를 조회한다.
- *
- * @param vo
- * @return List(코드)
- * @throws Exception
- */
- public List selectCmmCodeDetail(ComDefaultCodeVO vo) throws Exception;
-
- /**
- * 공통코드를 조회한다.(by String codeId)
- *
- * @param String codeId
- * @return List(코드)
- * @throws Exception
- */
- public List selectCmmCodeDetail(String codeId) throws Exception;
-
- /**
- * ComDefaultCodeVO의 리스트를 받아서 여러개의 코드 리스트를 맵에 담아서 리턴한다.
- *
- * @param voList
- * @return Map(코드)
- * @throws Exception
- */
- public Map> selectCmmCodeDetails(List voList) throws Exception;
-
- /**
- * 조직정보를 코드형태로 리턴한다.
- *
- * @param 조회조건정보 vo
- * @return 조직정보 List
- * @throws Exception
- */
- public List selectOgrnztIdDetail(ComDefaultCodeVO vo) throws Exception;
-
- /**
- * 그룹정보를 코드형태로 리턴한다.
- *
- * @param 조회조건정보 vo
- * @return 그룹정보 List
- * @throws Exception
- */
- public List selectGroupIdDetail(ComDefaultCodeVO vo) throws Exception;
-
- public CmmnDetailCode selectCmmCodeDetailValue(ComDefaultCodeVO vo) ;
-
- public String selectCmmCodeDetailCodeValue(ComDefaultCodeVO vo);
-
- public String selectCmmCodeDetailCodeValueOnlyName(ComDefaultCodeVO vo);
-}
+package kcc.com.cmm.service;
+
+import java.util.List;
+import java.util.Map;
+
+import kcc.com.cmm.ComDefaultCodeVO;
+
+
+
+/**
+ *
+ * 공통코드등 전체 업무에서 공용해서 사용해야 하는 서비스를 정의하기 위한 서비스 인터페이스
+ * @author 공통서비스 개발팀 이삼섭
+ * @since 2009.04.01
+ * @version 1.0
+ * @see
+ *
+ *
+ * << 개정이력(Modification Information) >>
+ *
+ * 수정일 수정자 수정내용
+ * ------- -------- ---------------------------
+ * 2009.03.11 이삼섭 최초 생성
+ *
+ *
+ */
+public interface EgovCmmUseService {
+
+ /**
+ * 공통코드를 조회한다.
+ *
+ * @param vo
+ * @return List(코드)
+ * @throws Exception
+ */
+ public List selectCmmCodeDetail(ComDefaultCodeVO vo) throws Exception;
+
+ /**
+ * 공통코드를 조회한다.(by String codeId)
+ *
+ * @param String codeId
+ * @return List(코드)
+ * @throws Exception
+ */
+ public List selectCmmCodeDetail(String codeId) throws Exception;
+
+ /**
+ * ComDefaultCodeVO의 리스트를 받아서 여러개의 코드 리스트를 맵에 담아서 리턴한다.
+ *
+ * @param voList
+ * @return Map(코드)
+ * @throws Exception
+ */
+ public Map> selectCmmCodeDetails(List voList) throws Exception;
+
+ /**
+ * 조직정보를 코드형태로 리턴한다.
+ *
+ * @param 조회조건정보 vo
+ * @return 조직정보 List
+ * @throws Exception
+ */
+ public List selectOgrnztIdDetail(ComDefaultCodeVO vo) throws Exception;
+
+ /**
+ * 그룹정보를 코드형태로 리턴한다.
+ *
+ * @param 조회조건정보 vo
+ * @return 그룹정보 List
+ * @throws Exception
+ */
+ public List selectGroupIdDetail(ComDefaultCodeVO vo) throws Exception;
+
+ public CmmnDetailCode selectCmmCodeDetailValue(ComDefaultCodeVO vo) ;
+
+ public String selectCmmCodeDetailCodeValue(ComDefaultCodeVO vo);
+
+ public String selectCmmCodeDetailCodeValueOnlyName(ComDefaultCodeVO vo);
+
+ public List selectCmmCodeDetailOrderByCode(ComDefaultCodeVO codeParam);
+}
diff --git a/src/main/java/kcc/com/cmm/service/impl/CmmUseDAO.java b/src/main/java/kcc/com/cmm/service/impl/CmmUseDAO.java
index 067c3c4c..d258a9e6 100644
--- a/src/main/java/kcc/com/cmm/service/impl/CmmUseDAO.java
+++ b/src/main/java/kcc/com/cmm/service/impl/CmmUseDAO.java
@@ -1,78 +1,91 @@
-package kcc.com.cmm.service.impl;
-
-import java.util.List;
-
-import org.springframework.stereotype.Repository;
-
-import kcc.com.cmm.ComDefaultCodeVO;
-import kcc.com.cmm.service.CmmnDetailCode;
-
-/**
- * @Class Name : CmmUseDAO.java
- * @Description : 공통코드등 전체 업무에서 공용해서 사용해야 하는 서비스를 정의하기위한 데이터 접근 클래스
- * @Modification Information
- *
- * 수정일 수정자 수정내용
- * ------- ------- -------------------
- * 2009. 3. 11. 이삼섭
- *
- * @author 공통 서비스 개발팀 이삼섭
- * @since 2009. 3. 11.
- * @version
- * @see
- *
- */
-@Repository("cmmUseDAO")
-public class CmmUseDAO extends EgovComAbstractDAO {
-
- /**
- * 주어진 조건에 따른 공통코드를 불러온다.
- *
- * @param vo
- * @return
- * @throws Exception
- */
- @SuppressWarnings("unchecked")
- public List selectCmmCodeDetail(ComDefaultCodeVO vo) throws Exception {
- return (List) list("CmmUseDAO.selectCmmCodeDetail", vo);
- }
-
- /**
- * 공통코드로 사용할 조직정보를 를 불러온다.
- *
- * @param vo
- * @return
- * @throws Exception
- */
- @SuppressWarnings("unchecked")
- public List selectOgrnztIdDetail(ComDefaultCodeVO vo) throws Exception {
- return (List) list("CmmUseDAO.selectOgrnztIdDetail", vo);
- }
-
- /**
- * 공통코드로 사용할그룹정보를 를 불러온다.
- *
- * @param vo
- * @return
- * @throws Exception
- */
- @SuppressWarnings("unchecked")
- public List selectGroupIdDetail(ComDefaultCodeVO vo) throws Exception {
- return (List) list("CmmUseDAO.selectGroupIdDetail", vo);
- }
-
- /**
- * 주어진 조건에 따른 공통코드를 불러온다.
- *
- * @param vo
- * @return
- * @throws Exception
- */
- public CmmnDetailCode selectCmmCodeDetailValue(ComDefaultCodeVO vo) {
- return (CmmnDetailCode) select("CmmUseDAO.selectCmmCodeDetailValue", vo);
- }
-
- public CmmnDetailCode selectCmmCodeDetailValueOnlyName(ComDefaultCodeVO vo) {
- return (CmmnDetailCode) select("CmmUseDAO.selectCmmCodeDetailValueOnlyName", vo);
- }
-}
+package kcc.com.cmm.service.impl;
+
+import java.util.List;
+
+import org.springframework.stereotype.Repository;
+
+import kcc.com.cmm.ComDefaultCodeVO;
+import kcc.com.cmm.service.CmmnDetailCode;
+
+/**
+ * @Class Name : CmmUseDAO.java
+ * @Description : 공통코드등 전체 업무에서 공용해서 사용해야 하는 서비스를 정의하기위한 데이터 접근 클래스
+ * @Modification Information
+ *
+ * 수정일 수정자 수정내용
+ * ------- ------- -------------------
+ * 2009. 3. 11. 이삼섭
+ *
+ * @author 공통 서비스 개발팀 이삼섭
+ * @since 2009. 3. 11.
+ * @version
+ * @see
+ *
+ */
+@Repository("cmmUseDAO")
+public class CmmUseDAO extends EgovComAbstractDAO {
+
+ /**
+ * 주어진 조건에 따른 공통코드를 불러온다.
+ *
+ * @param vo
+ * @return
+ * @throws Exception
+ */
+ @SuppressWarnings("unchecked")
+ public List selectCmmCodeDetail(ComDefaultCodeVO vo) throws Exception {
+ return (List) list("CmmUseDAO.selectCmmCodeDetail", vo);
+ }
+
+ /**
+ * 공통코드로 사용할 조직정보를 를 불러온다.
+ *
+ * @param vo
+ * @return
+ * @throws Exception
+ */
+ @SuppressWarnings("unchecked")
+ public List selectOgrnztIdDetail(ComDefaultCodeVO vo) throws Exception {
+ return (List) list("CmmUseDAO.selectOgrnztIdDetail", vo);
+ }
+
+ /**
+ * 공통코드로 사용할그룹정보를 를 불러온다.
+ *
+ * @param vo
+ * @return
+ * @throws Exception
+ */
+ @SuppressWarnings("unchecked")
+ public List selectGroupIdDetail(ComDefaultCodeVO vo) throws Exception {
+ return (List) list("CmmUseDAO.selectGroupIdDetail", vo);
+ }
+
+ /**
+ * 주어진 조건에 따른 공통코드를 불러온다.
+ *
+ * @param vo
+ * @return
+ * @throws Exception
+ */
+ public CmmnDetailCode selectCmmCodeDetailValue(ComDefaultCodeVO vo) {
+ return (CmmnDetailCode) select("CmmUseDAO.selectCmmCodeDetailValue", vo);
+ }
+
+ public CmmnDetailCode selectCmmCodeDetailValueOnlyName(ComDefaultCodeVO vo) {
+ return (CmmnDetailCode) select("CmmUseDAO.selectCmmCodeDetailValueOnlyName", vo);
+ }
+
+ /**
+ * @methodName : selectCmmCodeDetailOrderByCode
+ * @author : 이호영
+ * @date : 2023.11.20
+ * @description : code로 order by
+ * @param codeParam
+ * @return
+ */
+ @SuppressWarnings("unchecked")
+ public List selectCmmCodeDetailOrderByCode(ComDefaultCodeVO codeParam) {
+ return (List) list("CmmUseDAO.selectCmmCodeDetailOrderByCode", codeParam);
+ }
+}
diff --git a/src/main/java/kcc/com/cmm/service/impl/EgovCmmUseServiceImpl.java b/src/main/java/kcc/com/cmm/service/impl/EgovCmmUseServiceImpl.java
index b18bdc52..3b6ed35f 100644
--- a/src/main/java/kcc/com/cmm/service/impl/EgovCmmUseServiceImpl.java
+++ b/src/main/java/kcc/com/cmm/service/impl/EgovCmmUseServiceImpl.java
@@ -1,139 +1,145 @@
-package kcc.com.cmm.service.impl;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Resource;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
-
-import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl;
-import kcc.com.cmm.ComDefaultCodeVO;
-import kcc.com.cmm.service.CmmnDetailCode;
-import kcc.com.cmm.service.EgovCmmUseService;
-
-/**
- * @Class Name : EgovCmmUseServiceImpl.java
- * @Description : 공통코드등 전체 업무에서 공용해서 사용해야 하는 서비스를 정의하기위한 서비스 구현 클래스
- * @Modification Information
- *
- * 수정일 수정자 수정내용
- * ------- ------- -------------------
- * 2009. 3. 11. 이삼섭
- *
- * @author 공통 서비스 개발팀 이삼섭
- * @since 2009. 3. 11.
- * @version
- * @see
- *
- */
-@Service("EgovCmmUseService")
-public class EgovCmmUseServiceImpl extends EgovAbstractServiceImpl implements EgovCmmUseService {
-
- @Resource(name = "cmmUseDAO")
- private CmmUseDAO cmmUseDAO;
-
- /**
- * 공통코드를 조회한다.
- *
- * @param vo
- * @return
- * @throws Exception
- */
- @Override
- public List selectCmmCodeDetail(ComDefaultCodeVO vo) throws Exception {
- return cmmUseDAO.selectCmmCodeDetail(vo);
- }
-
- /**
- * 공통코드를 조회한다.(by String codeId)
- *
- * @param String codeId
- * @return
- * @throws Exception
- */
- @Override
- public List selectCmmCodeDetail(String codeId) throws Exception {
- ComDefaultCodeVO comDefaultCodeVO = new ComDefaultCodeVO();
- comDefaultCodeVO.setCodeId(codeId);
- return cmmUseDAO.selectCmmCodeDetail(comDefaultCodeVO);
- }
-
- /**
- * ComDefaultCodeVO의 리스트를 받아서 여러개의 코드 리스트를 맵에 담아서 리턴한다.
- *
- * @param voList
- * @return
- * @throws Exception
- */
- @Override
- @SuppressWarnings("rawtypes")
- public Map> selectCmmCodeDetails(List voList) throws Exception {
- ComDefaultCodeVO vo;
- Map> map = new HashMap>();
-
- Iterator iter = voList.iterator();
- while (iter.hasNext()) {
- vo = (ComDefaultCodeVO) iter.next();
- map.put(vo.getCodeId(), cmmUseDAO.selectCmmCodeDetail(vo));
- }
-
- return map;
- }
-
- /**
- * 조직정보를 코드형태로 리턴한다.
- *
- * @param 조회조건정보 vo
- * @return 조직정보 List
- * @throws Exception
- */
- @Override
- public List selectOgrnztIdDetail(ComDefaultCodeVO vo) throws Exception {
- return cmmUseDAO.selectOgrnztIdDetail(vo);
- }
-
- /**
- * 그룹정보를 코드형태로 리턴한다.
- *
- * @param 조회조건정보 vo
- * @return 그룹정보 List
- * @throws Exception
- */
- @Override
- public List selectGroupIdDetail(ComDefaultCodeVO vo) throws Exception {
- return cmmUseDAO.selectGroupIdDetail(vo);
- }
-
- @Override
- public CmmnDetailCode selectCmmCodeDetailValue(ComDefaultCodeVO vo) {
- return cmmUseDAO.selectCmmCodeDetailValue(vo);
- }
-
- @Override
- public String selectCmmCodeDetailCodeValue(ComDefaultCodeVO vo) {
- String resultCodeNm = "";
- if(StringUtils.isNotBlank(vo.getCodeId()) && StringUtils.isNotBlank(vo.getCode())){
- CmmnDetailCode code = cmmUseDAO.selectCmmCodeDetailValue(vo);
- if(code != null){
- resultCodeNm = code.getCodeNm();
- }
- }
- return resultCodeNm;
- }
-
- @Override
- public String selectCmmCodeDetailCodeValueOnlyName(ComDefaultCodeVO vo) {
- String resultCodeNm = "";
- if(StringUtils.isNotBlank(vo.getCodeId()) && StringUtils.isNotBlank(vo.getCode())){
- CmmnDetailCode code = cmmUseDAO.selectCmmCodeDetailValueOnlyName(vo);
- if(code != null){
- resultCodeNm = code.getCodeNm();
- }
- }
- return resultCodeNm;
- }
-}
+package kcc.com.cmm.service.impl;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl;
+import kcc.com.cmm.ComDefaultCodeVO;
+import kcc.com.cmm.service.CmmnDetailCode;
+import kcc.com.cmm.service.EgovCmmUseService;
+
+/**
+ * @Class Name : EgovCmmUseServiceImpl.java
+ * @Description : 공통코드등 전체 업무에서 공용해서 사용해야 하는 서비스를 정의하기위한 서비스 구현 클래스
+ * @Modification Information
+ *
+ * 수정일 수정자 수정내용
+ * ------- ------- -------------------
+ * 2009. 3. 11. 이삼섭
+ *
+ * @author 공통 서비스 개발팀 이삼섭
+ * @since 2009. 3. 11.
+ * @version
+ * @see
+ *
+ */
+@Service("EgovCmmUseService")
+public class EgovCmmUseServiceImpl extends EgovAbstractServiceImpl implements EgovCmmUseService {
+
+ @Resource(name = "cmmUseDAO")
+ private CmmUseDAO cmmUseDAO;
+
+ /**
+ * 공통코드를 조회한다.
+ *
+ * @param vo
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public List selectCmmCodeDetail(ComDefaultCodeVO vo) throws Exception {
+ return cmmUseDAO.selectCmmCodeDetail(vo);
+ }
+
+ /**
+ * 공통코드를 조회한다.(by String codeId)
+ *
+ * @param String codeId
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public List selectCmmCodeDetail(String codeId) throws Exception {
+ ComDefaultCodeVO comDefaultCodeVO = new ComDefaultCodeVO();
+ comDefaultCodeVO.setCodeId(codeId);
+ return cmmUseDAO.selectCmmCodeDetail(comDefaultCodeVO);
+ }
+
+ /**
+ * ComDefaultCodeVO의 리스트를 받아서 여러개의 코드 리스트를 맵에 담아서 리턴한다.
+ *
+ * @param voList
+ * @return
+ * @throws Exception
+ */
+ @Override
+ @SuppressWarnings("rawtypes")
+ public Map> selectCmmCodeDetails(List voList) throws Exception {
+ ComDefaultCodeVO vo;
+ Map> map = new HashMap>();
+
+ Iterator iter = voList.iterator();
+ while (iter.hasNext()) {
+ vo = (ComDefaultCodeVO) iter.next();
+ map.put(vo.getCodeId(), cmmUseDAO.selectCmmCodeDetail(vo));
+ }
+
+ return map;
+ }
+
+ /**
+ * 조직정보를 코드형태로 리턴한다.
+ *
+ * @param 조회조건정보 vo
+ * @return 조직정보 List
+ * @throws Exception
+ */
+ @Override
+ public List selectOgrnztIdDetail(ComDefaultCodeVO vo) throws Exception {
+ return cmmUseDAO.selectOgrnztIdDetail(vo);
+ }
+
+ /**
+ * 그룹정보를 코드형태로 리턴한다.
+ *
+ * @param 조회조건정보 vo
+ * @return 그룹정보 List
+ * @throws Exception
+ */
+ @Override
+ public List selectGroupIdDetail(ComDefaultCodeVO vo) throws Exception {
+ return cmmUseDAO.selectGroupIdDetail(vo);
+ }
+
+ @Override
+ public CmmnDetailCode selectCmmCodeDetailValue(ComDefaultCodeVO vo) {
+ return cmmUseDAO.selectCmmCodeDetailValue(vo);
+ }
+
+ @Override
+ public String selectCmmCodeDetailCodeValue(ComDefaultCodeVO vo) {
+ String resultCodeNm = "";
+ if(StringUtils.isNotBlank(vo.getCodeId()) && StringUtils.isNotBlank(vo.getCode())){
+ CmmnDetailCode code = cmmUseDAO.selectCmmCodeDetailValue(vo);
+ if(code != null){
+ resultCodeNm = code.getCodeNm();
+ }
+ }
+ return resultCodeNm;
+ }
+
+ @Override
+ public String selectCmmCodeDetailCodeValueOnlyName(ComDefaultCodeVO vo) {
+ String resultCodeNm = "";
+ if(StringUtils.isNotBlank(vo.getCodeId()) && StringUtils.isNotBlank(vo.getCode())){
+ CmmnDetailCode code = cmmUseDAO.selectCmmCodeDetailValueOnlyName(vo);
+ if(code != null){
+ resultCodeNm = code.getCodeNm();
+ }
+ }
+ return resultCodeNm;
+ }
+
+ @Override
+ public List selectCmmCodeDetailOrderByCode(ComDefaultCodeVO codeParam) {
+ // TODO Auto-generated method stub
+ return cmmUseDAO.selectCmmCodeDetailOrderByCode(codeParam);
+ }
+}
diff --git a/src/main/java/kcc/com/cmm/web/EgovFileMngController.java b/src/main/java/kcc/com/cmm/web/EgovFileMngController.java
index 54c0740c..46776e97 100644
--- a/src/main/java/kcc/com/cmm/web/EgovFileMngController.java
+++ b/src/main/java/kcc/com/cmm/web/EgovFileMngController.java
@@ -420,6 +420,7 @@ public class EgovFileMngController {
}
/**
+
* ve_edu_aplct 첨부파일 목록 - 타입별로 첨부파일 삭제 및 데이터 null 처리를 위한
*
* @param fileVO
@@ -475,4 +476,31 @@ public class EgovFileMngController {
}
return modelAndView;
}
+ /*
+ * 게시판 첨부파일에 대한 목록을 조회한다.
+ *
+ * @param fileVO
+ * @param commandMap
+ * @param model
+ * @return
+ * @throws Exception
+ */
+ @RequestMapping("/cmm/fms/selectBBSFileInfsCustom.do")
+ public String selectBBSFileInfsCustom(@ModelAttribute("searchVO") FileVO fileVO, @RequestParam Map commandMap, ModelMap model) throws Exception {
+ String atchFileId = (String) commandMap.get("param_atchFileId");
+ String pdfView = (String) commandMap.get("pdf_view"); //'Y' 이면 pdf 직접 보여주기
+
+ 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);
+ if("Y".equals(pdfView)){
+ model.addAttribute("pdfView", pdfView);
+ }
+
+ return "cmm/fms/EgovBBSFileListCustom";
+
+ }
}
diff --git a/src/main/java/kcc/com/utl/user/service/CheckFileUtil.java b/src/main/java/kcc/com/utl/user/service/CheckFileUtil.java
index a80a6db9..a9aea0c1 100644
--- a/src/main/java/kcc/com/utl/user/service/CheckFileUtil.java
+++ b/src/main/java/kcc/com/utl/user/service/CheckFileUtil.java
@@ -299,6 +299,62 @@ public class CheckFileUtil {
, i_data_start_row
);
}
+
+ /**
+ * @param p_multiRequest - MultipartHttpServletRequest
+ * @param p_modelAndView - ModelAndView
+ * @param p_file_nm_prefix - 파일 저장명 prefix
+ * @param p_exts - 가능한 확장자
+ * @param p_i_file_size - 가능한 파일 용량 MB 단위
+ * @param p_i_file_count - 가능한 파일 수량
+ * @return
+ * @throws Exception
+ */
+ public String fileValCheckNdbInsertCustom(
+// MultipartHttpServletRequest p_multiRequest
+ Map files
+ , ModelAndView p_modelAndView
+ , String p_file_nm_prefix //파일 저장명 prefix
+ , String p_exts //가능한 확장자를 받는다. |
+ , int p_i_file_size //가능한 파일 용량 MB 단위
+ , int p_i_file_count //가능한 파일 수량
+
+ ) throws Exception{
+
+ return this.p_fileValCheckNdbInsertCustom(files, p_modelAndView, p_file_nm_prefix, p_exts, p_i_file_size, p_i_file_count);
+
+ }
+
+
+
+ /**
+ * @param p_multiRequest - MultipartHttpServletRequest
+ * @param p_modelAndView - ModelAndView
+ * @param p_file_nm_prefix - 파일 저장명 prefix
+ * @param p_exts - 가능한 확장자
+ * @param p_i_file_size - 가능한 파일 용량 MB 단위
+ * @param p_i_file_count - 가능한 파일 수량
+ * @param p_atchFileId - 기존 파일 그룹명
+ * @return
+ * @throws Exception
+ */
+ public String fileValCheckNdbUpdateCustom(
+// MultipartHttpServletRequest p_multiRequest
+ Map files
+ , ModelAndView p_modelAndView
+ , String p_file_nm_prefix //파일 저장명 prefix
+ , String p_exts //가능한 확장자를 받는다. |
+ , int p_i_file_size //가능한 파일 용량 MB 단위
+ , int p_i_file_count //가능한 파일 수량
+ , String p_atchFileId
+ //, BoardMasterVO p_bmVO //게시판 형인 경우 사용
+ ) throws Exception{
+
+ return this.p_fileValCheckNdbUpdateCustom(files, p_modelAndView, p_file_nm_prefix, p_exts, p_i_file_size, p_i_file_count, p_atchFileId);
+ }
+
+
+
//////////////////////////////////////////////////////////////////////////////////////////////////////////////
//
//
@@ -939,5 +995,126 @@ public class CheckFileUtil {
return p_atchFileId;
}
+
+
+
+
+ /**
+ * @param p_multiRequest - MultipartHttpServletRequest
+ * @param p_modelAndView - ModelAndView
+ * @param p_file_nm_prefix - 파일 저장명 prefix
+ * @param p_exts - 가능한 확장자
+ * @param p_i_file_size - 가능한 파일 용량 MB 단위
+ * @param p_i_file_count - 가능한 파일 수량
+ * @return
+ * @throws Exception
+ */
+ private String p_fileValCheckNdbInsertCustom(
+// MultipartHttpServletRequest p_multiRequest
+ Map files
+ , ModelAndView p_modelAndView
+ , String p_file_nm_prefix //파일 저장명 prefix
+ , String p_exts //가능한 확장자를 받는다. |
+ , int p_i_file_size //가능한 파일 용량 MB 단위
+ , int p_i_file_count //가능한 파일 수량
+
+ ) throws Exception{
+
+ LOGGER.debug("CheckFileUtil.fileValCheckNdbInsertCustom()");
+
+ boolean in_bool = true;
+
+
+ List result = null;
+ String atchFileId = "";
+ String isThumbFile = "";
+ //String isThumbFile = "thumbFile"; //"thumbFile" - 썸네일을 생성한다.
+
+// final Map files = p_multiRequest.getFileMap();
+ if (!files.isEmpty()) {
+ result = egovFileMngUtil.parseFileInf(files, p_file_nm_prefix, 0, "", "", isThumbFile);
+
+
+ //관리자에서 게시판 설정시 업로드 파일 사이즈와 수량 체크용
+ //사용자 설정용 업로드 파일 사이즈 & 파일 수량 & 확장자 체크용
+ if(!isPosblAtchFileMvWithUserSetting(result, p_modelAndView, p_exts, p_i_file_size, p_i_file_count, 0)) {
+ p_modelAndView.addObject("result", "fail");
+ in_bool = false;
+ }else {
+ atchFileId = fileMngService.insertFileInfs(result); //첨부 파일
+ }
+
+ }else {
+ System.out.println("isempty");
+ }
+
+ if (!in_bool) atchFileId = "ERROR";
+
+ return atchFileId;
+ }
+
+ //사용자 업로드 파일 처리 - 파일수량 상관없음 - 전자정부 게시판 인 경우에 대한 변형만 있음(파일수량은 1~ 처리 가능)
+ /**
+ * @param p_multiRequest - MultipartHttpServletRequest
+ * @param p_modelAndView - ModelAndView
+ * @param p_file_nm_prefix - 파일 저장명 prefix
+ * @param p_exts - 가능한 확장자
+ * @param p_i_file_size - 가능한 파일 용량 MB 단위
+ * @param p_i_file_count - 가능한 파일 수량
+ * @param p_atchFileId - 기존 파일 그룹명
+ * @return
+ * @throws Exception
+ */
+ private String p_fileValCheckNdbUpdateCustom(
+// MultipartHttpServletRequest p_multiRequest
+ Map files
+ , ModelAndView p_modelAndView
+ , String p_file_nm_prefix //파일 저장명 prefix
+ , String p_exts //가능한 확장자를 받는다. |
+ , int p_i_file_size //가능한 파일 용량 MB 단위
+ , int p_i_file_count //가능한 파일 수량
+ , String p_atchFileId
+ //, BoardMasterVO p_bmVO //게시판 형인 경우 사용
+ ) throws Exception{
+
+ LOGGER.debug("CheckFileUtil.fileValCheckNdbUpdateCustom()");
+
+ boolean in_bool = true;
+
+ List result = null;
+ //String atchFileId = "";
+ String isThumbFile = "";
+ //String isThumbFile = "thumbFile"; //"thumbFile" - 썸네일을 생성한다.
+
+// final Map files = p_multiRequest.getFileMap();
+ if (!files.isEmpty()) {
+ FileVO fvo = new FileVO();
+ fvo.setAtchFileId(p_atchFileId);
+ int cnt = fileMngService.getMaxFileSN(fvo);
+
+
+ //관리자에서 게시판 설정시 업로드 파일 사이즈와 수량 체크용
+ //사용자 설정용 업로드 파일 사이즈 & 파일 수량 & 확장자 체크용
+ if(!isPosblAtchFileMvWithUserSetting(result, p_modelAndView, p_exts, p_i_file_size, p_i_file_count, 0)) {
+ p_modelAndView.addObject("result", "fail");
+
+ in_bool = false;
+
+ }else {
+ //atchFileId = fileMngService.insertFileInfs(result); //첨부 파일
+ //result = egovFileMngUtil.parseFileInf(files, "CHGDATE_", cnt, p_atchFileId, "", isThumbFile);
+ result = egovFileMngUtil.parseFileInf(files, p_file_nm_prefix, cnt, p_atchFileId, "", isThumbFile);
+ fileMngService.updateFileInfs(result);
+
+ }
+
+ }else {
+ System.out.println("isempty");
+ }
+
+ if (!in_bool) p_atchFileId = "ERROR";
+
+ return p_atchFileId;
+ }
}
\ No newline at end of file
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 8f95cbab..4ecec0a3 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
@@ -182,6 +182,20 @@ public class ExprnClsrmAplctController {
detailVO = vEPrcsAplctPrdService.selectDetailNewOne(detailVO);
model.addAttribute("detailVO", detailVO);
+ VEPrcsDetailVO vEPrcsDetailVO = new VEPrcsDetailVO();
+
+ VEPrcsDetailVO info = vEPrcsAplctPrdService.selectPagingList(vEPrcsDetailVO).get(0);
+ model.addAttribute("info", info);
+
+ //파일 정보 가져오기
+ FileVO fileVO_cn = new FileVO();
+ fileVO_cn.setAtchFileId(info.getCnAtchFileId());
+ List result_cn = fileService.selectFileInfs(fileVO_cn);
+ model.addAttribute("fileList", result_cn);
+ model.addAttribute("fileListCnt", result_cn.size());
+
+
+
return "/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctGuide";
}
diff --git a/src/main/java/kcc/ve/cmm/VeSendMail.java b/src/main/java/kcc/ve/cmm/VeSendMail.java
index f723723a..9c3da710 100644
--- a/src/main/java/kcc/ve/cmm/VeSendMail.java
+++ b/src/main/java/kcc/ve/cmm/VeSendMail.java
@@ -75,7 +75,10 @@ public class VeSendMail {
{
String id = "no-reply@copyright.or.kr";
String pw = "Copycopy12!";
- if("C".equals(sndFlag) || "Z".equals(sndFlag)) {
+ /*231120 - 성인 교육용 메일 정보 불일치 > 전부 청소년 메일로 우선 사용*/
+ id = "school@copyright.or.kr";
+ pw = "dustndnjs2669!";
+ /*if("C".equals(sndFlag) || "Z".equals(sndFlag)) {
id = "school@copyright.or.kr";
//pw = "연수원2669!";
pw = "dustndnjs2669!";
@@ -93,7 +96,7 @@ public class VeSendMail {
id = vEEduAplctVO.getClphone1();
pw = vEEduAplctVO.getClphone2();
- }
+ }*/
System.out.println(id);
System.out.println(pw);
diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java
index 0f284399..186b71ab 100644
--- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java
+++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java
@@ -142,6 +142,9 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable {
private String chrctCn;
private String prcsAplctPrdEtcOrd;
+ private String dprtmNm;
+ private String cnAtchFileId;
+
private String prcsAplctPrdQnaOrd;
private String qnaRegist;
@@ -149,6 +152,8 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable {
private String qnaAnswerCn;
private String qnaAnswerer;
+ private String mberNm;
+
@@ -693,6 +698,7 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable {
public void setPrcsAplctPrdEtcOrd(String prcsAplctPrdEtcOrd) {
this.prcsAplctPrdEtcOrd = prcsAplctPrdEtcOrd;
}
+
public String getPrcsAplctPrdQnaOrd() {
return prcsAplctPrdQnaOrd;
}
@@ -723,6 +729,26 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable {
public void setQnaAnswerer(String qnaAnswerer) {
this.qnaAnswerer = qnaAnswerer;
}
+
+ public String getDprtmNm() {
+ return dprtmNm;
+ }
+ public void setDprtmNm(String dprtmNm) {
+ this.dprtmNm = dprtmNm;
+ }
+ public String getCnAtchFileId() {
+ return cnAtchFileId;
+ }
+ public void setCnAtchFileId(String cnAtchFileId) {
+ this.cnAtchFileId = cnAtchFileId;
+ }
+
+ public String getMberNm() {
+ return mberNm;
+ }
+ public void setMberNm(String mberNm) {
+ this.mberNm = mberNm;
+ }
}
diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsService.java
index ca47e14e..ed8979d9 100644
--- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsService.java
+++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsService.java
@@ -32,5 +32,11 @@ public interface VEPrcsService {
void deleteInstr(VEPrcsDetailVO vEPrcsDetailVO);
void updateImageAtchFileId(VEPrcsDetailVO vEPrcsDetailVO);
+
+ List selectQnaPagingList(VEPrcsDetailVO vEPrcsDetailVO);
+
+ VEPrcsDetailVO selectQnaDetail(VEPrcsDetailVO vEPrcsDetailVO);
+
+ void qnaUpdate(VEPrcsDetailVO 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 29f8d8e6..dc2ce958 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
@@ -44,8 +44,9 @@ public class VEPrcsAplctPrdServiceImpl implements VEPrcsAplctPrdService {
//U
public int update(VEPrcsDetailVO paramVO) throws Exception{
- vEPrcsAplctPrdDAO.update(paramVO);
- return vEPrcsDAO.update(paramVO);
+// vEPrcsAplctPrdDAO.update(paramVO);
+// return vEPrcsDAO.update(paramVO);
+ return vEPrcsAplctPrdDAO.update(paramVO);
}
//D
@@ -120,8 +121,8 @@ public class VEPrcsAplctPrdServiceImpl implements VEPrcsAplctPrdService {
@Override
public void updateEtc(VEPrcsDetailVO vEPrcsDetailVO) {
System.out.println(vEPrcsDetailVO.getPrpsCn());
- System.out.println(vEPrcsDetailVO.getChrctCn());
- System.out.println(vEPrcsDetailVO.getPrcsAplctPrdOrd());
+// System.out.println(vEPrcsDetailVO.getChrctCn());
+// System.out.println(vEPrcsDetailVO.getPrcsAplctPrdOrd());
vEPrcsAplctPrdDAO.updateEtc(vEPrcsDetailVO);
}
diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsDAO.java
index 3c553509..93bed127 100644
--- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsDAO.java
+++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsDAO.java
@@ -84,5 +84,17 @@ public class VEPrcsDAO extends EgovAbstractDAO {
public void updateImageAtchFileId(VEPrcsDetailVO vEPrcsDetailVO) {
update("VEPrcsDAO.updateImageAtchFileId", vEPrcsDetailVO);
}
+
+ public List selectQnaPagingList(VEPrcsDetailVO vEPrcsDetailVO) {
+ return (List) list("VEPrcsDAO.selectQnaPagingList", vEPrcsDetailVO);
+ }
+
+ public VEPrcsDetailVO selectQnaDetail(VEPrcsDetailVO vEPrcsDetailVO) {
+ return (VEPrcsDetailVO) select("VEPrcsDAO.selectQnaDetail", vEPrcsDetailVO);
+ }
+
+ public void qnaUpdate(VEPrcsDetailVO vEPrcsDetailVO) {
+ update("VEPrcsDAO.qnaUpdate", vEPrcsDetailVO);
+ }
}
diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsServiceImpl.java
index 7c6e7579..df4a90c7 100644
--- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsServiceImpl.java
+++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsServiceImpl.java
@@ -69,5 +69,20 @@ public class VEPrcsServiceImpl implements VEPrcsService {
public void updateImageAtchFileId(VEPrcsDetailVO vEPrcsDetailVO) {
vEPrcsDAO.updateImageAtchFileId(vEPrcsDetailVO);
}
+
+ @Override
+ public List selectQnaPagingList(VEPrcsDetailVO vEPrcsDetailVO) {
+ return vEPrcsDAO.selectQnaPagingList(vEPrcsDetailVO);
+ }
+
+ @Override
+ public VEPrcsDetailVO selectQnaDetail(VEPrcsDetailVO vEPrcsDetailVO) {
+ return vEPrcsDAO.selectQnaDetail(vEPrcsDetailVO);
+ }
+
+ @Override
+ public void qnaUpdate(VEPrcsDetailVO vEPrcsDetailVO) {
+ vEPrcsDAO.qnaUpdate(vEPrcsDetailVO);
+ }
}
diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngVO.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngVO.java
index a7e6dfd4..1e98b1cd 100644
--- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngVO.java
+++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngVO.java
@@ -1,6 +1,8 @@
package kcc.ve.oprtn.cndtnSspnIdtmt.trgtMng.service;
import java.io.Serializable;
+import java.util.Arrays;
+import java.util.List;
import kcc.com.cmm.ComDefaultVO;
@@ -42,6 +44,7 @@ public class CndtnTrgtMngVO extends ComDefaultVO implements Serializable {
private String atchFileId;// 첨부파일 ID
+ private List searchSelStatusList;
@@ -197,8 +200,16 @@ public class CndtnTrgtMngVO extends ComDefaultVO implements Serializable {
public void setAtchFileId(String atchFileId) {
this.atchFileId = atchFileId;
}
+ public List getSearchSelStatusList() {
+ return searchSelStatusList;
+ }
+ public void setSearchSelStatusList(List searchSelStatusList) {
+ this.searchSelStatusList = searchSelStatusList;
+ }
-
+ public void setSearchSelStatusToList(String searchSelStatus) {
+ this.searchSelStatusList = Arrays.asList(searchSelStatus.split(","));
+ }
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 e16f3180..df0f6ef6 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
@@ -22,7 +22,10 @@ import org.springframework.web.servlet.ModelAndView;
import egovframework.rte.fdl.idgnr.EgovIdGnrService;
import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo;
+import kcc.com.cmm.ComDefaultCodeVO;
import kcc.com.cmm.LoginVO;
+import kcc.com.cmm.service.CmmnDetailCode;
+import kcc.com.cmm.service.EgovCmmUseService;
import kcc.com.cmm.service.EgovFileMngService;
import kcc.com.cmm.service.FileVO;
import kcc.com.cmm.util.DateUtil;
@@ -105,6 +108,8 @@ public class CndtnTrgtMngController {
@Resource(name = "EgovFileMngService")
private EgovFileMngService fileService;
+ @Resource(name = "EgovCmmUseService")
+ private EgovCmmUseService egovCmmUseService;
/*
@@ -164,8 +169,6 @@ public class CndtnTrgtMngController {
//로그인 처리====================================
-
-
String userWork = this.getUserWork(request);
cndtnTrgtInfoMngVO.setSearchCondition(userWork);
@@ -209,6 +212,9 @@ public class CndtnTrgtMngController {
//대상 리스트, 페이징 정보 전달
model.addAttribute("list", cndtnTrgtInfoMngVOList);
+
+
+
return "oprtn/cndtnSspnIdtmt/trgtList";
}
@@ -252,7 +258,7 @@ public class CndtnTrgtMngController {
if (!"".equals(s_oprtnLoginCheckNInfo)) return s_oprtnLoginCheckNInfo;
//로그인 처리====================================
-
+
//1.pageing step1
PaginationInfo paginationInfo = this.setCndtnPagingStep1(cndtnTrgtInfoMngVO);
@@ -263,19 +269,23 @@ public class CndtnTrgtMngController {
cndtnTrgtInfoMngVO = this.setCndtnPagingStep2(cndtnTrgtInfoMngVO, paginationInfo);
//검색 조회
+ String selectCondition = "";
if(StringUtil.isNotEmpty(cndtnTrgtInfoMngVO.getSearchKeyword())){
-
-
- String selectCondition = "";
String searchStatus = cndtnTrgtInfoMngVO.getSearchStatus();
-
- selectCondition = "AND a."+searchStatus+" LIKE CONCAT ('%', '" +cndtnTrgtInfoMngVO.getSearchKeyword() + "', '%')";
+// selectCondition = "AND a."+searchStatus+" LIKE CONCAT ('%', '" +cndtnTrgtInfoMngVO.getSearchKeyword() + "', '%')";
+ selectCondition = "AND a."+searchStatus+" LIKE '%" +cndtnTrgtInfoMngVO.getSearchKeyword() + "%'";
cndtnTrgtInfoMngVO.setSearchQuery(selectCondition);
-
}
-
-// List cndtnTrgtInfoMngVOList = cndtnTrgtInfoMngService.selectPagingList(cndtnTrgtInfoMngVO);
+
+ System.out.println("cndtnTrgtInfoMngVO.getSearchSelStatus() : "+ cndtnTrgtInfoMngVO.getSearchSelStatus());
+
+ if(StringUtils.isNotEmpty(cndtnTrgtInfoMngVO.getSearchSelStatus()))
+ {
+ cndtnTrgtInfoMngVO.setSearchSelStatusToList(cndtnTrgtInfoMngVO.getSearchSelStatus());
+ }
+
List cndtnTrgtInfoMngVOList = null;
+
try {
cndtnTrgtInfoMngVOList = cndtnTrgtInfoMngService.selectPagingList(cndtnTrgtInfoMngVO);
@@ -292,6 +302,11 @@ public class CndtnTrgtMngController {
//대상 리스트, 페이징 정보 전달
model.addAttribute("list", cndtnTrgtInfoMngVOList);
+
+ ComDefaultCodeVO codeParam = new ComDefaultCodeVO();
+ codeParam.setCodeId("VEA008");
+ List CmmnDetailCodeList = egovCmmUseService.selectCmmCodeDetailOrderByCode(codeParam);
+ model.addAttribute("CmmnDetailCodeList", CmmnDetailCodeList);
return "oprtn/cndtnSspnIdtmt/trgtMngList";
}
@@ -386,6 +401,13 @@ public class CndtnTrgtMngController {
String userWork = this.getUserWork(request);
model.addAttribute("userWork", userWork);
+
+
+ ComDefaultCodeVO codeParam = new ComDefaultCodeVO();
+ codeParam.setCodeId("VEA008");
+ List CmmnDetailCodeList = egovCmmUseService.selectCmmCodeDetailOrderByCode(codeParam);
+ model.addAttribute("CmmnDetailCodeList", CmmnDetailCodeList);
+
return "oprtn/cndtnSspnIdtmt/trgtReg";
}
@@ -617,6 +639,9 @@ public class CndtnTrgtMngController {
CndtnTrgtMngVO cndtnTrgtInfoVO = cndtnTrgtInfoMngService.selectDetail(cndtnTrgtInfoMngVO);
model.addAttribute("info", cndtnTrgtInfoVO);
+ String userWork = this.getUserWork(request);
+ model.addAttribute("userWork", userWork);
+
//파일 정보 가져오기
FileVO fileVO = new FileVO();
@@ -627,38 +652,6 @@ public class CndtnTrgtMngController {
return "oprtn/cndtnSspnIdtmt/trgtDetail";
}
- /**
- * 대상자목록
- */
- @RequestMapping("/kccadr/oprtn/cndtnSspnIdtmt/trgtMngDetail.do")
- public String trgtMngDetail(
- @ModelAttribute("cndtnTrgtInfoMngVO") CndtnTrgtMngVO cndtnTrgtInfoMngVO
- , ModelMap model
- , HttpServletRequest request
- ) throws Exception {
-
- //로그인 처리====================================
- //로그인 정보 가져오기
-
- LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기
- SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기
-
- //로그인 처리====================================
-
- //과정 조회
- CndtnTrgtMngVO cndtnTrgtInfoVO = cndtnTrgtInfoMngService.selectDetail(cndtnTrgtInfoMngVO);
- model.addAttribute("info", cndtnTrgtInfoVO);
-
-
- //파일 정보 가져오기
- FileVO fileVO = new FileVO();
- fileVO.setAtchFileId(cndtnTrgtInfoVO.getAtchFileId());
- List result = fileService.selectFileInfs(fileVO);
- model.addAttribute("fileList", result);
- model.addAttribute("fileListCnt", result.size());
-
- return "oprtn/cndtnSspnIdtmt/trgtMngDetail";
- }
/**
* 조건부기소유예과정 수료자 상세화면
*/
@@ -722,6 +715,16 @@ public class CndtnTrgtMngController {
model.addAttribute("info", cndtnTrgtInfoVO);
+ // 관할청 공통코드
+ ComDefaultCodeVO codeParam = new ComDefaultCodeVO();
+ codeParam.setCodeId("VEA008");
+ List CmmnDetailCodeList = egovCmmUseService.selectCmmCodeDetailOrderByCode(codeParam);
+ model.addAttribute("CmmnDetailCodeList", CmmnDetailCodeList);
+
+ String userWork = this.getUserWork(request);
+ model.addAttribute("userWork", userWork);
+
+
//파일 정보 가져오기
FileVO fileVO = new FileVO();
fileVO.setAtchFileId(cndtnTrgtInfoVO.getAtchFileId());
@@ -760,6 +763,13 @@ public class CndtnTrgtMngController {
model.addAttribute("fileList", result);
model.addAttribute("fileListCnt", result.size());
+
+ // 관할청 공통코드
+ ComDefaultCodeVO codeParam = new ComDefaultCodeVO();
+ codeParam.setCodeId("VEA008");
+ List CmmnDetailCodeList = egovCmmUseService.selectCmmCodeDetailOrderByCode(codeParam);
+ model.addAttribute("CmmnDetailCodeList", CmmnDetailCodeList);
+
return "oprtn/cndtnSspnIdtmt/trgtMngMdfy";
}
diff --git a/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/web/OprtnAplctAnncmMngController.java b/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/web/OprtnAplctAnncmMngController.java
index 07e63813..c4ef1d92 100644
--- a/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/web/OprtnAplctAnncmMngController.java
+++ b/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/web/OprtnAplctAnncmMngController.java
@@ -2,7 +2,9 @@ package kcc.ve.oprtn.cpyrgExprnClsrm.oprtnAplctMng.web;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@@ -13,6 +15,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.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
@@ -97,6 +100,11 @@ public class OprtnAplctAnncmMngController {
@Resource(name = "vEPrcsMIXService")
private VEPrcsMIXService vEPrcsMIXService;
+ //교육과정순번
+ @Resource(name="prcsAplctPrdGnrService")
+ private EgovIdGnrService prcsAplctPrdGnrService;
+
+
/*
// 교육신청 서비스단
@@ -230,6 +238,13 @@ public class OprtnAplctAnncmMngController {
List result = fileService.selectFileInfs(fileVO);
model.addAttribute("fileList", result);
model.addAttribute("fileListCnt", result.size());
+
+ //파일 정보 가져오기
+ FileVO fileVO_cn = new FileVO();
+ fileVO_cn.setAtchFileId(info.getCnAtchFileId());
+ List result_cn = fileService.selectFileInfs(fileVO_cn);
+ model.addAttribute("fileList", result_cn);
+ model.addAttribute("fileListCnt", result_cn.size());
return "oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngDetail";
@@ -308,6 +323,11 @@ public class OprtnAplctAnncmMngController {
model.addAttribute("fileList", result);
model.addAttribute("fileListCnt", result.size());
+ FileVO fileVO_cn = new FileVO();
+ fileVO_cn.setAtchFileId(info.getCnAtchFileId());
+ List result_cn = fileService.selectFileInfs(fileVO_cn);
+ model.addAttribute("fileList_cn", result_cn);
+ model.addAttribute("fileListCnt_cn", result_cn.size());
return "oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngUpdate";
}
@@ -347,6 +367,9 @@ public class OprtnAplctAnncmMngController {
//step2.첨부파일 체크 후 저장 하기
String s_scholSealAtchFileId = "";
s_scholSealAtchFileId = vEPrcsDetailVO.getAtchFileId();
+
+ String cnAtchFileId = "";
+ cnAtchFileId = vEPrcsDetailVO.getCnAtchFileId();
//DB에서 실제 첨부파일 존재 여부 확인
FileVO fileVO = new FileVO();
@@ -356,6 +379,13 @@ public class OprtnAplctAnncmMngController {
s_scholSealAtchFileId = "";
}
+ FileVO cnFileVO = new FileVO();
+ cnFileVO.setAtchFileId(cnAtchFileId);
+ List cnResult = fileService.selectFileInfs(cnFileVO);
+ if (cnResult.size()<=0) {
+ cnAtchFileId = "";
+ }
+
//step3.파일 처리====================================
//파일 정상 처리 여부와 첨부 파일 정보
@@ -364,13 +394,36 @@ public class OprtnAplctAnncmMngController {
int i_file_limit = checkFileUtil.getLimitCount(request); // file count
int i_limit_size = checkFileUtil.getLimitSize(request); // file MB
String s_file_exts = checkFileUtil.getS_exts(); // file exts
-
+
+ int i_file_limit_cn = 50; // file count
+ int i_limit_size_cn = 100; // file MB
+ String s_file_exts_cn = "pdf|txt"; // file exts
+
+
+ final Map files = multiRequest.getFileMap();
+
+ Map files_ori = new HashMap();
+ Map files_cn = new HashMap();
+
+
+ files.forEach((k,v) -> {
+ if( k.contains("file_cn") || k.contains("file_temp_cn")) {
+ files_cn.put(k, v);
+ }else {
+ files_ori.put(k, v);
+ }
+ });
+
+ //break point
+// if(true) {
+// return modelAndView;
+// }
//기존 파일 존재 여부에 따라서 insert or update 처리
if ("".equals(s_scholSealAtchFileId)) {
- //atchFileId = this.fileValCheckNdbInsert(multiRequest, modelAndView, checkFileUtil.getS_exts(), i_limit_size, i_file_limit); //EXT, MB size and ea
- s_scholSealAtchFileId = checkFileUtil.fileValCheckNdbInsert(
- multiRequest, modelAndView
+ //atchFileId = this.fileValCheckNdbInsert(multiRequest, modelAndView, checkFileUtil.getS_exts(), i_limit_size, i_file_limit); //EXT, MB size and ea
+ s_scholSealAtchFileId = checkFileUtil.fileValCheckNdbInsertCustom(
+ files_ori, modelAndView
, "ATCH_"
, s_file_exts
, i_limit_size
@@ -379,8 +432,8 @@ public class OprtnAplctAnncmMngController {
vEPrcsDetailVO.setAtchFileId(s_scholSealAtchFileId);
}else {
//atchFileId = this.fileValCheckNdbUpdate(multiRequest, modelAndView, checkFileUtil.getS_exts(), i_limit_size, i_file_limit, atchFileId); //EXT, MB size and ea
- s_scholSealAtchFileId = checkFileUtil.fileValCheckNdbUpdate(
- multiRequest, modelAndView
+ s_scholSealAtchFileId = checkFileUtil.fileValCheckNdbUpdateCustom(
+ files_ori, modelAndView
, "ATCH_"
, s_file_exts
, i_limit_size
@@ -391,6 +444,29 @@ public class OprtnAplctAnncmMngController {
if ("ERROR".equals(s_scholSealAtchFileId)) return modelAndView;
+
+ if ("".equals(cnAtchFileId)) {
+ cnAtchFileId = checkFileUtil.fileValCheckNdbInsertCustom(
+ files_cn, modelAndView
+ , "ATCH_"
+ , s_file_exts_cn
+ , i_limit_size_cn
+ , i_file_limit_cn
+ ); //EXT, MB size and ea
+ vEPrcsDetailVO.setCnAtchFileId(cnAtchFileId);
+ }else {
+ cnAtchFileId = checkFileUtil.fileValCheckNdbUpdateCustom(
+ files_cn, modelAndView
+ , "ATCH_"
+ , s_file_exts_cn
+ , i_limit_size_cn
+ , i_file_limit_cn
+ , cnAtchFileId
+ ); //EXT, MB size and ea
+ }
+
+ if ("ERROR".equals(cnAtchFileId)) return modelAndView;
+
//step3.파일 처리====================================
@@ -459,23 +535,54 @@ public class OprtnAplctAnncmMngController {
int i_file_limit = checkFileUtil.getLimitCount(request); // file count
int i_limit_size = checkFileUtil.getLimitSize(request); // file MB
String s_file_exts = checkFileUtil.getS_exts(); // file exts
+
+ int i_file_limit_cn = 50; // file count
+ int i_limit_size_cn = 100; // file MB
+ String s_file_exts_cn = "pdf|txt"; // file exts
+
+ final Map files = multiRequest.getFileMap();
+
+ Map files_ori = new HashMap();
+ Map files_cn = new HashMap();
+
+ files.forEach((k,v) -> {
+ if( k.contains("file_cn") || k.contains("file_temp_cn")) {
+ files_cn.put(k, v);
+ }else {
+ files_ori.put(k, v);
+ }
+ });
- String s_scholSealAtchFileId = checkFileUtil.fileValCheckNdbInsert(
- multiRequest, modelAndView
+ String s_scholSealAtchFileId = checkFileUtil.fileValCheckNdbInsertCustom(
+ files_ori, modelAndView
, "ATCH_" //file_name_prefix
- , s_file_exts
- , i_limit_size
- , i_file_limit
+ , s_file_exts_cn
+ , i_limit_size_cn
+ , i_file_limit_cn
); //EXT, MB size and ea
if ("ERROR".equals(s_scholSealAtchFileId)) return modelAndView;
+ String s_cnAtchFileId = checkFileUtil.fileValCheckNdbInsertCustom(
+ files_cn, modelAndView
+ , "ATCH_" //file_name_prefix
+ , s_file_exts_cn
+ , i_limit_size_cn
+ , i_file_limit_cn
+ ); //EXT, MB size and ea
+
+ if ("ERROR".equals(s_cnAtchFileId)) return modelAndView;
+
//step2.파일 처리====================================
//번호 생성 및 디비 생성해주기
- String prcsAplctPrdOrd = prcsGnrService.getNextStringId(); // 고유ID
+// String prcsAplctPrdOrd = prcsGnrService.getNextStringId(); // 고유ID
+// String prcsAplctPrdOrd = prcsAplctGnrService.getNextStringId(); // 고유ID
+ String prcsAplctPrdOrd = prcsAplctPrdGnrService.getNextStringId(); // 고유ID
vEPrcsDetailVO.setAtchFileId(s_scholSealAtchFileId); //학교장직인 첨부파일
+ vEPrcsDetailVO.setCnAtchFileId(s_cnAtchFileId); //안내 첨부파일
+
vEPrcsDetailVO.setPrcsAplctPrdOrd(prcsAplctPrdOrd);
System.out.println("vEPrcsDetailVO.getStrtPnttm()");
diff --git a/src/main/java/kcc/ve/oprtn/fndtnEnhanceTrn/prcsInfoMng/web/FndthPrcsInfoMngController.java b/src/main/java/kcc/ve/oprtn/fndtnEnhanceTrn/prcsInfoMng/web/FndthPrcsInfoMngController.java
index 822e4c6e..d82cf32e 100644
--- a/src/main/java/kcc/ve/oprtn/fndtnEnhanceTrn/prcsInfoMng/web/FndthPrcsInfoMngController.java
+++ b/src/main/java/kcc/ve/oprtn/fndtnEnhanceTrn/prcsInfoMng/web/FndthPrcsInfoMngController.java
@@ -234,12 +234,12 @@ public class FndthPrcsInfoMngController {
//기반강화 조회
vEPrcsDetailVO.setLctrDivCd("50"); //강의구분코드 VE0011 10-청소년강의, 20-성인강의, 30-체험, 50-기반강화, 60-조건부
- if(StringUtil.isNotEmpty(vEPrcsDetailVO.getSearchKeyword())){
- String selectCondition = "AND a.PRCS_NM LIKE CONCAT ('%', '" +vEPrcsDetailVO.getSearchKeyword() + "', '%')";
- vEPrcsDetailVO.setSelectPagingListQuery(selectCondition);
- }
+// if(StringUtil.isNotEmpty(vEPrcsDetailVO.getSearchKeyword())){
+// String selectCondition = "AND a.PRCS_NM LIKE CONCAT ('%', '" +vEPrcsDetailVO.getSearchKeyword() + "', '%')";
+// vEPrcsDetailVO.setSelectPagingListQuery(selectCondition);
+// }
- List vEPrcsDetailVOList = vEPrcsService.selectPagingList(vEPrcsDetailVO);
+ List vEPrcsDetailVOList = vEPrcsService.selectQnaPagingList(vEPrcsDetailVO);
//3.pageing step3
paginationInfo = this.setPagingStep3(vEPrcsDetailVOList, paginationInfo);
@@ -247,6 +247,9 @@ public class FndthPrcsInfoMngController {
model.addAttribute("paginationInfo", paginationInfo);
+ // 사용자 이름 디코딩
+ vEPrcsDetailVOList.stream().forEach(t->t.setMberNm(egovCryptoUtil.decrypt(t.getMberNm())));
+
//대상 리스트, 페이징 정보 전달
model.addAttribute("list", vEPrcsDetailVOList);
@@ -348,10 +351,53 @@ public class FndthPrcsInfoMngController {
VEPrcsCntntVO vePrcsCntntVO = new VEPrcsCntntVO();
vePrcsCntntVO.setPrcsOrd(vEPrcsDetailVO.getPrcsOrd());
List vEPrcsCntntList = vEPrcsOnlnCntntService.selectList(vePrcsCntntVO);
+
+
model.addAttribute("vEPrcsCntntList", vEPrcsCntntList);
return "/oprtn/fndthEnhanceTrn/fndthEduPrcsMngDetail";
}
+
+ /**
+ * @methodName : fndthEduPrcsMngDetail
+ * @author : 이호영
+ * @date : 2023.11.20
+ * @description :
+ * @param vEPrcsDetailVO
+ * @param model
+ * @param redirectAttributes
+ * @param session
+ * @param request
+ * @return
+ * @throws Exception
+ */
+ @RequestMapping("/kccadr/oprtn/fndthEnhanceTrn/fndthEduQnaMngDetail.do")
+ public String fndthEduQnaMngDetail(
+ @ModelAttribute("vEPrcsDetailVO") VEPrcsDetailVO vEPrcsDetailVO
+
+ , ModelMap model
+ , RedirectAttributes redirectAttributes
+ , HttpSession session
+ , HttpServletRequest request
+ ) throws Exception {
+
+ //로그인 처리====================================
+ //로그인 정보 가져오기
+ System.out.println("vEPrcsDetailVO.getPrcsAplctPrdQnaOrd() : "+ vEPrcsDetailVO.getPrcsAplctPrdQnaOrd());
+ LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기
+ SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기
+
+ //로그인 처리====================================
+
+ //과정 조회
+ VEPrcsDetailVO vEPrcsQnaDetail = vEPrcsService.selectQnaDetail(vEPrcsDetailVO);
+ vEPrcsQnaDetail.setMberNm(egovCryptoUtil.decrypt(vEPrcsQnaDetail.getMberNm()));
+
+ model.addAttribute("info", vEPrcsQnaDetail);
+ //세부과정 목록 조회
+
+ return "/oprtn/fndthEnhanceTrn/fndthEduQnaMngDetail";
+ }
/**
* 기반강화연수과정 수정화면
@@ -484,6 +530,53 @@ public class FndthPrcsInfoMngController {
return modelAndView;
}
+ /**
+ * @methodName : fndthEduQnaMngUpdateAjax
+ * @author : 이호영
+ * @date : 2023.11.20
+ * @description :
+ * @param vEPrcsDetailVO
+ * @param model
+ * @param request
+ * @return
+ * @throws Exception
+ */
+ @RequestMapping("/kccadr/oprtn/fndthEnhanceTrn/fndthEduQnaMngUpdateAjax.do")
+ public ModelAndView fndthEduQnaMngUpdateAjax(
+ @ModelAttribute("vEPrcsDetailVO") VEPrcsDetailVO vEPrcsDetailVO
+ , ModelMap model
+ , HttpServletRequest request
+ ) throws Exception {
+
+ ModelAndView modelAndView = new ModelAndView();
+ modelAndView.setViewName("jsonView");
+
+ //로그인 처리====================================
+ //로그인 정보 가져오기
+
+ String s_oprtnLoginCheckNInfo = checkLoginUtil.oprtnCheckNInfo(model);
+ if (!"".equals(s_oprtnLoginCheckNInfo)) {
+ modelAndView.addObject("result", "loginFail");
+ return modelAndView;
+ }
+
+ //로그인 처리====================================
+
+
+ LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기
+ SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기
+
+ vEPrcsDetailVO.setLastUpdusrId(loginVO.getUniqId()); //esntl_id
+ vEPrcsService.qnaUpdate(vEPrcsDetailVO);
+
+
+ //세부과정 지우고 다시 생성
+ VEPrcsCntntVO vEPrcsCntntVO = new VEPrcsCntntVO();
+ vEPrcsCntntVO.setPrcsOrd(vEPrcsDetailVO.getPrcsOrd());
+ modelAndView.addObject("result", "success");
+ return modelAndView;
+ }
+
@RequestMapping("/kccadr/oprtn/fndthEnhanceTrn/fndthEduPhotoPopupAjax.do")
public ModelAndView fndthEduPhotoPopupAjax(
diff --git a/src/main/java/kcc/ve/oprtn/pblc/sndMng/web/SndMngController.java b/src/main/java/kcc/ve/oprtn/pblc/sndMng/web/SndMngController.java
index 4487472f..e9f70a8c 100644
--- a/src/main/java/kcc/ve/oprtn/pblc/sndMng/web/SndMngController.java
+++ b/src/main/java/kcc/ve/oprtn/pblc/sndMng/web/SndMngController.java
@@ -386,21 +386,24 @@ public class SndMngController {
vEEduAplctVO.setEmail("tolag3@gmail.com");
}
+ String message = "정상적으로 발송되었습니다.";
String result = sendMail.VeSendMail(vEEduAplctVO.getSndFlag(), vEEduAplctVO.getEmail(), vEEduAplctVO, loginVO);
-
if("success".equals(result)) {
//메일 발송 로그
String snd_ord = sndGnrService.getNextStringId();
vEEduAplctVO.setSndHstryOrd(snd_ord);
vEEduAplctVO.setSndId(loginVO.getUniqId());
-
+ vEEduAplctVO.setTrgt(vEEduAplctVO.getEmail());
vEEduAplctSndHstryService.insert(vEEduAplctVO);
- }
+ }else {
+ message = "발송 실패하였습니다.";
+ }
//메일 발송 부 끝
modelAndView.addObject("result", result);
+ modelAndView.addObject("message", message);
return modelAndView;
diff --git a/src/main/resources/egovframework/sqlmap/let/cmm/use/EgovCmmUse_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/let/cmm/use/EgovCmmUse_SQL_Tibero.xml
index 1757a85f..47c1033e 100644
--- a/src/main/resources/egovframework/sqlmap/let/cmm/use/EgovCmmUse_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/let/cmm/use/EgovCmmUse_SQL_Tibero.xml
@@ -1,96 +1,109 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
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 1097ccd7..1b6a78f4 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
@@ -201,6 +201,12 @@
AND TO_CHAR(A.FRST_REGIST_PNTTM, 'YYYYMMDD') REPLACE(#searchSmbtEndDt#, '.' , '')
+
+ AND a.cmptnt_athrt IN
+
+ #searchSelStatusList[]#
+
+
ORDER BY a.frst_regist_pnttm desc
OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY;
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 f8d1057b..8262d715 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
@@ -1361,6 +1361,7 @@
VEA_PRCS_APLCT_PRD_QNA
WHERE
QNA_REGIST = #qnaRegist#
+ AND LCTR_DIV_CD = #lctrDivCd#
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 697df2ef..b9f56b1d 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
@@ -38,6 +38,8 @@
,edu_strt_pnttm
,edu_ddln_pnttm
,edu_place
+ ,dprtm_nm
+ ,cn_atch_file_id
@@ -73,7 +75,8 @@
,a.edu_strt_pnttm AS eduStrtPnttm
,a.edu_ddln_pnttm AS eduDdlnPnttm
-
+ ,a.dprtm_nm AS dprtmNm
+ ,a.cn_atch_file_id AS cnAtchFileId
@@ -109,7 +112,9 @@
,#ddlnCd#
,#eduStrtPnttm#
,#eduDdlnPnttm#
- ,#eduPlace#
+ ,#eduPlace#
+ ,#dprtmNm#
+ ,#cnAtchFileId#
)
@@ -143,17 +148,17 @@
-
+
diff --git a/src/main/webapp/WEB-INF/jsp/cmm/fms/EgovBBSFileListCustom.jsp b/src/main/webapp/WEB-INF/jsp/cmm/fms/EgovBBSFileListCustom.jsp
new file mode 100644
index 00000000..a411993d
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jsp/cmm/fms/EgovBBSFileListCustom.jsp
@@ -0,0 +1,139 @@
+<%@ 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 : EgovFileList.jsp
+ * @Description : 파일 목록화면
+ * @Modification Information
+ * @
+ * @ 수정일 수정자 수정내용
+ * @ ---------- ------ ---------------------------
+ * @ 2009.03.26 이삼섭 최초 생성
+ * @ 2011.07.20 옥찬우 Tag id속성 추가( Line : 68 )
+ *
+ * @author 공통서비스 개발팀 이삼섭
+ * @since 2009.03.26
+ * @version 1.0
+ * @see
+ *
+ */
+%>
+
+
+
+
+
+
+
+
+
+ -
+ ','')" class="fileName" title="다운로드">
+ <%-- [ byte] --%>
+
+
+
+<%-- ','' , '' )"> --%>
+
+
+ ','' , '' )" title="파일 다운로드">pdf 보기
+
+
+
+
+
+
+
+
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngDetail.jsp
index 246f3442..19ac9aae 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngDetail.jsp
@@ -154,7 +154,7 @@
}
}
//sms 발송
- function fncSndSms(){
+ /* function fncSndSms(){
var p_smsMsg = $("#smsMsg").val();
@@ -170,6 +170,24 @@
p_smsMsg
,""
);
+ } */
+
+ function fncSndSms(){
+
+ var p_smsMsg = $("#smsMsg").val();
+
+ if (p_smsMsg==""){
+ alert("SMS 발송 내용은 필수값입니다.");
+ return false;
+ }
+
+
+ fncContent(
+ "${pageContext.request.contextPath}/kccadr/oprtn/pblc/offeduSMSSndAjax.do",
+ "10", //코드 10:sms 20:mail
+ p_smsMsg,
+ ""
+ );
}
//이메일 발송
@@ -193,22 +211,22 @@
//발송
function fncContent(p_url, p_cd, p_cn, p_flag){
- //sndFlag 메일발송 페이지 구분값(페이지마다 발송 계정이 다르기 때문에)_이준호_220221
$.ajax({
type: "POST",
- // enctype: 'multipart/form-data',
+ // enctype: 'multipart/form-data',
url:p_url,
//data: data,
data:{
- "sndCd": p_cd,
+ "sndCd": p_cd,
"sndCn": p_cn,
"eduAplctOrd": $("#eduAplctOrd").val(),
"clphone": '',
"email": '',
- "sndFlag": p_flag
+ "sndFlag": p_flag,
+ "trgtId" : ''
},
- /*
dataType:'json',
+ /*
async: false,
processData: false,
contentType: false,
@@ -217,10 +235,9 @@
success:function(returnData){
if(returnData.result == "success"){
- alert("정상적으로 발송되었습니다.");
- location.reload(true);
+ alert(returnData.message);
}else{
- alert("발송 중 오류가 발생하였습니다.");
+ alert(returnData.message);
}
},
error:function(request , status, error){
@@ -589,10 +606,11 @@
-
+
+
- 0/90 byte
+
|
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAsgnmCnfrmMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAsgnmCnfrmMngDetail.jsp
index 071c7d05..5fb80df8 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAsgnmCnfrmMngDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAsgnmCnfrmMngDetail.jsp
@@ -112,7 +112,7 @@
}
//sms 발송
- function fncSndSms(){
+ /* function fncSndSms(){
var p_smsMsg = $("#smsMsg").val();
@@ -124,7 +124,25 @@
fncContent("${pageContext.request.contextPath}/kccadr/oprtn/pblc/smsSndAjax.do","10",p_smsMsg,"");
}
-
+ */
+
+ function fncSndSms(){
+
+ var p_smsMsg = $("#smsMsg").val();
+
+ if (p_smsMsg==""){
+ alert("SMS 발송 내용은 필수값입니다.");
+ return false;
+ }
+
+
+ fncContent(
+ "${pageContext.request.contextPath}/kccadr/oprtn/pblc/offeduSMSSndAjax.do",
+ "10", //코드 10:sms 20:mail
+ p_smsMsg,
+ ""
+ );
+ }
//이메일 발송
function fncSndEmail(){
@@ -142,38 +160,40 @@
function fncContent(p_url, p_cd, p_cn, p_flag){
$.ajax({
- type: "POST",
- // enctype: 'multipart/form-data',
- url:p_url,
- //data: data,
+ type: "POST",
+ // enctype: 'multipart/form-data',
+ url:p_url,
+ //data: data,
data:{
"sndCd": p_cd,
"sndCn": p_cn,
"eduAplctOrd": $("#eduAplctOrd").val(),
"clphone": '',
"email": '',
- "sndFlag": p_flag
- },
- dataType:'json',
- /*
- async: false,
- processData: false,
- contentType: false,
- cache: false,
- */
-
+ "sndFlag": p_flag,
+ "trgtId" : ''
+ },
+ dataType:'json',
+ /*
+ async: false,
+ processData: false,
+ contentType: false,
+ cache: false,
+ */
+
success:function(returnData){
if(returnData.result == "success"){
- alert("정상적으로 발송되었습니다.");
-
+ alert(returnData.message);
}else{
- alert("발송 중 오류가 발생하였습니다.");
+ alert(returnData.message);
}
},
error:function(request , status, error){
alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error);
}
});
+
+
}
function reloadLinkPage(){
@@ -502,10 +522,11 @@
|
-
+
+
- 0/90 byte
+
|
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtDetail.jsp
index 05e9b650..9b4ef269 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtDetail.jsp
@@ -42,6 +42,11 @@
detailForm.action = "";
detailForm.submit();
}
+ function fncMngMdfy(){
+ var detailForm = document.detailForm ;
+ detailForm.action = "";
+ detailForm.submit();
+ }
@@ -193,7 +198,17 @@
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp
index d912d3c9..a3e5fef2 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp
@@ -28,7 +28,11 @@
*/
%>
+
+
+
+