diff --git a/src/main/java/kcc/com/cmm/util/StreamDocsUtil.java b/src/main/java/kcc/com/cmm/util/StreamDocsUtil.java index e0c44909..182cc0e3 100644 --- a/src/main/java/kcc/com/cmm/util/StreamDocsUtil.java +++ b/src/main/java/kcc/com/cmm/util/StreamDocsUtil.java @@ -15,6 +15,7 @@ public class StreamDocsUtil { HttpResponse response=Unirest.post(requestUrl) .field("pdf", new File(filePath)) + .field("save", false) .asString(); // System.out.println(response.getStatus()); // System.out.println(response.getBody()); diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/exmp/app/service/impl/ExmpAppManageServiceImpl.java b/src/main/java/kcc/kccadr/adjPgrMgr/exmp/app/service/impl/ExmpAppManageServiceImpl.java index dda22658..f483bbb1 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/exmp/app/service/impl/ExmpAppManageServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/exmp/app/service/impl/ExmpAppManageServiceImpl.java @@ -104,7 +104,7 @@ public class ExmpAppManageServiceImpl implements ExmpAppManageService { // model.setExmpCcTy(exmpManageVO.getExmpCcTy()); // exmpAppManageDAO.insertExmpDetailList(model); // } - return new RestResponse(HttpStatus.OK, "정상적으로 등록되었습니다.", LocalDateTime.now()); + return new RestResponse(HttpStatus.OK, "정상적으로 등록되었습니다.", exmpManageVO.getExmpMgrId(), LocalDateTime.now()); } catch (Exception e) { return new RestResponse(HttpStatus.BAD_REQUEST, "오류가 발생하였습니다. 관리자에게 문의해 주세요", LocalDateTime.now()); } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java index c622f22f..6b83ef72 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java @@ -554,7 +554,7 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements String addDe = adjPastVO.getAppDeDay()+" "+adjPastVO.getAppDeTime(); adjPastVO.setAddDe(addDe); - adjPastVO.setAppPlace(adjPastVO.getAppPlaceTx()); // 기일 장소 + adjPastVO.setAppPlace(adjPastVO.getAppPlaceTx() + "|"+adjPastVO.getAppPlaceDetailTx()); // 기일 장소 adjPastVO.setNextAppDe(adjPastVO.getNextAppDeDay()+" "+adjPastVO.getNextAppDeTime()); diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java index b23f1c7c..3b5942e9 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java @@ -396,7 +396,14 @@ public class AdjReqMgrPastController { adjPastVO = adjReqMgrPastService.findByIdPrtclMgr(adjReqMgrPastVO); - System.out.println(" adjPastVO.getPrtclCn() :: " + adjPastVO.getPrtclCn()); + if("99".equals(adjPastVO.getAppPlaceTy())) + { + String[] appPlace = adjPastVO.getAppPlace().split("\\|"); + adjPastVO.setAppPlaceTx(appPlace[0]); + if(appPlace.length > 1) + adjPastVO.setAppPlaceDetailTx(appPlace[1]); + } + model.addAttribute("adjPastVO", adjPastVO); try { diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/app/exmpAppManagerCreate.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/app/exmpAppManagerCreate.jsp index 6382b08b..16d78d00 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/app/exmpAppManagerCreate.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/app/exmpAppManagerCreate.jsp @@ -79,8 +79,9 @@ cache: false, success:function(returnData){ if(returnData.status == "OK"){ + console.log('returnData : ', returnData); alert(returnData.data); - fncDetail(); + fncDetail(returnData.dataSub); }else{ alert(returnData.data); } @@ -156,8 +157,9 @@ varFrom.submit(); } - function fncDetail(){ + function fncDetail(data){ var varFrom = document.getElementById("createForm"); + $('#exmpMgrId').val(data); varFrom.action = ""; varFrom.submit(); } @@ -173,6 +175,7 @@ + " />
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/app/exmpAppManagerList.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/app/exmpAppManagerList.jsp index 03e5a191..572b3523 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/app/exmpAppManagerList.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/app/exmpAppManagerList.jsp @@ -167,7 +167,7 @@ - +