diff --git a/src/main/java/kcc/kccadr/aprvl/service/impl/AprvlMgrServiceImpl.java b/src/main/java/kcc/kccadr/aprvl/service/impl/AprvlMgrServiceImpl.java index ca19bc32..a34933c0 100644 --- a/src/main/java/kcc/kccadr/aprvl/service/impl/AprvlMgrServiceImpl.java +++ b/src/main/java/kcc/kccadr/aprvl/service/impl/AprvlMgrServiceImpl.java @@ -129,28 +129,6 @@ public class AprvlMgrServiceImpl extends EgovAbstractServiceImpl implements Apr , adrSbmtLineMgrUsrVO.getSbmtId1() ); - /* - _insertAdrSbmtMgrHstry - - adrSbmtLineMgrUsrVO.setAdrSeq(aprvlMgrVO.getAdrSeq()); - adrSbmtLineMgrUsrVO.setAdrSn(aprvlMgrVO.getAdrSn()); - adrSbmtLineMgrUsrVO.setSbmtSeq(aprvlMgrVO.getSbmtSeq()); - - adrSbmtLineMgrUsrVO.setSbmtSbsttSeq(sbmtSbsttSeq); - adrSbmtLineMgrUsrVO.setAgntSbmtId("ID1"); - adrSbmtLineMgrUsrVO.setSbmtIdSbstt(adrSbmtLineMgrUsrVO.getSbsttSbmtId1()); - adrSbmtLineMgrUsrVO.setSbmtIdBef(adrSbmtLineMgrUsrVO.getSbmtId1()); - adrSbmtLineMgrUsrVO.setFrstRegisterId(aprvlMgrVO.getFrstRegisterId()); - - //저장 - adrSbmtMgrHstryService.insert(adrSbmtLineMgrUsrVO - , "관리자>>결재선>대결등록" //String p_code_desc - CC199 - , "A002" //String p_stat_cd - , "" - ); - //AdrSbmtLineMgrUsrVO - */ - }else if (adrSbmtLineMgrUsrVO.getSbmtId1()!=null && !"".equals(adrSbmtLineMgrUsrVO.getSbmtId1())) { aprvlMgrVOtmp.setSbmtId1(adrSbmtLineMgrUsrVO.getSbmtId1()); } } diff --git a/src/main/java/kcc/kccadr/textsense/web/TextSenseAPIComm.java b/src/main/java/kcc/kccadr/textsense/web/TextSenseAPIComm.java index 51eed6f4..1b5133a1 100644 --- a/src/main/java/kcc/kccadr/textsense/web/TextSenseAPIComm.java +++ b/src/main/java/kcc/kccadr/textsense/web/TextSenseAPIComm.java @@ -27,11 +27,11 @@ public class TextSenseAPIComm { try { String apiUrl = textSenseVO.getApiUrl(); //"http://222.231.43.29:7777/textsense/api/job/build"; - String inputUri = textSenseVO.getInputUri(); //"http://119.193.215.98:8097/kccadrPb/usr/image/common/top_logo.png"; + String inputUri = textSenseVO.getInputUri(); //"http://119.193.215.98:8081/kccadrPb/usr/image/common/top_logo.png"; String outputUri = textSenseVO.getOutputUri(); //"ftp://woo:dkagh@119.193.215.98/usr/ePapyrus/testocr.json"; - //String outputUri = "http://119.193.215.98:8097/web/main/textsence/testOutputUriPage.do"; + //String outputUri = "http://119.193.215.98:8081/web/main/textsence/testOutputUriPage.do"; String taskName = textSenseVO.getTaskName();//"textsense-test1"; - String callbackUri = textSenseVO.getCallbackUri();//"http://119.193.215.98:8097/web/main/textsence/testCallbackUriPage.do"; + String callbackUri = textSenseVO.getCallbackUri();//"http://119.193.215.98:8081/web/main/textsence/testCallbackUriPage.do"; //String extraJobs = ""; JSONObject jsonOptObj = new JSONObject(); diff --git a/src/main/java/kcc/kccadr/textsense/web/TextSenseController.java b/src/main/java/kcc/kccadr/textsense/web/TextSenseController.java index a9a8cfff..dd6174e9 100644 --- a/src/main/java/kcc/kccadr/textsense/web/TextSenseController.java +++ b/src/main/java/kcc/kccadr/textsense/web/TextSenseController.java @@ -204,9 +204,9 @@ public class TextSenseController { String taskName = textSenseVO.getTaskName(); apiTextSenseVO.setApiUrl(apiUrl); - apiTextSenseVO.setInputUri("http://119.193.215.98:8097/uss/ion/pwm/getImage.do?atchFileId="+ atchFileId +"&fileSn=0"); + apiTextSenseVO.setInputUri("http://119.193.215.98:8081/uss/ion/pwm/getImage.do?atchFileId="+ atchFileId +"&fileSn=0"); apiTextSenseVO.setOutputUri("file:/home/kcc_adr_ocr_dir/" + outputFileNm); - apiTextSenseVO.setCallbackUri("http://119.193.215.98:8097/kccadr/textsence/textSenseCallbackUriPage.do"); + apiTextSenseVO.setCallbackUri("http://119.193.215.98:8081/kccadr/textsence/textSenseCallbackUriPage.do"); apiTextSenseVO.setTaskName(taskName); //extraJobs의 Option 항목 셋팅 해주기 diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgr/adjReqMgrRegDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgr/adjReqMgrRegDetail.jsp index 68631478..233ab1f7 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgr/adjReqMgrRegDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgr/adjReqMgrRegDetail.jsp @@ -746,7 +746,7 @@ - 보완요청 내역이 없습니다. + 보완요청 내역이 없습니다. 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 495e83c9..a963c8af 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 @@ -1542,6 +1542,7 @@ var AdjstReq = { $('.mailItem').show(); $(thisObj).closest('tbody').find('.searchResultAddr').css({'width':''}); $(thisObj).closest('tbody').find('.usrInsertAddr').show(); + $(thisObj).closest('tbody').find('#foreigner').remove(); } @@ -1564,6 +1565,9 @@ var AdjstReq = { $('.mailItem').hide(); $(thisObj).closest('tbody').find('.usrInsertAddr').hide(); $(thisObj).closest('tbody').find('.searchResultAddr').css({'width':'100%'}); + $(thisObj).closest('tbody').find('.searchResultAddr') + .first() + .after("주소는 영문으로 입력해주세요"); } } ,expDivision : function(stepVal){