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 0c12205d..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 @@ -169,8 +169,6 @@ public class CndtnTrgtMngController { //로그인 처리==================================== - - String userWork = this.getUserWork(request); cndtnTrgtInfoMngVO.setSearchCondition(userWork); @@ -214,6 +212,9 @@ public class CndtnTrgtMngController { //대상 리스트, 페이징 정보 전달 model.addAttribute("list", cndtnTrgtInfoMngVOList); + + + return "oprtn/cndtnSspnIdtmt/trgtList"; } @@ -257,7 +258,7 @@ public class CndtnTrgtMngController { if (!"".equals(s_oprtnLoginCheckNInfo)) return s_oprtnLoginCheckNInfo; //로그인 처리==================================== - + //1.pageing step1 PaginationInfo paginationInfo = this.setCndtnPagingStep1(cndtnTrgtInfoMngVO); @@ -268,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); @@ -297,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"; } @@ -629,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(); @@ -639,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"; - } /** * 조건부기소유예과정 수료자 상세화면 */ @@ -782,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/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/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/trgtMdfy.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMdfy.jsp index 12b1b798..8c199bf8 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMdfy.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMdfy.jsp @@ -332,20 +332,8 @@ 관할청 - - - - - - - - - + + 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 @@ */ %> + + + +