From deab4609897f81c0860edac280ed56f29862d23b Mon Sep 17 00:00:00 2001 From: hylee Date: Thu, 11 Jan 2024 09:59:24 +0900 Subject: [PATCH] =?UTF-8?q?[=EA=B4=80=EB=A6=AC=EC=9E=90]=20=EA=B8=B0?= =?UTF-8?q?=EC=86=8C=EC=9C=A0=EC=98=88=203=EA=B8=B0=EB=8A=A5=20/=20?= =?UTF-8?q?=EC=88=98=EA=B0=95=EA=B8=B0=EA=B0=84=EB=93=B1=EB=A1=9D=20?= =?UTF-8?q?=EC=8B=9C=20=EC=83=81=EC=84=B8=EB=82=B4=EC=9A=A9=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20=EA=B8=B0=EB=8A=A5=20,=20=EC=A0=91=EC=88=98?= =?UTF-8?q?=EC=A4=91=20=EC=98=A4=EB=A5=98,=20=EA=B4=80=ED=95=A0=EC=B2=AD?= =?UTF-8?q?=20=EC=A7=80=EC=97=AD=EC=9C=BC=EB=A1=9C=20=EB=B6=84=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cmm/service/EgovCmmUseService.java | 2 + .../kcc/com/cmm/service/impl/CmmUseDAO.java | 186 +++++++------- .../service/impl/EgovCmmUseServiceImpl.java | 5 + .../trgtMng/web/CndtnTrgtMngController.java | 89 ++++++- .../let/cmm/use/EgovCmmUse_SQL_Tibero.xml | 233 ++++++++++-------- .../ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml | 11 +- .../cndtnEduPrcsAplctPrdMngMdfy.jsp | 2 +- .../cndtnEduPrcsAplctPrdMngReg.jsp | 2 +- .../jsp/oprtn/cndtnSspnIdtmt/trgtMngMdfy.jsp | 66 ++++- .../jsp/oprtn/cndtnSspnIdtmt/trgtReg.jsp | 65 ++++- .../aplct/fndtnEnhanceTrn/eduAplctDetail.jsp | 4 + .../web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp | 4 + 12 files changed, 458 insertions(+), 211 deletions(-) diff --git a/src/main/java/kcc/com/cmm/service/EgovCmmUseService.java b/src/main/java/kcc/com/cmm/service/EgovCmmUseService.java index 5b67ca40..22ffcca6 100644 --- a/src/main/java/kcc/com/cmm/service/EgovCmmUseService.java +++ b/src/main/java/kcc/com/cmm/service/EgovCmmUseService.java @@ -80,4 +80,6 @@ public interface EgovCmmUseService { public List selectCmmCodeDetailOrderByCode(ComDefaultCodeVO codeParam); String selectCmmCodeDetailCode(ComDefaultCodeVO vo); + + public List selectCmmCodeDetailLikeNmOrderByCode(ComDefaultCodeVO comDefaultCodeVO); } 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 d258a9e6..de648349 100644 --- a/src/main/java/kcc/com/cmm/service/impl/CmmUseDAO.java +++ b/src/main/java/kcc/com/cmm/service/impl/CmmUseDAO.java @@ -1,91 +1,95 @@ -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); - } -} +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); + } + + public List selectCmmCodeDetailLikeNmOrderByCode(ComDefaultCodeVO comDefaultCodeVO) { + return (List) list("CmmUseDAO.selectCmmCodeDetailLikeNmOrderByCode", comDefaultCodeVO); + } +} 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 7dd642a4..9673d26c 100644 --- a/src/main/java/kcc/com/cmm/service/impl/EgovCmmUseServiceImpl.java +++ b/src/main/java/kcc/com/cmm/service/impl/EgovCmmUseServiceImpl.java @@ -154,4 +154,9 @@ public class EgovCmmUseServiceImpl extends EgovAbstractServiceImpl implements Eg // TODO Auto-generated method stub return cmmUseDAO.selectCmmCodeDetailOrderByCode(codeParam); } + + @Override + public List selectCmmCodeDetailLikeNmOrderByCode(ComDefaultCodeVO comDefaultCodeVO) { + return cmmUseDAO.selectCmmCodeDetailLikeNmOrderByCode(comDefaultCodeVO); + } } 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 92203bdc..ac7cf6f3 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 @@ -4,8 +4,12 @@ import java.time.LocalDate; import java.time.Period; import java.time.format.DateTimeFormatter; import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Locale; +import java.util.Map; +import java.util.Set; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; @@ -23,6 +27,8 @@ import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.support.RedirectAttributes; +import com.fasterxml.jackson.databind.ObjectMapper; + import egovframework.rte.fdl.cmmn.exception.FdlException; import egovframework.rte.fdl.idgnr.EgovIdGnrService; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; @@ -456,12 +462,12 @@ public class CndtnTrgtMngController { //로그인 처리==================================== //로그인 정보 가져오기 - String s_oprtnLoginCheckNInfo = checkLoginUtil.oprtnCheckNInfo(model); if (!"".equals(s_oprtnLoginCheckNInfo)) return s_oprtnLoginCheckNInfo; //로그인 처리==================================== + // 사용자 권한이 관할청 담당자일때 userWork로 관할 가져오기 String userWork = this.getUserWork(request); model.addAttribute("userWork", userWork); @@ -470,11 +476,60 @@ public class CndtnTrgtMngController { ComDefaultCodeVO codeParam = new ComDefaultCodeVO(); codeParam.setCodeId("VEA008"); List CmmnDetailCodeList = egovCmmUseService.selectCmmCodeDetailOrderByCode(codeParam); - model.addAttribute("CmmnDetailCodeList", CmmnDetailCodeList); + + + // CODE 값을 저장할 Set (중복을 제거하기 위해 사용) + Set uniqueCodes = new HashSet<>(); + + for(CmmnDetailCode vo : CmmnDetailCodeList) { + uniqueCodes.add(vo.getCode().split("-")[0]); + } + + model.addAttribute("CmmnDetailCodeList", uniqueCodes); + return "oprtn/cndtnSspnIdtmt/trgtReg"; } + /** + * 조건부기소유예과정 등록 + */ + @RequestMapping("/kccadr/oprtn/cndtnSspnIdtmt/selectCmptntAthrtCodeAjax.do") + public ModelAndView selectCmptntAthrtCodeAjax( + @ModelAttribute("comDefaultCodeVO") ComDefaultCodeVO comDefaultCodeVO + , 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 로그인 정보 가져오기 + + System.out.println("comDefaultCodeVO.getCodeNm() : "+ comDefaultCodeVO.getCodeNm()); + comDefaultCodeVO.setCodeId("VEA008"); + List CmmnDetailCodeList = egovCmmUseService.selectCmmCodeDetailLikeNmOrderByCode(comDefaultCodeVO); + + + modelAndView.addObject("cmmnCodeList", CmmnDetailCodeList); + modelAndView.addObject("result", "success"); + + return modelAndView; + + } + /** * 조건부기소유예과정 등록 */ @@ -1338,13 +1393,41 @@ 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); + */ + + ComDefaultCodeVO codeParam = new ComDefaultCodeVO(); + codeParam.setCodeId("VEA008"); + List CmmnDetailCodeList = egovCmmUseService.selectCmmCodeDetailOrderByCode(codeParam); + + + // CODE 값을 저장할 Set (중복을 제거하기 위해 사용) + Set uniqueCodes = new HashSet<>(); + + for(CmmnDetailCode vo : CmmnDetailCodeList) { + uniqueCodes.add(vo.getCode().split("-")[0]); + } + + model.addAttribute("CmmnDetailCodeList", uniqueCodes); + + // 관할청 - 지역명 + String codeNm = cndtnTrgtInfoVO.getCmptntAthrt().split("-")[0]; + model.addAttribute("cmptntAthrtCode", codeNm); + + codeParam.setCodeNm(codeNm); + List CmmnDetailList = egovCmmUseService.selectCmmCodeDetailLikeNmOrderByCode(codeParam); + + + model.addAttribute("cmmnCodeList", CmmnDetailList); + + + return "oprtn/cndtnSspnIdtmt/trgtMngMdfy"; } 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 47c1033e..bf38644a 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,109 +1,126 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file 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 5d9528d9..416c42c5 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 @@ -40,6 +40,8 @@ ,edu_place ,dprtm_nm ,cn_atch_file_id + + ,prcs_cn @@ -114,7 +116,9 @@ ,#eduDdlnPnttm# ,#eduPlace# ,#dprtmNm# - ,#cnAtchFileId# + ,#cnAtchFileId# + + ,#prcsCn# ) @@ -236,6 +240,9 @@ , cn_atch_file_id = #cnAtchFileId# + + , prcs_cn = #prcsCn# + WHERE prcs_aplct_prd_ord = #prcsAplctPrdOrd# @@ -577,7 +584,7 @@ ,a.ddln_cd AS ddlnCd ,a.edu_strt_pnttm AS eduStrtPnttm ,a.edu_ddln_pnttm AS eduDdlnPnttm - ,b.prcs_cn AS prcsCn + ,a.prcs_cn AS prcsCn