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(){ + + +