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/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java index c66c27bc..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 @@ -152,6 +152,8 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable { private String qnaAnswerCn; private String qnaAnswerer; + private String mberNm; + @@ -741,6 +743,12 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable { 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 fba89adc..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 @@ -121,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/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/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 51c6aa58..b9dc6767 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 @@ -1359,6 +1359,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 3edcb61e..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 @@ -148,17 +148,17 @@ - + + /* VEPrcsDAO.selectQnaPagingList */ + + SELECT + qn.PRCS_APLCT_PRD_QNA_ORD as prcsAplctPrdQnaOrd + , qn.LCTR_DIV_CD as lctrDivCd + , qn.QNA_REGIST as qnaRegist + , mb.MBER_NM AS mberNm + , qn.QNA_CN as qnaCn + , qn.QNA_ANSWER_CN as qnaAnswerCn + , qn.QNA_ANSWERER as qnaAnswerer + ,TO_CHAR(qn.FRST_REGIST_PNTTM,'YYYY-MM-DD') AS frstRegistPnttm + , qn.FRST_REGISTER_ID as frstRegisterId + ,TO_CHAR(qn.LAST_UPDT_PNTTM,'YYYY-MM-DD') AS lastUpdtPnttm + , qn.LAST_UPDUSR_ID as lastUpdusrId + FROM + VEA_PRCS_APLCT_PRD_QNA qn + LEFT JOIN LETTNGNRLMBER mb + ON qn.QNA_REGIST = mb.MBER_ID + WHERE + 1=1 + AND LCTR_DIV_CD = #lctrDivCd# + + + + + + + + + + /* VEPrcsDAO.qnaUpdate */ + + UPDATE VEA_PRCS_APLCT_PRD_QNA SET + QNA_ANSWER_CN = #qnaAnswerCn# + , LAST_UPDUSR_ID = #lastUpdusrId# + , LAST_UPDT_PNTTM = SYSDATE + WHERE PRCS_APLCT_PRD_QNA_ORD = #prcsAplctPrdQnaOrd# + + + 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 @@ */ %> + + + +