Merge branch 'jiwoo'
This commit is contained in:
commit
ead0f21a88
@ -223,7 +223,7 @@ public class CmdTrgtMngController {
|
|||||||
String searchStatus = cndtnTrgtInfoMngVO.getSearchStatus();
|
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() + "'||'%' ";
|
selectCondition += "AND a."+searchStatus+" LIKE '%'||'" +cndtnTrgtInfoMngVO.getSearchKeyword() + "'||'%' ";
|
||||||
cndtnTrgtInfoMngVO.setSearchQuery(selectCondition);
|
cndtnTrgtInfoMngVO.setSearchQuery(selectCondition);
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -231,13 +231,13 @@ public class CmdTrgtMngController {
|
|||||||
//성명검색
|
//성명검색
|
||||||
if(StringUtil.isNotEmpty(cndtnTrgtInfoMngVO.getSearchKeywordFrom())){
|
if(StringUtil.isNotEmpty(cndtnTrgtInfoMngVO.getSearchKeywordFrom())){
|
||||||
//cndtnTrgtInfoMngVO.setSearchKeywordFrom(egovCryptoUtil.encrypt(cndtnTrgtInfoMngVO.getSearchKeywordFrom()));
|
//cndtnTrgtInfoMngVO.setSearchKeywordFrom(egovCryptoUtil.encrypt(cndtnTrgtInfoMngVO.getSearchKeywordFrom()));
|
||||||
selectCondition = " AND a.trgt_nm = '" +egovCryptoUtil.encrypt(cndtnTrgtInfoMngVO.getSearchKeywordFrom()) + "' ";
|
selectCondition += " AND a.trgt_nm = '" +egovCryptoUtil.encrypt(cndtnTrgtInfoMngVO.getSearchKeywordFrom()) + "' ";
|
||||||
//cndtnTrgtInfoMngVO.setSearchQuery(selectCondition);
|
//cndtnTrgtInfoMngVO.setSearchQuery(selectCondition);
|
||||||
}
|
}
|
||||||
|
|
||||||
//생년월일검색
|
//생년월일검색
|
||||||
if(StringUtil.isNotEmpty(cndtnTrgtInfoMngVO.getSearchKeywordTo())){
|
if(StringUtil.isNotEmpty(cndtnTrgtInfoMngVO.getSearchKeywordTo())){
|
||||||
selectCondition = " AND a.d_birth ='" +cndtnTrgtInfoMngVO.getSearchKeywordTo() + "' ";
|
selectCondition += " AND a.d_birth ='" + egovCryptoUtil.encrypt(cndtnTrgtInfoMngVO.getSearchKeywordTo()) + "' ";
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -218,7 +218,7 @@ public class CndtnTrgtMngController {
|
|||||||
String searchStatus = cndtnTrgtInfoMngVO.getSearchStatus();
|
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() + "'||'%' ";
|
selectCondition += "AND a."+searchStatus+" LIKE '%'||'" +cndtnTrgtInfoMngVO.getSearchKeyword() + "'||'%' ";
|
||||||
cndtnTrgtInfoMngVO.setSearchQuery(selectCondition);
|
cndtnTrgtInfoMngVO.setSearchQuery(selectCondition);
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -226,13 +226,13 @@ public class CndtnTrgtMngController {
|
|||||||
//성명검색
|
//성명검색
|
||||||
if(StringUtil.isNotEmpty(cndtnTrgtInfoMngVO.getSearchKeywordFrom())){
|
if(StringUtil.isNotEmpty(cndtnTrgtInfoMngVO.getSearchKeywordFrom())){
|
||||||
//cndtnTrgtInfoMngVO.setSearchKeywordFrom(egovCryptoUtil.encrypt(cndtnTrgtInfoMngVO.getSearchKeywordFrom()));
|
//cndtnTrgtInfoMngVO.setSearchKeywordFrom(egovCryptoUtil.encrypt(cndtnTrgtInfoMngVO.getSearchKeywordFrom()));
|
||||||
selectCondition = " AND a.trgt_nm = '" +egovCryptoUtil.encrypt(cndtnTrgtInfoMngVO.getSearchKeywordFrom()) + "' ";
|
selectCondition += " AND a.trgt_nm = '" +egovCryptoUtil.encrypt(cndtnTrgtInfoMngVO.getSearchKeywordFrom()) + "' ";
|
||||||
//cndtnTrgtInfoMngVO.setSearchQuery(selectCondition);
|
//cndtnTrgtInfoMngVO.setSearchQuery(selectCondition);
|
||||||
}
|
}
|
||||||
|
|
||||||
//생년월일검색
|
//생년월일검색
|
||||||
if(StringUtil.isNotEmpty(cndtnTrgtInfoMngVO.getSearchKeywordTo())){
|
if(StringUtil.isNotEmpty(cndtnTrgtInfoMngVO.getSearchKeywordTo())){
|
||||||
selectCondition = " AND a.d_birth ='" +cndtnTrgtInfoMngVO.getSearchKeywordTo() + "' ";
|
selectCondition += " AND a.d_birth ='" + egovCryptoUtil.encrypt(cndtnTrgtInfoMngVO.getSearchKeywordTo()) + "' ";
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -69,12 +69,12 @@
|
|||||||
fncCreate();
|
fncCreate();
|
||||||
}else{
|
}else{
|
||||||
alert("중복 대상자가 있습니다.");
|
alert("중복 대상자가 있습니다.");
|
||||||
var sendData = $(document.createForm).serializeArray() ;
|
/* var sendData = $(document.createForm).serializeArray() ;
|
||||||
$("#loadDiv").load("<c:url value='/kccadr/oprtn/cmdTrgt/popup/duplChkTable.do' />", sendData ,function(response, status, xhr){
|
$("#loadDiv").load("<c:url value='/kccadr/oprtn/cmdTrgt/popup/duplChkTable.do' />", sendData ,function(response, status, xhr){
|
||||||
$("#duplInsert").show();
|
$("#duplInsert").show();
|
||||||
$("#newInsert").show();
|
$("#newInsert").show();
|
||||||
|
|
||||||
});
|
}); */
|
||||||
|
|
||||||
}
|
}
|
||||||
//
|
//
|
||||||
|
|||||||
@ -69,12 +69,12 @@
|
|||||||
fncCreate();
|
fncCreate();
|
||||||
}else{
|
}else{
|
||||||
alert("중복 대상자가 있습니다.");
|
alert("중복 대상자가 있습니다.");
|
||||||
var sendData = $(document.createForm).serializeArray() ;
|
/* var sendData = $(document.createForm).serializeArray() ;
|
||||||
$("#loadDiv").load("<c:url value='/kccadr/oprtn/cndtnSspnIdtmt/popup/duplChkTable.do' />", sendData ,function(response, status, xhr){
|
$("#loadDiv").load("<c:url value='/kccadr/oprtn/cndtnSspnIdtmt/popup/duplChkTable.do' />", sendData ,function(response, status, xhr){
|
||||||
$("#duplInsert").show();
|
$("#duplInsert").show();
|
||||||
$("#newInsert").show();
|
$("#newInsert").show();
|
||||||
|
|
||||||
});
|
}); */
|
||||||
|
|
||||||
}
|
}
|
||||||
//
|
//
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user