tolag3/kcc_adr_advc_git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'tolag'

Browse Source
This commit is contained in:
leejunho 2023-10-18 11:06:50 +09:00
commit cb51e1ed03
5 changed files with 10 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/kcc/kccadr/aprvl/service/impl/AprvlMgrServiceImpl.java
View File

@ -129,28 +129,6 @@ public class AprvlMgrServiceImpl extends EgovAbstractServiceImpl implements Apr
, adrSbmtLineMgrUsrVO.getSbmtId1() , 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()); }else if (adrSbmtLineMgrUsrVO.getSbmtId1()!=null && !"".equals(adrSbmtLineMgrUsrVO.getSbmtId1())) { aprvlMgrVOtmp.setSbmtId1(adrSbmtLineMgrUsrVO.getSbmtId1());
} }
} }

6
src/main/java/kcc/kccadr/textsense/web/TextSenseAPIComm.java
View File

@ -27,11 +27,11 @@ public class TextSenseAPIComm {
try { try {
String apiUrl = textSenseVO.getApiUrl(); //"http://222.231.43.29:7777/textsense/api/job/build"; 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 = 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 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 = ""; //String extraJobs = "";
JSONObject jsonOptObj = new JSONObject(); JSONObject jsonOptObj = new JSONObject();

4
src/main/java/kcc/kccadr/textsense/web/TextSenseController.java
View File

@ -204,9 +204,9 @@ public class TextSenseController {
String taskName = textSenseVO.getTaskName(); String taskName = textSenseVO.getTaskName();
apiTextSenseVO.setApiUrl(apiUrl); 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.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); apiTextSenseVO.setTaskName(taskName);
//extraJobs의 Option 항목 셋팅 해주기 //extraJobs의 Option 항목 셋팅 해주기

2
src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgr/adjReqMgrRegDetail.jsp
View File

@ -746,7 +746,7 @@
</c:forEach> </c:forEach>
<c:if test="${fn:length(security) eq 0}"> <c:if test="${fn:length(security) eq 0}">
<tr> <tr>
<td colspan="5">보완요청 내역이 없습니다.</td> <td colspan="6">보완요청 내역이 없습니다.</td>
</tr> </tr>
</c:if> </c:if>
</tbody> </tbody>

4
src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp
View File

@ -1542,6 +1542,7 @@ var AdjstReq = {
$('.mailItem').show(); $('.mailItem').show();
$(thisObj).closest('tbody').find('.searchResultAddr').css({'width':''}); $(thisObj).closest('tbody').find('.searchResultAddr').css({'width':''});
$(thisObj).closest('tbody').find('.usrInsertAddr').show(); $(thisObj).closest('tbody').find('.usrInsertAddr').show();
$(thisObj).closest('tbody').find('#foreigner').remove();
} }
@ -1564,6 +1565,9 @@ var AdjstReq = {
$('.mailItem').hide(); $('.mailItem').hide();
$(thisObj).closest('tbody').find('.usrInsertAddr').hide(); $(thisObj).closest('tbody').find('.usrInsertAddr').hide();
$(thisObj).closest('tbody').find('.searchResultAddr').css({'width':'100%'}); $(thisObj).closest('tbody').find('.searchResultAddr').css({'width':'100%'});
$(thisObj).closest('tbody').find('.searchResultAddr')
.first()
.after("<span style='color:#e40000;margin:4px 0 0 0;font-size:14px;' id=\"foreigner\">주소는 영문으로 입력해주세요</span>");
} }
} }
,expDivision : function(stepVal){ ,expDivision : function(stepVal){