민간통역인 요청사항 반영

외사분실 요청사항 반영

src/main/java/com/dbnt/faisp/main/translator/model/Translator.java

@@ -75,38 +75,40 @@ public class Translator extends BaseModel implements Serializable{
   private String wrtNm;
   @Column(name = "wrt_dt")
   private LocalDateTime wrtDt;
+  @Column(name = "naturalization")
+  private String naturalization;
 
 
 
   @Transient
   private String excel;
 
-@Embeddable
+  @Embeddable
-@Data
+  @Data
-@NoArgsConstructor
+  @NoArgsConstructor
-@AllArgsConstructor
+  @AllArgsConstructor
-public static class TranslatorId implements Serializable { 	
+  public static class TranslatorId implements Serializable {
     private Integer translatorKey;
 
     private Integer versionNo;
-}
+  }
 
-public Date getInt(String string) {
+  public Date getInt(String string) {
     return null;
-}
+  }
 
-public Date getString(String string) {
+  public Date getString(String string) {
     return null;
-}
+  }
 
-@Override
+  @Override
-public String toString() {
+  public String toString() {
     return "Translator [translatorKey=" + translatorKey + ", versionNo=" + versionNo + ", ogdp1=" + ogdp1 + ", trLang="
         + trLang + ", trCareer=" + trCareer + ", trName=" + trName + ", trSex=" + trSex + ", trPhone=" + trPhone
         + ", trNny=" + trNny + ", trAge=" + trAge + ", trEdu=" + trEdu + ", trCft=" + trCft + ", trVisa=" + trVisa
         + ", aptDt=" + aptDt + ", dmlYn=" + dmlYn + ", remark=" + remark + ", wrtNm=" + wrtNm + ", wrtDt=" + wrtDt
         + ", wrtOrgan=" + wrtOrgan + ", excel=" + excel + "]";
-}
+  }
 
 
 

src/main/resources/static/js/fipTarget/partInfo.js

@@ -28,6 +28,26 @@ $(document).on('change', '#rentType', function (){
   }
 });
 
