diff --git a/src/main/java/kcc/com/cmm/web/StreamDocsController.java b/src/main/java/kcc/com/cmm/web/StreamDocsController.java index 516d43c4..81c56f50 100644 --- a/src/main/java/kcc/com/cmm/web/StreamDocsController.java +++ b/src/main/java/kcc/com/cmm/web/StreamDocsController.java @@ -184,7 +184,7 @@ public class StreamDocsController { info.setAdrSeq(pdfConversionVO.getAdrSeq()); info = cmmService.selectPgrCmm(info); - if (!"400000".equals(info.getStatCd())) { //종료인 경우 + if ("400000".equals(info.getStatCd())) { //종료인 경우 System.out.println("종료된 경우OOOOOOOOOOOOOO"); //RestResponse rr = new RestResponse(null, "", null); diff --git a/src/main/java/kcc/kccadr/accdnt/apm/web/AdjstPayMentController.java b/src/main/java/kcc/kccadr/accdnt/apm/web/AdjstPayMentController.java index 63007ba9..5eba6e03 100644 --- a/src/main/java/kcc/kccadr/accdnt/apm/web/AdjstPayMentController.java +++ b/src/main/java/kcc/kccadr/accdnt/apm/web/AdjstPayMentController.java @@ -226,8 +226,16 @@ public class AdjstPayMentController { String requestUrl = scheme + "://" + serverName + serverPort; + + //고객사 임의데이터 ("요청URL" + "§" + "pk") - String merchantData = requestUrl + "/web/kccadr/accdnt/apm/adjstPayMentProcess.do" + "§"; + String merchantData = requestUrl + "/web/kccadr/accdnt/apm/adjstPayMentProcess.do" + "§"; + + if("local".equals(prodIsLocal)) { + merchantData = requestUrl + "/web/kccadr/accdnt/ai/doclssReqProcess.do" + "§"; + }else { + merchantData = "https://adr.copyright.or.kr" + "/web/kccadr/accdnt/ai/doclssReqProcess.do" + "§"; + } model.addAttribute("mid", mid); model.addAttribute("signKey", signKey); diff --git a/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java b/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java index e3574f78..ee8e5d94 100644 --- a/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java +++ b/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java @@ -657,8 +657,14 @@ public class AdjstReqStatusController { String requestUrl = scheme + "://" + serverName + serverPort; + String merchantData = requestUrl + "/web/kccadr/accdnt/ai/doclssReqProcess.do" + "§"; + //고객사 임의데이터 ("요청URL" + "§" + "pk") - String merchantData = requestUrl + "/web/kccadr/accdnt/ai/doclssReqProcess.do" + "§"; + if("local".equals(prodIsLocal)) { + merchantData = requestUrl + "/web/kccadr/accdnt/ai/doclssReqProcess.do" + "§"; + }else { + merchantData = "https://adr.copyright.or.kr" + "/web/kccadr/accdnt/ai/doclssReqProcess.do" + "§"; + } model.addAttribute("mid", mid); model.addAttribute("signKey", signKey); diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java index b9d66151..9fe04fca 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java @@ -256,7 +256,7 @@ public class ApmController { * @throws Exception */ @RequestMapping(value = "apmList.do") - public String apmList(@ModelAttribute("cmmVO") PgrCmmVO cmmVO, ModelMap model) throws Exception { + public String apmList(@ModelAttribute("cmmVO") PgrCmmVO cmmVO, HttpServletRequest request, ModelMap model) throws Exception { /* * if(apmVO.getPageUnit() != 10) { apmVO.setPageUnit(apmVO.getPageUnit()); } @@ -266,6 +266,12 @@ public class ApmController { cmmVO.setSearchSortOrd("DESC"); } + String beforeUrl = request.getHeader("Referer"); + + if(!beforeUrl.contains("apm")) { + cmmVO.setSearchMonth("3"); + } + if (StringUtil.isEmpty(cmmVO.getSearchStartDt())) { // 조회일시가 null인경우 Date today = new Date(); cmmVO.setSearchStartDt(DateFormatUtils.format(DateUtils.addMonths(today, -1), "yyyyMMdd")); @@ -324,7 +330,7 @@ public class ApmController { // reqOlCdPst 값이 있으면 과거사건 조회하지 않음 model.addAttribute("list", cmmService.selectPgrCmmList(cmmVO)); - + model.addAttribute("cmmVO", cmmVO); if (!StringUtil.isEmpty(cmmVO.getSearchCondition()) && "20".equals(cmmVO.getSearchCondition())) { // 검색조건 신청인 @@ -392,6 +398,9 @@ public class ApmController { // 조정사건일반 PgrCmmVO info = cmmService.selectPgrCmm(cmmVO); + + info.setSearchMonth(cmmVO.getSearchMonth()); + model.addAttribute("info", info); diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmDetail.jsp index 474b122b..e400e38d 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmDetail.jsp @@ -31,13 +31,14 @@ } function tabPageLoad(idx) { - + var url = getPageUrl(idx); $('#tabContent').load(url, { "adrSeq" : $("#adrSeq").val(), "adrSn" : $("#adrSn").val(), - "reqOlCd" : $("#reqOlCd").val() + "reqOlCd" : $("#reqOlCd").val(), + "searchMonth" : $("#searchMonth").val() }, function(res, status, xhr) { console.log(status); }); @@ -74,6 +75,7 @@ " /> " /> " /> + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp index f184dd63..1387b71b 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp @@ -766,6 +766,9 @@ $(document).ready(function(){ + + +
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab1.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab1.jsp index 48e90e0c..52cfa876 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab1.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab1.jsp @@ -653,7 +653,9 @@ * pdf Stream road */ function fn_read_streamDocs(url){ - window.open(url); + var url2 = url; + url2 = url2.replace("http://192.168.39.144:8080", ""); + window.open(url2); } function fnc_download_endFile(){ diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/report/adrAppSlctReport.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/report/adrAppSlctReport.jsp index 2cf5a53c..30793eba 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/report/adrAppSlctReport.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/report/adrAppSlctReport.jsp @@ -55,16 +55,9 @@ oz.sendToActionScript("viewer.pagedisplay" , "singlepagecontinuous"); //스크롤 추가_220921_이준호 //오즈리포트 pdf 다운로드 시 폰트포함 옵션 추가_220727_이준호 - //oz.sendToActionScript("font.fontnames", "font1"); // 폰트에 대한 이름 임의로 설정 -// oz.sendToActionScript("font.font1.nae", "%uB9D1%uC740%20%uACE0%uB515"); // 맑은 고딕 유니코드 문자 - //oz.sendToActionScript("font.font1.name", "나눔스퀘어"); // 맑은 고딕 유니코드 문자 - //oz.sendToActionScript("font.font1.url", "${ozFontPath}${ozFont}"); // 폰트 경로 기입, url이나 시스템 절대경로 지정 가능 oz.sendToActionScript("pdf.fontembedding", "true"); oz.sendToActionScript("pdf.fontembedding_subset", "true"); -// oz.sendToActionScript("print.externalmodule","oz.viewer.export.OZAppletPrintBarcode_MarkAny"); -// oz.sendToActionScript("connection.extraparam","PropertiesFilePath=%OZCONF%/ozmarkany.properties,UserPassword=a,PdfCreator=MarkAny"); - return true; } 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 dbad45c5..2329395b 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgr/adjReqMgrRegDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgr/adjReqMgrRegDetail.jsp @@ -59,8 +59,7 @@ if(edtTy == undefined){ edtTy = ""; }else{ - - if(edtTy == 'E' && "" != KccadrConstants.ADR_UPDT_REQ){ + if(edtTy == 'E' && "" != "${KccadrConstants.ADR_UPDT_REQ}"){ alert('수정요청상태가 아니기때문에 승인할 수 없습니다.'); return false; } @@ -78,12 +77,12 @@ */ if(mode == 'C' && !( - mastStatCd == KccadrConstants.ADR_REQ_COMP || // 제출완료 - mastStatCd == KccadrConstants.ADR_UPDT_RETN || // 수정요청반려 - mastStatCd == KccadrConstants.ADR_SUPP_COMP // 보완요청완료 + mastStatCd == "${KccadrConstants.ADR_REQ_COMP}" || // 제출완료 + mastStatCd == "${KccadrConstants.ADR_UPDT_RETN}" || // 수정요청반려 + mastStatCd == "${KccadrConstants.ADR_SUPP_COMP}" // 보완요청완료 ) ){ - var msg = KccadrConstants.ADR_CHK_MSG_034; + var msg = "${KccadrConstants.ADR_CHK_MSG_034}"; alert(msg); return false; } diff --git a/src/main/webapp/WEB-INF/jsp/web/cop/bbs/EgovNoticeInqire.jsp b/src/main/webapp/WEB-INF/jsp/web/cop/bbs/EgovNoticeInqire.jsp index 922e337a..1b22db0b 100644 --- a/src/main/webapp/WEB-INF/jsp/web/cop/bbs/EgovNoticeInqire.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/cop/bbs/EgovNoticeInqire.jsp @@ -22,6 +22,8 @@ <%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator"%> <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> <%pageContext.setAttribute("crlf", "\r\n"); %> +<%pageContext.setAttribute("crlt", "<"); %> +<%pageContext.setAttribute("crgt", ">"); %> <% response.setHeader("Cache-Control","no-store"); response.setHeader("Pragma","no-cache"); @@ -316,7 +318,8 @@ function fn_egov_select_commentList(pageNo) { ${fn:replace(result.nttCn, crlf , '
')} - + <%-- --%> +

diff --git a/src/main/webapp/innorix/innorix.js b/src/main/webapp/innorix/innorix.js index e37b2f56..032fa2da 100644 --- a/src/main/webapp/innorix/innorix.js +++ b/src/main/webapp/innorix/innorix.js @@ -1,49 +1,51 @@ -/* - * innorix-wp9 1.0.0 - * INNORIX Transfer solution - * Wed, 18 May 2022 09:39:57 GMT - * - * Copyright (C) INNORIX / innorix-dev-team, http://innorix.com - */ - -// 라이선스 유형 : INNORIX WP 91일 체험 (만료 2022-09-30) -/*var INNORIX_LICENSE = "WEiCgfGkBpqQN/Zw0Ae0YQDFQoK5vit/hNZK/8gGNUm+mtjwAJr4dLSFCiLgiY9BOWSg925hgOfaW1olUgUTccrrl6Y=";*/ -// 라이선스 유형 : INNORIX WP 91일 체험 (만료 2022-12-31) -var INNORIX_LICENSE = "SQeXVJiPNj/2u6W8BXoc1pX1l1D0Dc1azbDxUT+BQPLxsV86kF62+FUvIaofOXnArJTjp9kn/ZtUA+Ps0JFla2QGiu0="; - -var INNORIX_VERSION = '1.1.3.458'; -var INNORIX_WIN_VERSION = '1.1.3.458'; -var INNORIX_MAC_VERSION = '1.1.3.458'; -var INNORIX_LINUX_VERSION = '1.1.3.458'; - -var innorix_install_retry_count = 3; - -!function(t,e){"object"==typeof module&&"object"==typeof module.exports?module.exports=t.document?e(t,!0):function(t){if(!t.document)throw new Error("jQuery requires a window with a document");return e(t)}:e(t)}("undefined"!=typeof window?window:this,function(t,e){function i(t){var e=!!t&&"length"in t&&t.length,i=pt.type(t);return"function"!==i&&!pt.isWindow(t)&&("array"===i||0===e||"number"==typeof e&&e>0&&e-1 in t)}function n(t,e,i){if(pt.isFunction(e))return pt.grep(t,function(t,n){return!!e.call(t,n,t)!==i});if(e.nodeType)return pt.grep(t,function(t){return t===e!==i});if("string"==typeof e){if(St.test(e))return pt.filter(e,t,i);e=pt.filter(e,t)}return pt.grep(t,function(t){return pt.inArray(t,e)>-1!==i})}function o(t,e){do{t=t[e]}while(t&&1!==t.nodeType);return t}function r(t){var e={};return pt.each(t.match(Et)||[],function(t,i){e[i]=!0}),e}function s(){nt.addEventListener?(nt.removeEventListener("DOMContentLoaded",a),t.removeEventListener("load",a)):(nt.detachEvent("onreadystatechange",a),t.detachEvent("onload",a))}function a(){(nt.addEventListener||"load"===t.event.type||"complete"===nt.readyState)&&(s(),pt.ready())}function l(t,e,i){if(void 0===i&&1===t.nodeType){var n="data-"+e.replace(Nt,"-$1").toLowerCase();if("string"==typeof(i=t.getAttribute(n))){try{i="true"===i||"false"!==i&&("null"===i?null:+i+""===i?+i:Ot.test(i)?pt.parseJSON(i):i)}catch(ot){}pt.data(t,e,i)}else i=void 0}return i}function h(t){var e;for(e in t)if(("data"!==e||!pt.isEmptyObject(t[e]))&&"toJSON"!==e)return!1;return!0}function c(t,e,i,n){if(Rt(t)){var o,r,s=pt.expando,a=t.nodeType,l=a?pt.cache:t,h=a?t[s]:t[s]&&s;if(h&&l[h]&&(n||l[h].data)||void 0!==i||"string"!=typeof e)return h||(h=a?t[s]=it.pop()||pt.guid++:s),l[h]||(l[h]=a?{}:{toJSON:pt.noop}),"object"!=typeof e&&"function"!=typeof e||(n?l[h]=pt.extend(l[h],e):l[h].data=pt.extend(l[h].data,e)),r=l[h],n||(r.data||(r.data={}),r=r.data),void 0!==i&&(r[pt.camelCase(e)]=i),"string"==typeof e?null==(o=r[e])&&(o=r[pt.camelCase(e)]):o=r,o}}function u(t,e,i){if(Rt(t)){var n,o,r=t.nodeType,s=r?pt.cache:t,a=r?t[pt.expando]:pt.expando;if(s[a]){if(e&&(n=i?s[a]:s[a].data)){pt.isArray(e)?e=e.concat(pt.map(e,pt.camelCase)):e in n?e=[e]:(e=pt.camelCase(e),e=e in n?[e]:e.split(" ")),o=e.length;for(;o--;)delete n[e[o]];if(i?!h(n):!pt.isEmptyObject(n))return}(i||(delete s[a].data,h(s[a])))&&(r?pt.cleanData([t],!0):ut.deleteExpando||s!=s.window?delete s[a]:s[a]=void 0)}}}function d(t,e,i,n){var o,r=1,s=20,a=n?function(){return n.cur()}:function(){return pt.css(t,e,"")},l=a(),h=i&&i[3]||(pt.cssNumber[e]?"":"px"),c=(pt.cssNumber[e]||"px"!==h&&+l)&&Ft.exec(pt.css(t,e));if(c&&c[3]!==h){h=h||c[3],i=i||[],c=+l||1;do{r=r||".5",c/=r,pt.style(t,e,c+h)}while(r!==(r=a()/l)&&1!==r&&--s)}return i&&(c=+c||+l||0,o=i[1]?c+(i[1]+1)*i[2]:+i[2],n&&(n.unit=h,n.start=c,n.end=o)),o}function p(t){var e=Vt.split("|"),i=t.createDocumentFragment();if(i.createElement)for(;e.length;)i.createElement(e.pop());return i}function f(t,e){var i,n,o=0,r="undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e||"*"):"undefined"!=typeof t.querySelectorAll?t.querySelectorAll(e||"*"):void 0;if(!r)for(r=[],i=t.childNodes||t;null!=(n=i[o]);o++)!e||pt.nodeName(n,e)?r.push(n):pt.merge(r,f(n,e));return void 0===e||e&&pt.nodeName(t,e)?pt.merge([t],r):r}function g(t,e){for(var i,n=0;null!=(i=t[n]);n++)pt._data(i,"globalEval",!e||pt._data(e[n],"globalEval"))}function m(t){Ht.test(t.type)&&(t.defaultChecked=t.checked)}function v(t,e,i,n,o){for(var r,s,a,l,h,c,u,d=t.length,v=p(e),_=[],x=0;d>x;x++)if((s=t[x])||0===s)if("object"===pt.type(s))pt.merge(_,s.nodeType?[s]:s);else if(jt.test(s)){for(l=l||v.appendChild(e.createElement("div")),h=(Wt.exec(s)||["",""])[1].toLowerCase(),u=$t[h]||$t._default,l.innerHTML=u[1]+pt.htmlPrefilter(s)+u[2],r=u[0];r--;)l=l.lastChild;if(!ut.leadingWhitespace&&Ut.test(s)&&_.push(e.createTextNode(Ut.exec(s)[0])),!ut.tbody)for(s="table"!==h||qt.test(s)?""!==u[1]||qt.test(s)?0:l:l.firstChild,r=s&&s.childNodes.length;r--;)pt.nodeName(c=s.childNodes[r],"tbody")&&!c.childNodes.length&&s.removeChild(c);for(pt.merge(_,l.childNodes),l.textContent="";l.firstChild;)l.removeChild(l.firstChild);l=v.lastChild}else _.push(e.createTextNode(s));for(l&&v.removeChild(l),ut.appendChecked||pt.grep(f(_,"input"),m),x=0;s=_[x++];)if(n&&pt.inArray(s,n)>-1)o&&o.push(s);else if(a=pt.contains(s.ownerDocument,s),l=f(v.appendChild(s),"script"),a&&g(l),i)for(r=0;s=l[r++];)zt.test(s.type||"")&&i.push(s);return l=null,v}function _(){return!0}function x(){return!1}function y(){try{return nt.activeElement}catch(t){}}function b(t,e,i,n,o,r){var s,a;if("object"==typeof e){"string"!=typeof i&&(n=n||i,i=void 0);for(a in e)b(t,a,i,n,e[a],r);return t}if(null==n&&null==o?(o=i,n=i=void 0):null==o&&("string"==typeof i?(o=n,n=void 0):(o=n,n=i,i=void 0)),!1===o)o=x;else if(!o)return t;return 1===r&&(s=o,o=function(t){return pt().off(t),s.apply(this,arguments)},o.guid=s.guid||(s.guid=pt.guid++)),t.each(function(){pt.event.add(this,e,o,n,i)})}function w(t,e){return pt.nodeName(t,"table")&&pt.nodeName(11!==e.nodeType?e:e.firstChild,"tr")?t.getElementsByTagName("tbody")[0]||t.appendChild(t.ownerDocument.createElement("tbody")):t}function S(t){return t.type=(null!==pt.find.attr(t,"type"))+"/"+t.type,t}function C(t){var e=ne.exec(t.type);return e?t.type=e[1]:t.removeAttribute("type"),t}function T(t,e){if(1===e.nodeType&&pt.hasData(t)){var i,n,o,r=pt._data(t),s=pt._data(e,r),a=r.events;if(a){delete s.handle,s.events={};for(i in a)for(n=0,o=a[i].length;o>n;n++)pt.event.add(e,i,a[i][n])}s.data&&(s.data=pt.extend({},s.data))}}function k(t,e){var i,n,o;if(1===e.nodeType){if(i=e.nodeName.toLowerCase(),!ut.noCloneEvent&&e[pt.expando]){o=pt._data(e);for(n in o.events)pt.removeEvent(e,n,o.handle);e.removeAttribute(pt.expando)}"script"===i&&e.text!==t.text?(S(e).text=t.text,C(e)):"object"===i?(e.parentNode&&(e.outerHTML=t.outerHTML),ut.html5Clone&&t.innerHTML&&!pt.trim(e.innerHTML)&&(e.innerHTML=t.innerHTML)):"input"===i&&Ht.test(t.type)?(e.defaultChecked=e.checked=t.checked,e.value!==t.value&&(e.value=t.value)):"option"===i?e.defaultSelected=e.selected=t.defaultSelected:"input"!==i&&"textarea"!==i||(e.defaultValue=t.defaultValue)}}function D(t,e,i,n){e=rt.apply([],e);var o,r,s,a,l,h,c=0,u=t.length,d=u-1,p=e[0],g=pt.isFunction(p);if(g||u>1&&"string"==typeof p&&!ut.checkClone&&ie.test(p))return t.each(function(o){var r=t.eq(o);g&&(e[0]=p.call(this,o,r.html())),D(r,e,i,n)});if(u&&(h=v(e,t[0].ownerDocument,!1,t,n),o=h.firstChild,1===h.childNodes.length&&(h=o),o||n)){for(a=pt.map(f(h,"script"),S),s=a.length;u>c;c++)r=h,c!==d&&(r=pt.clone(r,!0,!0),s&&pt.merge(a,f(r,"script"))),i.call(t[c],r,c);if(s)for(l=a[a.length-1].ownerDocument,pt.map(a,C),c=0;s>c;c++)r=a[c],zt.test(r.type||"")&&!pt._data(r,"globalEval")&&pt.contains(l,r)&&(r.src?pt._evalUrl&&pt._evalUrl(r.src):pt.globalEval((r.text||r.textContent||r.innerHTML||"").replace(oe,"")));h=o=null}return t}function E(t,e,i){for(var n,o=e?pt.filter(e,t):t,r=0;null!=(n=o[r]);r++)i||1!==n.nodeType||pt.cleanData(f(n)),n.parentNode&&(i&&pt.contains(n.ownerDocument,n)&&g(f(n,"script")),n.parentNode.removeChild(n));return t}function I(t,e){var i=pt(e.createElement(t)).appendTo(e.body),n=pt.css(i[0],"display");return i.detach(),n}function A(t){var e=nt,i=le[t];return i||(i=I(t,e),"none"!==i&&i||(ae=(ae||pt("