From 2b6e716c5dbd9704a88ac03450206ba99be74c3d Mon Sep 17 00:00:00 2001 From: TaehunPark Date: Thu, 22 Sep 2022 09:35:18 +0900 Subject: [PATCH] =?UTF-8?q?fix:=EB=AF=BC=EA=B0=84=ED=86=B5=EC=97=AD?= =?UTF-8?q?=EC=9D=B8=20=EC=88=98=EC=A0=95=EC=8B=9C=20=EC=88=98=EC=A0=95?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=A7=80=EC=86=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dbnt/faisp/translator/TranslatorController.java | 5 +++-- .../com/dbnt/faisp/translator/service/TranslatorService.java | 3 ++- src/main/resources/static/js/translator/translator.js | 5 +++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/dbnt/faisp/translator/TranslatorController.java b/src/main/java/com/dbnt/faisp/translator/TranslatorController.java index d7d7201b..468a8e78 100644 --- a/src/main/java/com/dbnt/faisp/translator/TranslatorController.java +++ b/src/main/java/com/dbnt/faisp/translator/TranslatorController.java @@ -84,10 +84,11 @@ public class TranslatorController { } @PostMapping("/updateTranslatorInfo") - public void updatetranslatorInfo(@AuthenticationPrincipal UserInfo loginUser,Translator translator) { + public Translator updatetranslatorInfo(@AuthenticationPrincipal UserInfo loginUser,Translator translator) { translator.setWrtNm(loginUser.getUserId()); translator.setWrtOrgan(loginUser.getOgCd()); - translatorSevice.updatetranslatorInfo(translator); + Translator result = translatorSevice.updatetranslatorInfo(translator); + return result; } @GetMapping("/revisionHistory") diff --git a/src/main/java/com/dbnt/faisp/translator/service/TranslatorService.java b/src/main/java/com/dbnt/faisp/translator/service/TranslatorService.java index 84bdbfaa..45bcbff1 100644 --- a/src/main/java/com/dbnt/faisp/translator/service/TranslatorService.java +++ b/src/main/java/com/dbnt/faisp/translator/service/TranslatorService.java @@ -54,7 +54,7 @@ public class TranslatorService { } @Transactional - public void updatetranslatorInfo(Translator translator) { + public Translator updatetranslatorInfo(Translator translator) { Translator dbTranslator = translatorRepository .findById(new TranslatorId(translator.getTranslatorKey(), translator.getVersionNo())).orElse(null); Translator translatorTmp = new Translator(); @@ -78,6 +78,7 @@ public class TranslatorService { translatorTmp.setWrtDt(LocalDateTime.now()); translatorTmp.setWrtOrgan(translator.getWrtOrgan()); translatorRepository.save(translatorTmp); + return translatorTmp; } public List selectHistoryList(Translator translator) { diff --git a/src/main/resources/static/js/translator/translator.js b/src/main/resources/static/js/translator/translator.js index 1c9005df..9c61f6f7 100644 --- a/src/main/resources/static/js/translator/translator.js +++ b/src/main/resources/static/js/translator/translator.js @@ -58,6 +58,7 @@ $(document).on('click', '#updateBtn', function (){ } if(confirm("수정하시겠습니까?")){ + const url = '/translator/translatorEditModal'; contentFade("in"); const formData = new FormData($("#trInfoUpdate")[0]); $.ajax({ @@ -66,10 +67,10 @@ $(document).on('click', '#updateBtn', function (){ url : "/translator/updateTranslatorInfo", processData: false, contentType: false, - success : function() { + success : function(data) { alert("수정되었습니다."); contentFade("out"); - location.reload(); + revisionHistory(data.translatorKey,data.versionNo,url); }, error : function(xhr, status) { alert("수정에 실패하였습니다.");