+$(document).on('change', '#plWorkType', function (){
+  const plPeopleCnt = $("#plPeopleCnt");
+  if(this.value === 'PIS001'){
+    plPeopleCnt.removeAttr("disabled");
+  }else{
+    plPeopleCnt.val('');
+    plPeopleCnt.attr("disabled", "disabled");
+  }
+});
+
+$(document).on('change', '#mpWorkType', function (){
+  const mpPeopleCnt = $("#mpPeopleCnt");
+  if(this.value === 'PIS001'){
+    mpPeopleCnt.removeAttr("disabled");
+  }else{
+    mpPeopleCnt.val('');
+    mpPeopleCnt.attr("disabled", "disabled");
+  }
+});
+
 $(document).on('change', '#utilityType', function (){
   const utilityPrice = $("#utilityPrice");
   if(this.value === 'Y'){
@@ -116,15 +136,15 @@ $(document).on('click', '#savePartInfo', function (){
     $('#terminalNm').focus();
     return false;
   }
-  if($('#mpWorkType').val() != ''){
+  if($('#mpWorkType').val() === 'PIS001'){
-    if($('#mpPeopleCnt').val() == ''){
+    if($('#mpPeopleCnt').val() === ''){
       alert('해경 인원수를 입력해주세요');
       $('#mpPeopleCnt').focus();
       return false;
     }
   }
-  if($('#plWorkType').val() != ''){
+  if($('#plWorkType').val() === 'PIS001'){
-    if($('#plPeopleCnt').val() == ''){
+    if($('#plPeopleCnt').val() === ''){
       alert('육경 인원수를 입력해주세요');
       $('#plPeopleCnt').focus();
       return false;

src/main/resources/static/js/igActivities/fpiMgt/affair/affairMgt.js

@@ -226,7 +226,7 @@ $(document).on('click', '#fileDownBtn', function (){
 })
 
 $(document).on('click', '#printBtn', function (){
-  window.open("http://localhost:8080/affair/print?affairKey="+$(this).attr("data-affairkey"));
+  window.open(location.origin+"/affair/print?affairKey="+$(this).attr("data-affairkey"));
 })
 
 function getAffairViewModal(affairKey){

src/main/resources/static/js/translator/translator.js

@@ -226,10 +226,12 @@ function revisionHistory(trKey,verNo,url){
 }
 
 $(document).on('change', '#trNny', function (){
-	if($(this).val() == "NNY001"){
+  if($(this).val() === "NNY001"){
-		$("#trVisa").attr("disabled",true);
+    $("#trVisa").attr("disabled", "disabled");
+    $("#naturalization").removeAttr("disabled");
   }else{
     $("#trVisa").removeAttr("disabled");
+    $("#naturalization").attr("disabled", "disabled");
   }
 });
 

src/main/resources/templates/fipTarget/partInfoEditModal.html

@@ -79,7 +79,7 @@
           </div>
           <label for="mpPeopleCnt" class="col-sm-2 col-form-label col-form-label-sm text-center">인원수</label>
           <div class="col-sm-2">
-            <input type="number" class="form-control form-control-sm" id="mpPeopleCnt" name="mpPeopleCnt">
+            <input type="number" class="form-control form-control-sm" id="mpPeopleCnt" name="mpPeopleCnt" disabled>
           </div>
         </div>
         <div class="row m-0">
@@ -109,7 +109,7 @@
           </div>
           <label for="plPeopleCnt" class="col-sm-2 col-form-label col-form-label-sm text-center">인원수</label>
           <div class="col-sm-2">
-            <input type="number" class="form-control form-control-sm" id="plPeopleCnt" name="plPeopleCnt">
+            <input type="number" class="form-control form-control-sm" id="plPeopleCnt" name="plPeopleCnt" disabled>
           </div>
         </div>
         <div class="row m-0">

src/main/resources/templates/fipTarget/partInfoModifyModal.html

@@ -92,7 +92,7 @@
             </div>
             <label for="mpPeopleCnt" class="col-sm-2 col-form-label col-form-label-sm text-center">인원수</label>
             <div class="col-sm-2">
-              <input type="number" class="form-control form-control-sm" id="mpPeopleCnt" name="mpPeopleCnt" th:value="${partInfo.mpPeopleCnt}">
+              <input type="number" class="form-control form-control-sm" id="mpPeopleCnt" name="mpPeopleCnt" th:value="${partInfo.mpPeopleCnt}" th:disabled="${partInfo.mpWorkType ne 'PIS001'}">
             </div>
           </div>
           <div class="row m-0">
@@ -122,7 +122,7 @@
             </div>
             <label for="plPeopleCnt" class="col-sm-2 col-form-label col-form-label-sm text-center">인원수</label>
             <div class="col-sm-2">
-              <input type="number" class="form-control form-control-sm" id="plPeopleCnt" name="plPeopleCnt" th:value="${partInfo.plPeopleCnt}">
+              <input type="number" class="form-control form-control-sm" id="plPeopleCnt" name="plPeopleCnt" th:value="${partInfo.plPeopleCnt}" th:disabled="${partInfo.plWorkType ne 'PIS001'}">
             </div>
           </div>
           <div class="row m-0">

src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html

@@ -283,7 +283,7 @@
                 </nav>
               </div>
               <div class="col-auto">
-                <input type="button" class="btn btn-success" value="제출" id="addAffairBtn" th:if="${page eq 'myReport' and accessAuth ne 'ACC001'}">
+                <input type="button" class="btn btn-success" value="견문작성" id="addAffairBtn" th:if="${page eq 'myReport' and accessAuth ne 'ACC001'}">
                 <input type="button" class="btn btn-warning" value="결재" id="tableApprvBtn" th:if="${page eq 'stayReport' and apprvAuth ne null}" th:data-apprvauth="${apprvAuth}">
               </div>
             </div>

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

@@ -262,6 +262,16 @@
                   </th:block>
                 </select>
               </div>
+              <label for="naturalization" class="col-sm-1 col-form-label-sm text-center fs-13 fw-bold">귀화</label>
+              <div class="col-sm-3">
+                <select class="form-select" id="naturalization" name="naturalization" disabled>
+                  <option value="">선택</option>
+                  <option value="O">O</option>
+                  <option value="X">X</option>
+                </select>
+              </div>
+            </div>
+            <div class="row mb-1">
               <label for="trAge" class="col-sm-1 col-form-label-sm text-center fs-13 fw-bold">나이</label>
               <div class="col-sm-3">
                 <input type="text" class="form-control" id="trAge" name="trAge">
@@ -275,18 +285,18 @@
                   </th:block>
                 </select>
               </div>
-            </div>
-            <div class="row mb-1">
               <label for="trCft" class="col-sm-1 col-form-label-sm text-center fs-13 fw-bold">자격증</label>
               <div class="col-sm-3">
                 <input type="text" class="form-control" id="trCft" name="trCft">
               </div>
+            </div>
+            <div class="row mb-1">
               <label for="trVisa" class="col-sm-1 col-form-label-sm text-center fs-13 fw-bold">비자</label>
               <div class="col-sm-3">
                 <select class="form-select" id="trVisa" name="trVisa">
                   <option value="">선택</option>
-                  <th:block th:each="commonCode:${session.commonCode.get('VISA')}">
+                  <th:block th:each="code:${session.commonCode.get('VISA')}">
-                    <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"></option>
+                    <option th:if="${code.useChk eq 'T'}" th:value="${code.itemCd}" th:text="${code.itemValue}"></option>
                   </th:block>
                 </select>
               </div>
@@ -294,8 +304,6 @@
               <div class="col-sm-3">
                 <input type="text" class="form-control" id="aptDt" name="aptDt" readonly>
               </div>
-            </div>
-            <div class="mb-2 row">
               <label for="dmlYn" class="col-sm-1 col-form-label-sm text-center fs-13 fw-bold">해촉</label>
               <div class="col-sm-3">
                 <select class="form-select" id="dmlYn" name="dmlYn">
@@ -304,8 +312,10 @@
                   <option value="X">X</option>
                 </select>
               </div>
+            </div>
+            <div class="mb-2 row">
               <label for="remark" class="col-sm-1 col-form-label-sm text-center fs-13 fw-bold">비고</label>
-              <div class="col-sm-7">
+              <div class="col-sm-11">
                 <input type="text"  class="form-control" id="remark" name="remark">
               </div>
             </div>

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

@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html lang="ko" xmlns:th="http://www.thymeleaf.org">
-       <form id="trInfoUpdate" method="post">
+<form id="trInfoUpdate" method="post">
   <input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
   <input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
   <input type="hidden" class="translatorKey" name="translatorKey" th:value="${trInfo.translatorKey}"/>
@@ -57,11 +57,21 @@
       <div class="col-sm-2">
         <select class="form-select" id="eTrNny" name="trNny">
           <option value="">선택</option>
-                  <th:block th:each="commonCode:${session.commonCode.get('NNY')}">
+          <th:block th:each="code:${session.commonCode.get('NNY')}">
-                    <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd} == ${trInfo.trNny}"></option>
+            <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq trInfo.trNny}"></option>
           </th:block>
         </select>
       </div>
+      <label for="naturalization" class="col-sm-1 col-form-label-sm text-center">귀화</label>
+      <div class="col-sm-2">
+        <select class="form-select" id="naturalization" name="naturalization" th:disabled="${trInfo.trNny ne 'NNY001'}">
+          <option value="">선택</option>
+          <option value="O" th:selected="${trInfo.naturalization eq 'O'}">O</option>
+          <option value="X" th:selected="${trInfo.naturalization eq 'X'}">X</option>
+        </select>
+      </div>
+    </div>
+    <div class="row mb-1">
       <label for="eTrAge" class="col-sm-1 col-form-label-sm text-center">나이</label>
       <div class="col-sm-2">
         <input type="text" class="form-control" id="eTrAge" name="trAge" th:value="${trInfo.trAge}">
@@ -75,18 +85,18 @@
           </th:block>
         </select>
       </div>
-          </div>
-          <div class="row mb-1">
       <label for="eTrCft" class="col-sm-1 col-form-label-sm text-center">자격증</label>
       <div class="col-sm-2">
         <input type="text" class="form-control" id="eTrCft" name="trCft" th:value="${trInfo.trCft}">
       </div>
+    </div>
+    <div class="row mb-1">
       <label for="eTrVisa" class="col-sm-1 col-form-label-sm text-center">비자</label>
       <div class="col-sm-2">
         <select class="form-select" id="eTrVisa" name="trVisa">
           <option value="">선택</option>
-                  <th:block th:each="commonCode:${session.commonCode.get('VISA')}">
+          <th:block th:each="code:${session.commonCode.get('VISA')}">
-                    <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd} == ${trInfo.trVisa}"></option>
+            <option th:if="${code.useChk eq 'T' or code.itemCd eq trInfo.trVisa}" th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq trInfo.trVisa}"></option>
           </th:block>
         </select>
       </div>
@@ -94,8 +104,6 @@
       <div class="col-sm-2">
         <input type="text" class="form-control" id="viewAptDt" name="aptDt" th:value="${trInfo.aptDt}" readonly>
       </div>
-          </div>
-          <div class="mb-2 row">
       <label for="eDmlYn" class="col-sm-1 col-form-label-sm text-center">해촉</label>
       <div class="col-sm-2">
         <select class="form-select" id="eDmlYn" name="dmlYn">
@@ -104,8 +112,10 @@
           <option value="X" th:selected="'X' == ${trInfo.dmlYn}">X</option>
         </select>
       </div>
+    </div>
+    <div class="mb-2 row">
       <label for="eRemark" class="col-sm-1 col-form-label-sm text-center">비고</label>
-              <div class="col-sm-5">
+      <div class="col-sm-8">
         <input type="text" class="form-control" id="eRemark" name="remark" th:text="${trInfo.remark}">
       </div>
     </div>
@@ -114,6 +124,6 @@
     <button type="button" class="btn btn-secondary" id="trDeleteBtn" th:if="${accessAuth eq 'ACC003'} or ${wrtUserSeq eq userSeq}">해임</button>
     <button type="button" class="btn btn-warning" id="updateBtn" th:if="${accessAuth eq 'ACC003'} or ${wrtUserSeq eq userSeq}">수정</button>
   </div>
-         </form>
+</form>
 
 </html>