From 729017c9e130a1d772edf4a6ad0f239da0ac6fa3 Mon Sep 17 00:00:00 2001 From: TaehunPark Date: Tue, 6 Sep 2022 17:40:44 +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=EA=B8=B0=EB=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TranslatorController.java | 1 - .../faisp/translator/TranslatorService.java | 57 ++++++++++++++----- .../faisp/translator/model/Translator.java | 9 ++- .../repository/TranslatorRepository.java | 6 ++ .../static/js/translator/translator.js | 7 +-- .../translator/translatorEditModal.html | 2 +- 6 files changed, 58 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/dbnt/faisp/controller/TranslatorController.java b/src/main/java/com/dbnt/faisp/controller/TranslatorController.java index a17270fd..8a9185d3 100644 --- a/src/main/java/com/dbnt/faisp/controller/TranslatorController.java +++ b/src/main/java/com/dbnt/faisp/controller/TranslatorController.java @@ -59,7 +59,6 @@ public class TranslatorController { @PostMapping("/updatetranslatorInfo") public void updatetranslatorInfo(@AuthenticationPrincipal UserInfo loginUser,Translator translator) { - System.out.println("@@="+translator); translator.setWrtNm(loginUser.getUserId()); translator.setWrtOrgan(loginUser.getOgCd()); translatorSevice.updatetranslatorInfo(translator); diff --git a/src/main/java/com/dbnt/faisp/translator/TranslatorService.java b/src/main/java/com/dbnt/faisp/translator/TranslatorService.java index 3366a6b4..394b8e9c 100644 --- a/src/main/java/com/dbnt/faisp/translator/TranslatorService.java +++ b/src/main/java/com/dbnt/faisp/translator/TranslatorService.java @@ -22,36 +22,63 @@ import java.util.*; @RequiredArgsConstructor public class TranslatorService { - private final TranslatorRepository translatorRepository; - private final TranslatorMapper translatorMapper; - - - public String insertTranslatorInfo(Translator translator) { - translator.setVersionNo(1); - translator.setWrtDt(LocalDateTime.now()); - return translatorRepository.save(translator).getTrName(); -} + private final TranslatorRepository translatorRepository; + private final TranslatorMapper translatorMapper; + public String insertTranslatorInfo(Translator translator) { + Translator dbTranslator = translatorRepository.findFirstByOrderByTranslatorKeyDesc(); + translator.setWrtDt(LocalDateTime.now()); + if (dbTranslator == null) { + translator.setTranslatorKey(1); + translator.setVersionNo(1); + translatorRepository.save(translator); + return translatorRepository.save(translator).getTrName(); + } else { + translator.setTranslatorKey(dbTranslator.getTranslatorKey() + 1); + translator.setVersionNo(1); + return translatorRepository.save(translator).getTrName(); + } + + } public List selectTranslatorList(Translator translator) { return translatorMapper.selectTranslatorList(translator); } - public Integer selectTranslatorListCnt(Translator translator) { return translatorMapper.selectTranslatorListCnt(translator); } - public Translator selectTranslatorView(Translator translator) { - return translatorRepository.findById(new TranslatorId(translator.getTranslatorKey(), translator.getVersionNo())).orElse(null); + return translatorRepository.findById(new TranslatorId(translator.getTranslatorKey(), translator.getVersionNo())) + .orElse(null); } @Transactional public void updatetranslatorInfo(Translator translator) { - translator.setVersionNo(translator.getVersionNo()+1); - translatorRepository.save(translator); + Translator dbTranslator = translatorRepository + .findById(new TranslatorId(translator.getTranslatorKey(), translator.getVersionNo())).orElse(null); + Translator translatorTmp = new Translator(); + translatorTmp.setTranslatorKey(dbTranslator.getTranslatorKey()); + translatorTmp.setVersionNo(dbTranslator.getVersionNo() + 1); + translatorTmp.setOgdp1(translator.getOgdp1()); + translatorTmp.setTrLang(translator.getTrLang()); + translatorTmp.setTrCareer(translator.getTrCareer()); + translatorTmp.setTrName(translator.getTrName()); + translatorTmp.setTrSex(translator.getTrSex()); + translatorTmp.setTrPhone(translator.getTrPhone()); + translatorTmp.setTrNny(translator.getTrNny()); + translatorTmp.setTrAge(translator.getTrAge()); + translatorTmp.setTrEdu(translator.getTrEdu()); + translatorTmp.setTrCft(translator.getTrCft()); + translatorTmp.setTrVisa(translator.getTrVisa()); + translatorTmp.setAptDt(translator.getAptDt()); + translatorTmp.setDmlYn(translator.getDmlYn()); + translatorTmp.setRemark(translator.getRemark()); + translatorTmp.setWrtNm(translator.getWrtNm()); + translatorTmp.setWrtDt(LocalDateTime.now()); + translatorTmp.setWrtOrgan(translator.getWrtOrgan()); + translatorRepository.save(translatorTmp); } - } diff --git a/src/main/java/com/dbnt/faisp/translator/model/Translator.java b/src/main/java/com/dbnt/faisp/translator/model/Translator.java index 81684686..faba2c0e 100644 --- a/src/main/java/com/dbnt/faisp/translator/model/Translator.java +++ b/src/main/java/com/dbnt/faisp/translator/model/Translator.java @@ -25,17 +25,17 @@ import java.util.HashSet; import java.util.List; import java.util.Set; + @Getter @Setter @Entity @NoArgsConstructor @DynamicInsert @DynamicUpdate -@Table(name = "translator_info") @IdClass(Translator.TranslatorId.class) +@Table(name = "translator_info") public class Translator extends BaseModel implements Serializable{ @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "translator_key") private Integer translatorKey; @Id @@ -91,10 +91,13 @@ public String toString() { @Data @NoArgsConstructor @AllArgsConstructor -public static class TranslatorId implements Serializable { +public static class TranslatorId implements Serializable { private Integer translatorKey; + private Integer versionNo; } + + } diff --git a/src/main/java/com/dbnt/faisp/translator/repository/TranslatorRepository.java b/src/main/java/com/dbnt/faisp/translator/repository/TranslatorRepository.java index 1f67b838..f0aaa85d 100644 --- a/src/main/java/com/dbnt/faisp/translator/repository/TranslatorRepository.java +++ b/src/main/java/com/dbnt/faisp/translator/repository/TranslatorRepository.java @@ -1,11 +1,17 @@ package com.dbnt.faisp.translator.repository; import com.dbnt.faisp.translator.model.Translator; +import com.dbnt.faisp.userInfo.model.UserInfo; import org.springframework.data.jpa.repository.JpaRepository; +import java.util.Optional; public interface TranslatorRepository extends JpaRepository { + Translator findFirstByOrderByTranslatorKeyDesc(); + + + } diff --git a/src/main/resources/static/js/translator/translator.js b/src/main/resources/static/js/translator/translator.js index 4be0db6b..52ff5529 100644 --- a/src/main/resources/static/js/translator/translator.js +++ b/src/main/resources/static/js/translator/translator.js @@ -30,6 +30,7 @@ $(document).on('click', '#updateBtn', function (){ success : function() { alert("수정되었습니다."); contentFade("out"); + location.reload(); }, error : function(xhr, status) { alert("수정에 실패하였습니다."); @@ -50,11 +51,9 @@ $(document).on('click', '#saveBtn', function (){ processData: false, contentType: false, success : function(result) { - - alert("저장되었습니다.\n담당자 승인 후 로그인 가능합니다.") - + alert("저장되었습니다.") contentFade("out"); - location.reload; + location.reload(); }, error : function(xhr, status) { alert("저장에 실패하였습니다.") diff --git a/src/main/resources/templates/translator/translatorEditModal.html b/src/main/resources/templates/translator/translatorEditModal.html index 51ca864b..b5c9ae89 100644 --- a/src/main/resources/templates/translator/translatorEditModal.html +++ b/src/main/resources/templates/translator/translatorEditModal.html @@ -106,7 +106,7 @@
- +