diff --git a/src/main/java/com/dbnt/faisp/controller/TranslatorController.java b/src/main/java/com/dbnt/faisp/controller/TranslatorController.java index 8a9185d3..11976aaf 100644 --- a/src/main/java/com/dbnt/faisp/controller/TranslatorController.java +++ b/src/main/java/com/dbnt/faisp/controller/TranslatorController.java @@ -63,5 +63,19 @@ public class TranslatorController { translator.setWrtOrgan(loginUser.getOgCd()); translatorSevice.updatetranslatorInfo(translator); } + + @GetMapping("/revisionHistory") + public ModelAndView revisionHistory(Translator translator){ + ModelAndView mav = new ModelAndView("translator/translatorHistory"); + mav.addObject("HistoryList", translatorSevice.selectHistoryList(translator)); + return mav; + } + + @GetMapping("/HistoryView") + @ResponseBody + public Translator HistoryView(Translator translator){ + + return translatorSevice.HistoryView(translator); + } } diff --git a/src/main/java/com/dbnt/faisp/translator/TranslatorService.java b/src/main/java/com/dbnt/faisp/translator/TranslatorService.java index 394b8e9c..27ebdae0 100644 --- a/src/main/java/com/dbnt/faisp/translator/TranslatorService.java +++ b/src/main/java/com/dbnt/faisp/translator/TranslatorService.java @@ -81,4 +81,12 @@ public class TranslatorService { translatorRepository.save(translatorTmp); } + public List selectHistoryList(Translator translator) { + return translatorMapper.selectHistoryList(translator); + } + + public Translator HistoryView(Translator translator) { + return translatorMapper.HistoryView(translator); + } + } diff --git a/src/main/java/com/dbnt/faisp/translator/mapper/TranslatorMapper.java b/src/main/java/com/dbnt/faisp/translator/mapper/TranslatorMapper.java index e2d27566..bcaa74b6 100644 --- a/src/main/java/com/dbnt/faisp/translator/mapper/TranslatorMapper.java +++ b/src/main/java/com/dbnt/faisp/translator/mapper/TranslatorMapper.java @@ -13,4 +13,8 @@ public interface TranslatorMapper { Integer selectTranslatorListCnt(Translator translator); + List selectHistoryList(Translator translator); + + Translator HistoryView(Translator translator); + } 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 faba2c0e..e128318b 100644 --- a/src/main/java/com/dbnt/faisp/translator/model/Translator.java +++ b/src/main/java/com/dbnt/faisp/translator/model/Translator.java @@ -12,6 +12,7 @@ import lombok.NoArgsConstructor; import lombok.Setter; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.springframework.format.annotation.DateTimeFormat; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; @@ -19,6 +20,7 @@ import org.springframework.security.core.userdetails.UserDetails; import javax.persistence.*; import java.io.Serializable; +import java.time.LocalDate; import java.time.LocalDateTime; import java.util.Collection; import java.util.HashSet; @@ -64,7 +66,8 @@ public class Translator extends BaseModel implements Serializable{ @Column(name = "tr_visa") private String trVisa; @Column(name = "apt_dt") - private String aptDt; + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate aptDt; @Column(name = "dml_yn") private String dmlYn; @Column(name = "remark") diff --git a/src/main/resources/mybatisMapper/TranslatorMapper.xml b/src/main/resources/mybatisMapper/TranslatorMapper.xml index 9137bd57..dd06e0ec 100644 --- a/src/main/resources/mybatisMapper/TranslatorMapper.xml +++ b/src/main/resources/mybatisMapper/TranslatorMapper.xml @@ -75,5 +75,43 @@ ) a + + + + \ No newline at end of file diff --git a/src/main/resources/static/js/translator/translator.js b/src/main/resources/static/js/translator/translator.js index 52ff5529..e5e3d1bf 100644 --- a/src/main/resources/static/js/translator/translator.js +++ b/src/main/resources/static/js/translator/translator.js @@ -1,20 +1,14 @@ $(document).on('click', '.userInfoTr', function (){ - $.ajax({ - url: '/translator/translatorEditModal', - data: { - translatorKey: Number($(this).find(".trKey").val()), - versionNo : Number($(this).find(".verNo").val()) - }, - type: 'GET', - dataType:"html", - success: function(html){ - $("#configInfo").empty().append(html) - $("#translatorEditModal").modal('show'); - }, - error:function(){ - - } - }); + document.getElementById('accessTab').classList.add('active'); + document.getElementById('approvalTab').classList.remove('active'); + const trKey = (Number($(this).find(".trKey").val())); + const verNo = (Number($(this).find(".verNo").val())); + const url = '/translator/translatorEditModal'; + revisionHistory(trKey,verNo,url); + var html=""; + html += ''; + html += ''; + $("#KeyValue").empty().html(html) }) $(document).on('click', '#updateBtn', function (){ @@ -118,4 +112,88 @@ function valueCheck(form){ returnFlag = false; } return returnFlag; -} \ No newline at end of file +} + +$(document).on('click', '.historyInfoTr', function (){ + $.ajax({ + url: '/translator/HistoryView', + data: { + translatorKey: Number($(this).find(".trKey").val()), + versionNo : Number($(this).find(".verNo").val()) + }, + type: 'GET', + dataType:"json", + success: function(data){ + $("#ogdp1V").val(data.ogdp1); + $("#trLangV").val(data.trLang); + $("#trCareerV").val(data.trCareer); + $("#trNameV").val(data.trName); + $("#trSexV").val(data.trSex); + $("#trPhoneV").val(data.trPhone); + $("#trNnyV").val(data.trNny); + $("#trAgeV").val(data.trAge); + $("#trVisaV").val(data.trVisa); + $("#trEduV").val(data.trEdu); + $("#trCftV").val(data.trCft); + $("#aptDtV").val(data.aptDt); + $("#dmlYnV").val(data.dmlYn); + $("#remarkV").val(data.remark); + // $("#configInfo").empty().append(html) + // $("#translatorEditModal").modal('show'); + }, + error:function(){ + + } + }); +}) +$(document).ready( function() { + $("#aptDt").datepicker({ + format: "yyyy-mm-dd", + language: "ko" + }); +}); + +$(document).on('click', '#approvalTab', function (){ + const trKey = (Number($('.tapTrKey').val())); + const verNo = (Number($('.tapVerNo').val())); + const url = '/translator/revisionHistory'; + revisionHistory(trKey,verNo,url); + document.getElementById('accessTab').classList.remove('active'); + document.getElementById('approvalTab').classList.add('active'); +}) + +$(document).on('click', '#accessTab', function (){ + const trKey = (Number($('.tapTrKey').val())); + const verNo = (Number($('.tapVerNo').val())); + const url = '/translator/translatorEditModal'; + revisionHistory(trKey,verNo,url); + document.getElementById('approvalTab').classList.remove('active'); + document.getElementById('accessTab').classList.add('active'); +}) + +function revisionHistory(trKey,verNo,url){ + $.ajax({ + url: url, + data: { + translatorKey: trKey, + versionNo : verNo + }, + type: 'GET', + dataType:"html", + success: function(html){ + $("#configInfo").empty().append(html) + $("#translatorEditModal").modal('show'); + }, + error:function(){ + + } + }); +} + +$(document).on('change', '#trNny', function (){ + if($(this).val() == "NNY001"){ + $("#trVisa").attr("disabled",true); + }else{ + $("#trVisa").removeAttr("disabled"); + } +}); diff --git a/src/main/resources/templates/translator/translator.html b/src/main/resources/templates/translator/translator.html index 3f08c9f9..0ad5e27b 100644 --- a/src/main/resources/templates/translator/translator.html +++ b/src/main/resources/templates/translator/translator.html @@ -91,17 +91,12 @@ - - O - - - X - + - + ● - + @@ -206,7 +201,7 @@
- @@ -234,7 +229,7 @@
- @@ -243,15 +238,15 @@
- +
@@ -275,12 +270,15 @@