diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/cclt/web/ConciliatorManageController.java b/src/main/java/kcc/kccadr/adjPgrMgr/cclt/web/ConciliatorManageController.java index 6d6ce9ae..d5185097 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/cclt/web/ConciliatorManageController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/cclt/web/ConciliatorManageController.java @@ -1,5 +1,6 @@ package kcc.kccadr.adjPgrMgr.cclt.web; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; @@ -20,6 +21,8 @@ import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.support.RedirectAttributes; +import com.mysql.fabric.xmlrpc.base.Array; + import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; import kcc.com.cmm.EgovMessageSource; @@ -120,6 +123,7 @@ public class ConciliatorManageController { model.addAttribute("paginationInfo", paginationInfo); List list = conciliatorManageService.selectConciliatorManageList(conciliatorManageVO); this.decryptInfomation(list , null); + model.addAttribute("list", list); if(StringUtils.isNotBlank(conciliatorManageVO.getSearchKeyword())){ @@ -151,8 +155,20 @@ public class ConciliatorManageController { model.addAttribute("fileList", fileList); } this.decryptInfomation(null , info); + + String memTeam = info.getMemTeam(); + String[] memTeamArray; + if(StringUtil.isNotEmpty(memTeam)) { + memTeamArray = memTeam.split("§"); + }else { + memTeamArray = new String[]{""}; + } + model.addAttribute("model", info); model.addAttribute("list", conciliatorManageService.selectConciliatorDeptList(conciliatorManageVO)); + + model.addAttribute("memTeamArray", memTeamArray); + return "kccadr/adjPgrMgr/cclt/ConciliatorManageDetail"; } 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/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cclt/ConciliatorManage_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cclt/ConciliatorManage_SQL_Mysql.xml index 7ee44dc3..f238ce8c 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cclt/ConciliatorManage_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cclt/ConciliatorManage_SQL_Mysql.xml @@ -60,7 +60,8 @@ DATE_FORMAT(T1.LAST_UPDT_PNTTM, '%Y-%m-%d') AS lastUpdtPnttm, T1.LAST_UPDUSR_ID AS lastUpdusrId, DECODE(T2.MEM_DEPT_NMS, NULL , '-', REPLACE(T2.MEM_DEPT_NMS, '부', '')) AS memDeptNms, - (SELECT COUNT(1) FROM ADR_MEM_DEPT_MAP WHERE MEM_SEQ = T1.MEM_SEQ) AS memDeptTot + (SELECT COUNT(1) FROM ADR_MEM_DEPT_MAP WHERE MEM_SEQ = T1.MEM_SEQ) AS memDeptTot, + T1.MEM_TEAM as memTeam FROM ADR_MEM_MGR T1 LEFT JOIN ( SELECT S2.MEM_SEQ, diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cclt/ConciliatorManageDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cclt/ConciliatorManageDetail.jsp index 4d8fc603..2fa676d2 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cclt/ConciliatorManageDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cclt/ConciliatorManageDetail.jsp @@ -45,7 +45,7 @@ } function fncCancle (){ - if(confirm("작성된 내용의 수정을 취소하시겠습니까?")){ + if(confirm("작성내용을 저장하려면 수정 버튼을 먼저 클릭해야 합니다.\n저장하지 않고 이전목록으로 돌아가시겠습니까?")){ fncGoList(); } } @@ -85,7 +85,19 @@ } if(confirm("작성된 내용을 수정 하시겠습니까?")){ - + + var memTeam = ""; + $('tr [id^="memTeam"]').each(function (index, item) { + if(item.value != ''){ + if(index != 0){ + memTeam += "§" + item.value; + }else{ + memTeam += item.value; + } + } + }); + $('#memTeam').val(memTeam); + var data = new FormData(document.getElementById("model")); _fileForm2.forEach(function(obj, idx) { if (obj) data.append("file"+idx, obj.fileObj); @@ -156,7 +168,18 @@ goFrom.action = ""; goFrom.submit(); } - + + + + function fncMemTeamCreate(obj){ + var memTeamArrayLeng = parseInt($('#memArrayCnt').val()) == 0 ? 1 : parseInt($('#memArrayCnt').val()); + var memTeamHtml = "소속"+ memTeamArrayLeng +""; + + var newRow = document.getElementById("table0").insertRow($(obj.parentElement.parentElement).closest('tr').prevAll().length + memTeamArrayLeng); + newRow.innerHTML = memTeamHtml; + $('#memArrayCnt').val(memTeamArrayLeng + 1); + } + @@ -173,6 +196,8 @@ + +
@@ -191,7 +216,7 @@

조정위원 상세/수정

- +
@@ -203,13 +228,49 @@ - + - - - + + + + + + + + + + + + + + + + @@ -348,7 +409,7 @@ - + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cclt/ConciliatorManageList.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cclt/ConciliatorManageList.jsp index c928b99a..e71acd5b 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cclt/ConciliatorManageList.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cclt/ConciliatorManageList.jsp @@ -210,8 +210,9 @@ <%----%> - + + @@ -226,6 +227,7 @@ + @@ -249,19 +251,18 @@ +
아이디
성명 소속
+ + 소속 + + ${status.index} + + + + + +
+ + 소속 + + + +
연락처
번호 조정부 이름소속 아이디 전화번호 위원임기 - <%-- - - - - - - 조정부(${list.memDeptTot}) - - --%> + + + ${memTeam}
+ +<%-- --%> + 		')"> diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistInformation.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistInformation.jsp index 58ceb1fa..b8e343c2 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistInformation.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistInformation.jsp @@ -79,7 +79,7 @@ function tutorialPop(){

조정신청

- +
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/adjstExp/adjstReqRegistInformation.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistInformation.jsp index 3406f0bb..d2456237 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistInformation.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistInformation.jsp @@ -80,7 +80,7 @@ function tutorialPop(){

조정신청 체험하기

- +
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..521aa96c 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 @@ -1047,7 +1047,7 @@ var AdjstReq = { if(this.STEP == "${KccadrConstants.STEP9}"){ alert("조정신청에서 첨부파일은 필수입력입니다."); }else{ - alert("파일첨부는 필수입력입니다."); + alert("소명자료 파일첨부는 필수항목입니다.\n미리 준비되지 않은 경우 아래 [임시저장] 후 다시 첨부하시기 바랍니다."); return false; } } @@ -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){