diff --git a/src/main/java/kcc/ve/aplct/sspnIdtmt/service/impl/SspnIdtmtServiceImpl.java b/src/main/java/kcc/ve/aplct/sspnIdtmt/service/impl/SspnIdtmtServiceImpl.java index fbb9cf69..a7e80fc5 100644 --- a/src/main/java/kcc/ve/aplct/sspnIdtmt/service/impl/SspnIdtmtServiceImpl.java +++ b/src/main/java/kcc/ve/aplct/sspnIdtmt/service/impl/SspnIdtmtServiceImpl.java @@ -112,7 +112,7 @@ public class SspnIdtmtServiceImpl implements SspnIdtmtService { // // // step0.해당 계정으로 신청한 정보가 있는지 확인 하고, 있다면 동일한 정보로 신청했는지 확인 할것. CndtnTrgtMngVO cndtnTrgtMngVO = cndtnTrgtInfoMngDAO.checkSspnIdtmtNewStep0(cndtnTrgtInfoMngVO); - + /* if ("F".equals(cndtnTrgtMngVO.getResultCd())) { //해당 계정으로 신청한 정보중에 다른 개인정보(이름, 생년월일, 성별)를 사용해서 신청한 내용이 있다. result="fail"; @@ -124,6 +124,7 @@ public class SspnIdtmtServiceImpl implements SspnIdtmtService { return modelAndView; } + */ // step1.신청 가능한 대상이 있는지 찾는다. diff --git a/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java b/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java index 88500ec5..d0e04ad8 100644 --- a/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java +++ b/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java @@ -754,14 +754,16 @@ public class SspnIdtmtController { LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 - System.out.println(cndtnTrgtInfoMngVO.getUserId()); + //System.out.println(cndtnTrgtInfoMngVO.getUserId()); cndtnTrgtInfoMngVO.setUserId(loginVO.getUniqId()); - System.out.println(cndtnTrgtInfoMngVO.getUserId()); + //System.out.println(cndtnTrgtInfoMngVO.getUserId()); + /* System.out.println(cndtnTrgtInfoMngVO.getSex()); //System.out.println(cndtnTrgtInfoMngVO.getDBirth()); System.out.println(cndtnTrgtInfoMngVO.getdBirth()); System.out.println(cndtnTrgtInfoMngVO.getTrgtNm()); + */ cndtnTrgtInfoMngVO = egovCryptoUtil.encryptCndtnTrgtMngVOInfo(cndtnTrgtInfoMngVO); 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 840bc766..35d819d4 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 @@ -202,14 +202,16 @@ public class CndtnTrgtMngController { if(StringUtil.isNotEmpty(cndtnTrgtInfoMngVO.getSearchKeyword())){ 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); } //성명검색 if(StringUtil.isNotEmpty(cndtnTrgtInfoMngVO.getSearchKeywordFrom())){ - selectCondition = " AND a.trgt_nm = '" +cndtnTrgtInfoMngVO.getSearchKeywordFrom() + "' "; + //cndtnTrgtInfoMngVO.setSearchKeywordFrom(egovCryptoUtil.encrypt(cndtnTrgtInfoMngVO.getSearchKeywordFrom())); + selectCondition = " AND a.trgt_nm = '" +egovCryptoUtil.encrypt(cndtnTrgtInfoMngVO.getSearchKeywordFrom()) + "' "; //cndtnTrgtInfoMngVO.setSearchQuery(selectCondition); } @@ -351,7 +353,7 @@ public class CndtnTrgtMngController { //성명검색 if(StringUtil.isNotEmpty(cndtnTrgtInfoMngVO.getSearchKeywordFrom())){ - selectCondition += " AND a.trgt_nm = '" +cndtnTrgtInfoMngVO.getSearchKeywordFrom() + "' "; + selectCondition += " AND a.trgt_nm = '" +egovCryptoUtil.encrypt(cndtnTrgtInfoMngVO.getSearchKeywordFrom()) + "' "; //cndtnTrgtInfoMngVO.setSearchQuery(selectCondition); } @@ -448,14 +450,22 @@ public class CndtnTrgtMngController { //2. pageing step2 cndtnTrgtInfoMngVO = this.setCndtnPagingStep2(cndtnTrgtInfoMngVO, paginationInfo); + //성명검색 + String selectCondition = ""; + if(StringUtil.isNotEmpty(cndtnTrgtInfoMngVO.getSearchKeywordFrom())){ + selectCondition += " AND a.trgt_nm = '" +egovCryptoUtil.encrypt(cndtnTrgtInfoMngVO.getSearchKeywordFrom()) + "' "; + cndtnTrgtInfoMngVO.setSearchQuery(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); } @@ -743,16 +753,6 @@ public class CndtnTrgtMngController { cndtnTrgtMngVO = egovCryptoUtil.encryptCndtnTrgtMngVOInfo(cndtnTrgtMngVO); - //병합이면 대상을 찾아서 넣는다. - System.out.println("cndtnTrgtMngVO.getMergeStatus()"); - System.out.println(cndtnTrgtMngVO.getMergeStatus()); - if (cndtnTrgtMngVO.getMergeStatus()!=null && !"".equals(cndtnTrgtMngVO.getMergeStatus())) { - CndtnTrgtMngVO cndtnTrgtMergeVO = cndtnTrgtInfoMngService.selectDetail4Merge(cndtnTrgtMngVO); - if (cndtnTrgtMergeVO!=null) { - cndtnTrgtMngVO.setPrcsAplctPrdOrdCmplt(cndtnTrgtMergeVO.getSspnIdtmtTrgtOrd()); - } - } - LOGGER.info(cndtnTrgtMngVO.toString()); @@ -775,6 +775,16 @@ public class CndtnTrgtMngController { LOGGER.info(" 엑셀 insert :: [{}]건", trgtExcelVOList.size()); for(CndtnTrgtMngVO cndtnTrgtMngVO : trgtExcelVOList) { + //병합이면 대상을 찾아서 넣는다. + System.out.println("cndtnTrgtMngVO.getMergeStatus()"); + System.out.println(cndtnTrgtMngVO.getMergeStatus()); + if (cndtnTrgtMngVO.getMergeStatus()!=null && !"".equals(cndtnTrgtMngVO.getMergeStatus())) { + CndtnTrgtMngVO cndtnTrgtMergeVO = cndtnTrgtInfoMngService.selectDetail4Merge(cndtnTrgtMngVO); + if (cndtnTrgtMergeVO!=null && cndtnTrgtMergeVO.getTrgtNm().equals(cndtnTrgtMngVO.getTrgtNm())) { + cndtnTrgtMngVO.setPrcsAplctPrdOrdCmplt(cndtnTrgtMergeVO.getSspnIdtmtTrgtOrd()); + } + } + i+=cndtnTrgtInfoMngService.insert4Merge(cndtnTrgtMngVO); } 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 945555d9..b00c9095 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 @@ -252,6 +252,7 @@ AND trgt_nm=#trgtNm# AND sex=#sex# AND d_birth=#dBirth# + AND prcs_aplct_prd_ord_cmplt IS null ORDER BY req_pnttm LIMIT 1 diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtCmpltList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtCmpltList.jsp index 4056a929..2cb0175e 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtCmpltList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtCmpltList.jsp @@ -1,314 +1,314 @@ - -<%@ 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"%> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> -<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> -<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> -<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> -<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> - -<% - /** - * @Class Name : cndtnEduPrcsMngList.jsp - * @Description : 조건부 기소유예 과정관리 목록 - * @Modification Information - * @ - * @ 수정일 수정자 수정내용 - * @ ------- -------- --------------------------- - * @ 2021.12.14 조용준 최초 생성 - * @author 조용준 - * @since 2021.12.14 - * @version 1.0 - * @see - * - */ -%> - - - - - - 교육과정관리 - - -
- -
- - - " /> - " /> - - - -
- -
    -
    • - -
    • -
-
- - -
-

수료자 목록

-
    -
    • -
  • -

    조건부기소유예관리

    -
    • -
  • 수료자 목록
    • -
-
- - -
-
-

수료자 목록

-
- -
-
-
-

구분1

-
-
- - - -
-
-
-
-

구분2

-
-
- -
-
-
-
-

구분3

-
-
- 의뢰일: -
-
- -
- ~ -
- -
-
-
-
-
-
-

엑셀 다운로드

-
-
- -
-
-
- -
-

건의 접수가 검색되었습니다.

-
- - - <%----%> -
-
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ');" style="cursor:pointer;"> -<%-- - - - - - - - - - -<%-- --%> - - - - - - - - - - - - - - -
의뢰일사건번호관할청생년월일성명성별의뢰번호의뢰상태교육상태주소검사명
');" style="cursor:pointer;"> --%> -<%-- --%> - - - -<%-- --%> - - - - - - - - - - - - - - - - - - - ${fn:length(fullAddr)> 5 ? fn:substring(fullAddr, 0, 5).concat('...') : ''} - - -
-
- - - -
- -
- - -
-
-
- - - - - - - + +<%@ 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"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> +<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> + +<% + /** + * @Class Name : cndtnEduPrcsMngList.jsp + * @Description : 조건부 기소유예 과정관리 목록 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2021.12.14 조용준 최초 생성 + * @author 조용준 + * @since 2021.12.14 + * @version 1.0 + * @see + * + */ +%> + + + + + + 교육과정관리 + + +
+ +
+ + + " /> + " /> + + + +
+ +
    +
    • + +
    • +
+
+ + +
+

수료자 목록

+
    +
    • +
  • +

    조건부기소유예관리

    +
    • +
  • 수료자 목록
    • +
+
+ + +
+
+

수료자 목록

+
+ +
+
+
+

구분1

+
+
+ + + +
+
+
+
+

구분2

+
+
+ +
+
+
+
+

구분3

+
+
+ 의뢰일: +
+
+ +
+ ~ +
+ +
+
+
+
+
+
+

엑셀 다운로드

+
+
+ +
+
+
+ +
+

건의 접수가 검색되었습니다.

+
+ + + <%----%> +
+
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ');" style="cursor:pointer;"> +<%-- + + + + + + + + + +<%-- --%> + + + + + + + + + + + + + + +
의뢰일사건번호관할청생년월일성명성별의뢰번호의뢰상태교육상태주소검사명
');" style="cursor:pointer;"> --%> +<%-- --%> + + + +<%-- --%> + + + + + + + + + + + + + + + + + + + ${fn:length(fullAddr)> 5 ? fn:substring(fullAddr, 0, 5).concat('...') : ''} + + +
+
+ + + +
+ +
+ + +
+
+
+ + + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp index 9fb19be8..5e2889ac 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp @@ -499,8 +499,8 @@ $(document).ready(function(){ + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/endInfo/instrEduEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/endInfo/instrEduEndDetail.jsp index a73502cd..d878f3aa 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/endInfo/instrEduEndDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/endInfo/instrEduEndDetail.jsp @@ -34,12 +34,15 @@ $( document ).ready(function() { }); - + function _goPage(){ + history.back(); + } + function linkPage(pageNo){ - var listForm = document.listForm ; - listForm.pageIndex.value = pageNo ; - listForm.action = ""; - listForm.submit(); + var list2Form = document.list2Form ; + list2Form.pageIndex.value = pageNo ; + list2Form.action = ""; + list2Form.submit(); } function eduRsltRprtRegPop(){ @@ -105,7 +108,7 @@ $( document ).ready(function() {
- + " /> " /> " /> @@ -762,7 +765,7 @@ $( document ).ready(function() {
- +