Merge branch '5128_발송결과_리스트_내_수신번호_검색'
This commit is contained in:
commit
dfa0306189
1
.claude/.gitignore
vendored
1
.claude/.gitignore
vendored
@ -1 +1,2 @@
|
||||
/settings.local.json
|
||||
/mcp_settings.json
|
||||
|
||||
@ -34,6 +34,7 @@ import org.springframework.stereotype.Service;
|
||||
|
||||
import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl;
|
||||
import egovframework.rte.fdl.idgnr.EgovIdGnrService;
|
||||
import itn.com.cmm.util.StringUtil;
|
||||
import itn.com.cmm.util.StringUtil2;
|
||||
import itn.let.cmm.vo.FileInfoVO;
|
||||
import itn.let.fax.addr.service.FaxAddrGroupVO;
|
||||
@ -126,6 +127,11 @@ public class MjonMsgSentServiceImpl extends EgovAbstractServiceImpl implements
|
||||
|
||||
Map<String, Object> resultMap = new HashMap<String, Object>();
|
||||
|
||||
//수신번호 검색 시 번호 포멧 통일
|
||||
if("4".equals(mjonMsgSentVO.getSearchCondition()) && StringUtil.isNotEmpty(mjonMsgSentVO.getSearchKeyword())) {
|
||||
mjonMsgSentVO.setSearchKeyword(mjonMsgSentVO.getSearchKeyword().trim().replace("-", ""));
|
||||
}
|
||||
|
||||
// 목록
|
||||
List<MjonMsgSentVO> resultList = mjonMsgSentDAO.selectAllMsgSentList_advc(mjonMsgSentVO);
|
||||
|
||||
|
||||
@ -254,6 +254,9 @@
|
||||
<isEqual property="searchCondition" compareValue="3" >
|
||||
AND B.SMS_TXT LIKE CONCAT('%', #searchKeyword#, '%')
|
||||
</isEqual>
|
||||
<isEqual property="searchCondition" compareValue="4" >
|
||||
AND A.CALL_TO LIKE CONCAT('%', #searchKeyword#, '%')
|
||||
</isEqual>
|
||||
</isNotEmpty>
|
||||
<isNotEmpty property="searchCondition01">
|
||||
AND B.RESERVE_YN = #searchCondition01#
|
||||
@ -473,6 +476,9 @@
|
||||
<isEqual property="searchCondition" compareValue="3" >
|
||||
AND B.SMS_TXT LIKE CONCAT('%', #searchKeyword#, '%')
|
||||
</isEqual>
|
||||
<isEqual property="searchCondition" compareValue="4" >
|
||||
AND A.CALL_TO LIKE CONCAT('%', #searchKeyword#, '%')
|
||||
</isEqual>
|
||||
</isNotEmpty>
|
||||
<isNotEmpty property="searchCondition01">
|
||||
AND B.RESERVE_YN = #searchCondition01#
|
||||
|
||||
@ -888,10 +888,11 @@ function subContent(){
|
||||
<button type="button" class="btnType6" onClick="javascript:fnSearch(1); return false;">조회</button>
|
||||
</div>
|
||||
<div class="btn_right">
|
||||
<label for="searchCondition" class="label">검색 조건: ${mjonMsgSentVO.searchCondition == '2' ? '발신번호' : '문자내용'}</label>
|
||||
<label for="searchCondition" class="label">검색 조건: ${mjonMsgSentVO.searchCondition == '2' ? '발신번호' : mjonMsgSentVO.searchCondition == '3' ? '문자내용' : '수신번호'}</label>
|
||||
<select name="searchCondition" id="searchCondition" class="selType2 select_btn">
|
||||
<option value="2" <c:if test="${mjonMsgSentVO.searchCondition == '2'}">selected</c:if> >발신번호</option>
|
||||
<option value="3" <c:if test="${mjonMsgSentVO.searchCondition == '3'}">selected</c:if> >문자내용</option>
|
||||
<option value="4" <c:if test="${mjonMsgSentVO.searchCondition == '4'}">selected</c:if> >수신번호</option>
|
||||
</select>
|
||||
<div class="search">
|
||||
<label for="id" class="label"></label>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user