DBNT
/
FAISP
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of http://118.219.150.34:50501/DBNT/FAISP

강석 최 2022-09-22 11:25:46 +09:00
parent 25158e2a1d 2b6e716c5d
commit 616fd365a8
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/dbnt/faisp/translator/TranslatorController.java
View File

@ -84,10 +84,11 @@ public class TranslatorController {
} }
@PostMapping("/updateTranslatorInfo") @PostMapping("/updateTranslatorInfo")
public void updatetranslatorInfo(@AuthenticationPrincipal UserInfo loginUser,Translator translator) { public Translator updatetranslatorInfo(@AuthenticationPrincipal UserInfo loginUser,Translator translator) {
translator.setWrtNm(loginUser.getUserId()); translator.setWrtNm(loginUser.getUserId());
translator.setWrtOrgan(loginUser.getOgCd()); translator.setWrtOrgan(loginUser.getOgCd());
translatorSevice.updatetranslatorInfo(translator); Translator result = translatorSevice.updatetranslatorInfo(translator);
return result;
} }
@GetMapping("/revisionHistory") @GetMapping("/revisionHistory")

3
src/main/java/com/dbnt/faisp/translator/service/TranslatorService.java
View File

@ -54,7 +54,7 @@ public class TranslatorService {
} }
@Transactional @Transactional
public void updatetranslatorInfo(Translator translator) { public Translator updatetranslatorInfo(Translator translator) {
Translator dbTranslator = translatorRepository Translator dbTranslator = translatorRepository
.findById(new TranslatorId(translator.getTranslatorKey(), translator.getVersionNo())).orElse(null); .findById(new TranslatorId(translator.getTranslatorKey(), translator.getVersionNo())).orElse(null);
Translator translatorTmp = new Translator(); Translator translatorTmp = new Translator();
@ -78,6 +78,7 @@ public class TranslatorService {
translatorTmp.setWrtDt(LocalDateTime.now()); translatorTmp.setWrtDt(LocalDateTime.now());
translatorTmp.setWrtOrgan(translator.getWrtOrgan()); translatorTmp.setWrtOrgan(translator.getWrtOrgan());
translatorRepository.save(translatorTmp); translatorRepository.save(translatorTmp);
return translatorTmp;
} }
public List<Translator> selectHistoryList(Translator translator) { public List<Translator> selectHistoryList(Translator translator) {

5
src/main/resources/static/js/translator/translator.js
View File

@ -58,6 +58,7 @@ $(document).on('click', '#updateBtn', function (){
} }
if(confirm("수정하시겠습니까?")){ if(confirm("수정하시겠습니까?")){
const url = '/translator/translatorEditModal';
contentFade("in"); contentFade("in");
const formData = new FormData($("#trInfoUpdate")[0]); const formData = new FormData($("#trInfoUpdate")[0]);
$.ajax({ $.ajax({
@ -66,10 +67,10 @@ $(document).on('click', '#updateBtn', function (){
url : "/translator/updateTranslatorInfo", url : "/translator/updateTranslatorInfo",
processData: false, processData: false,
contentType: false, contentType: false,
success : function() { success : function(data) {
alert("수정되었습니다."); alert("수정되었습니다.");
contentFade("out"); contentFade("out");
location.reload(); revisionHistory(data.translatorKey,data.versionNo,url);
}, },
error : function(xhr, status) { error : function(xhr, status) {
alert("수정에 실패하였습니다."); alert("수정에 실패하였습니다.");