diff --git a/src/main/java/kcc/kccadr/adjst/service/AdjstReqVO.java b/src/main/java/kcc/kccadr/adjst/service/AdjstReqVO.java
index 313f2492..befe5f23 100644
--- a/src/main/java/kcc/kccadr/adjst/service/AdjstReqVO.java
+++ b/src/main/java/kcc/kccadr/adjst/service/AdjstReqVO.java
@@ -174,6 +174,8 @@ public class AdjstReqVO extends ComDefaultVO implements Serializable {
private String codeId;
private String loginNextUrl;
+ private String countryCode;
+
public String getSrchYear() {
@@ -895,6 +897,12 @@ public class AdjstReqVO extends ComDefaultVO implements Serializable {
public void setExmpMgrId(String exmpMgrId) {
this.exmpMgrId = exmpMgrId;
}
+ public String getCountryCode() {
+ return countryCode;
+ }
+ public void setCountryCode(String countryCode) {
+ this.countryCode = countryCode;
+ }
}
diff --git a/src/main/java/kcc/kccadr/adjst/service/impl/AdjstReqServiceImpl.java b/src/main/java/kcc/kccadr/adjst/service/impl/AdjstReqServiceImpl.java
index 751e736c..4d2e3d51 100644
--- a/src/main/java/kcc/kccadr/adjst/service/impl/AdjstReqServiceImpl.java
+++ b/src/main/java/kcc/kccadr/adjst/service/impl/AdjstReqServiceImpl.java
@@ -919,6 +919,13 @@ public class AdjstReqServiceImpl extends EgovAbstractServiceImpl implements Adj
if(CollectionUtils.isNotEmpty(adjstReqVO.getAdjstRpplList())){
for(AdjstReqVO model : adjstReqVO.getAdjstRpplList()){
+
+ if(StringUtils.isNotEmpty(model.getCountryCode())) {
+ model.setRpplPost("["+model.getCountryCode() + "] " +model.getRpplPost());
+ }
+
+ System.out.println(" model.getRpplPost() :: "+ model.getRpplPost());
+
model.setAdrSeq(adjstReqVO.getAdrSeq());
// 관련인 키 생성
model.setRpplSeq(rpplIdgenService.getNextStringId());
@@ -974,6 +981,13 @@ public class AdjstReqServiceImpl extends EgovAbstractServiceImpl implements Adj
int rs = 0;
if(CollectionUtils.isNotEmpty(adjstReqVO.getAdjstRpplList())){
for(AdjstReqVO model : adjstReqVO.getAdjstRpplList()){
+
+ if(StringUtils.isNotEmpty(model.getCountryCode())) {
+ model.setRpplPost("["+model.getCountryCode() + "] " +model.getRpplPost());
+ }
+ System.out.println("model.getRpplPost() ::" + model.getRpplPost());
+
+
model.setAdrSeq(adjstReqVO.getAdrSeq());
// 최초등록자
model.setFrstRegisterId(adjstReqVO.getFrstRegisterId());
diff --git a/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java b/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java
index 23742405..51649e7d 100644
--- a/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java
+++ b/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java
@@ -7,6 +7,8 @@ import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.Properties;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@@ -373,6 +375,29 @@ public class AdjstReqWebController {
req.setRpplTy(KccadrConstants.ADR_RPPL_TY_REQ);
list.add(req);
}
+
+ int cnt = 0;
+ for(AdjstReqVO adj : list) {
+ if("10".equals(adj.getRpplTy())
+ && "02".equals(adj.getRpplUsrDiv())) {
+
+ Pattern pattern = Pattern.compile("\\[(.*?)\\]");
+ Matcher matcher = pattern.matcher(adj.getRpplPost());
+
+ if (matcher.find()) {
+ String extracted = matcher.group(1);
+// list.get(cnt).setCountryCode(extracted);
+ adj.setCountryCode(extracted);
+ System.out.println(" :: adj.getCountryCode() :: "+adj.getCountryCode());
+ }
+// list.get(cnt).setRpplPost(adj.getRpplPost().replaceAll("\\[.*?\\]", ""));
+ adj.setRpplPost(adj.getRpplPost().replaceAll("\\[.*?\\]", "").trim());
+
+ }
+ cnt++;
+ }
+
+
model.addAttribute("editInfo", adjstReqService.checkAdjsReqEditStatus(adjstReqVO));
model.addAttribute("master", adjMsrMaster);
}else{
diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep1.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep1.jsp
index a4914a50..0c9b2c7a 100644
--- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep1.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep1.jsp
@@ -61,6 +61,10 @@ $( document ).ready(function(){
}
});
}
+
+// fn_countryCodeToggle();
+
+
// var rpplUsrDiv = '';
// var rpplUsrDiv = '';
@@ -69,6 +73,22 @@ $( document ).ready(function(){
});
+
+function fn_countryCodeToggle(){
+ console.log('rpplUsrDiv :: ',$('[name="rpplUsrDiv"]').length);
+ if($('[name="rpplUsrDiv"]').length){
+
+ var divVal = $('[name="rpplUsrDiv"]').val();
+ console.log('divVal :: ', divVal);
+ if(divVal == '01'){
+ $('#countryCode').hide();
+ }else{
+ $('#countryCode').show();
+ }
+
+ }
+};
+
@@ -448,6 +468,8 @@ $( document ).ready(function(){
|
+
+
diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp
index 2cd1553f..5f75157c 100644
--- a/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp
@@ -1139,10 +1139,16 @@ var AdjstReq = {
var rpplPhone3 = obj.find("input[name$=rpplPhone3]").val();
var rpplEmailYn = obj.find("input[name$=rpplEmailYn]:checked").val();
var rpplSmsYn = obj.find("input[name$=rpplSmsYn]:checked").val();
- var rpplRealPost = obj.find("input[name$=rpplRealPost").val();
- var rpplRealAddr = obj.find("input[name$=rpplRealAddr").val();
- var rpplRealAddrDtl = obj.find("input[name$=rpplRealAddrDtl").val();
-
+ var rpplRealPost = obj.find("input[name$=rpplRealPost]").val();
+ var rpplRealAddr = obj.find("input[name$=rpplRealAddr]").val();
+ var rpplRealAddrDtl = obj.find("input[name$=rpplRealAddrDtl]").val();
+
+
+ var countryCode = '';
+ if(rpplUsrDiv == '02')
+ {
+ countryCode = obj.find("#countryCode option:selected").text();
+ }
var rpplPhone = rpplPhone1+rpplPhone2+rpplPhone3;
var rpplEmail = rpplEmail1+"@"+rpplEmail2;
@@ -1169,6 +1175,7 @@ var AdjstReq = {
rpplRealAddr : rpplRealAddr,
rpplRealAddrDtl : rpplRealAddrDtl,
rpplPhone : rpplPhone,
+ countryCode : countryCode,
rpplEmail : rpplEmail,
rpplTy : rpplTy,
};
@@ -1496,12 +1503,12 @@ var AdjstReq = {
if (selectedValue === '01') {
// 가장 가까운 주소 입력란을 찾아 readonly 속성을 추가합니다.
$(thisObj).closest('tbody').find('.adr_input').attr('readonly', true);
-// $(thisObj).closest('tbody').find('.adr_input').val('');
$(thisObj).closest('tbody').find('.searchResultAddr').attr('readonly', true);
-// $(thisObj).closest('tbody').find('.searchResultAddr').val('');
// 가장 가까운 우편번호 검색 버튼을 찾아 보이게 합니다.
$(thisObj).closest('tbody').find('.btn_adr_search').show();
+ // 국가코드 selectbox
+ $('#countryCode').hide();
}
// "02": 외국인일 때
@@ -1511,7 +1518,9 @@ var AdjstReq = {
$(thisObj).closest('tbody').find('.searchResultAddr').removeAttr('readonly');
// 가장 가까운 우편번호 검색 버튼을 찾아 숨깁니다.
- $(thisObj).closest('tbody').find('.btn_adr_search').hide()
+ $(thisObj).closest('tbody').find('.btn_adr_search').hide();
+ // 국가코드 selectbox
+ $('#countryCode').show();
}
}
,expDivision : function(stepVal){
|