fix:민간통역인 수정기능

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);

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<Translator> 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);
 	}
 
-  
 }

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;
 }
 
 
+
+
 }

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, Translator.TranslatorId> {
 
+	Translator findFirstByOrderByTranslatorKeyDesc();
+
+
+
 
 }

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("저장에 실패하였습니다.")

src/main/resources/templates/translator/translatorEditModal.html

@@ -106,7 +106,7 @@
             <div class="mb-3 row">
               <label for="tel" class="col-sm-2 col-form-label text-center">비고</label>
               <div class="col-sm-4">
-                <textarea  class="form-control" id="remark" th:text="${trInfo.remark}"></textarea>
+                <textarea  class="form-control" id="remark" name="remark" th:text="${trInfo.remark}"></textarea>
               </div>
               
             </div>