회원가입 양식 수정.

src/main/java/com/dbnt/faisp/kwms/KwmsController.java

@@ -46,6 +46,7 @@ public class KwmsController {
           mav.addObject("outturnList", codeMgtService.selectCodeMgtList("OTC"));
           mav.addObject("seriesList", codeMgtService.selectCodeMgtList(userInfo.getOutturnCd()));
           mav.addObject("languageList", codeMgtService.selectCodeMgtList("LNG"));
+          mav.addObject("eduGrdList", codeMgtService.selectCodeMgtList("EDU"));
         }
       }else{
         if(savedUser.getUserStatus().equals("USC004")){
@@ -60,6 +61,7 @@ public class KwmsController {
           mav.addObject("outturnList", codeMgtService.selectCodeMgtList("OTC"));
           mav.addObject("seriesList", codeMgtService.selectCodeMgtList(userInfo.getOutturnCd()));
           mav.addObject("languageList", codeMgtService.selectCodeMgtList("LNG"));
+          mav.addObject("eduGrdList", codeMgtService.selectCodeMgtList("EDU"));
         }else{
           mav.addObject("joinFlag", "F");
           mav.addObject("userInfo", empInfo);

src/main/java/com/dbnt/faisp/main/userInfo/model/UserInfo.java

@@ -101,6 +101,16 @@ public class UserInfo extends BaseModel implements UserDetails{
   private LocalDate titleInDate;
   @Column(name = "duty_cd")
   private String dutyCd;
+  @Column(name = "use_language")
+  private String useLanguage;
+  @Column(name = "language_grd")
+  private String languageGrd;
+  @Column(name = "education_grd")
+  private String educationGrd;
+  @Column(name = "school")
+  private String school;
+  @Column(name = "specialism")
+  private String specialism;
 
   @Transient
   private String modifyPassword;

src/main/java/com/dbnt/faisp/main/userInfo/model/UserInfoHistory.java

@@ -107,9 +107,16 @@ public class UserInfoHistory extends BaseModel implements Serializable{
   private LocalDateTime wrtDt;
   @Column(name = "duty_cd")
   private String dutyCd;
-
+  @Column(name = "use_language")
-
+  private String useLanguage;
-
+  @Column(name = "language_grd")
+  private String languageGrd;
+  @Column(name = "education_grd")
+  private String educationGrd;
+  @Column(name = "school")
+  private String school;
+  @Column(name = "specialism")
+  private String specialism;
 
 
   @Embeddable

src/main/resources/templates/adminPage/userMgt/userEditModal.html

@@ -30,18 +30,17 @@
     <div class="mb-3 mt-3 row">
       <label for="dicCode" class="col-sm-2 col-form-label col-form-label-sm text-center ">디지털식별코드</label>
       <div class="col-sm-4">
-        <input type="text" class="form-control form-control-sm" id="dicCode" name="dicCode" autocomplete="off" th:value="${userInfo.dicCode}">
+        <input type="text" class="form-control form-control-sm" id="dicCode" name="dicCode" autocomplete="off" th:value="${userInfo.dicCode}" th:disabled="${!#strings.isEmpty(userInfo.dicCode)}">
       </div>
     </div>
     <div class="row mb-1">
       <label for="userId" class="col-sm-2 col-form-label col-form-label-sm text-center ">아이디</label>
       <div class="col-sm-4">
-        <input type="text" class="form-control form-control-sm" id="userId" name="userId" autocomplete="off" th:value="${userInfo.userId}" readonly>
+        <input type="text" class="form-control form-control-sm" id="userId" name="userId" autocomplete="off" th:value="${userInfo.userId}" th:disabled="${!#strings.isEmpty(userInfo.dicCode)}">
-        <label for="userId" style="font-size: 12px">아이디는 수정할 수 없습니다.</label>
       </div>
       <label for="userNm" class="col-sm-2 col-form-label col-form-label-sm text-center">이름</label>
       <div class="col-sm-4">
-        <input type="text" class=" form-control form-control-sm" id="userNm" name="userNm" autocomplete="off" th:value="${userInfo.userNm}">
+        <input type="text" class=" form-control form-control-sm" id="userNm" name="userNm" autocomplete="off" th:value="${userInfo.userNm}" th:disabled="${!#strings.isEmpty(userInfo.dicCode)}">
       </div>
     </div>
     <div class="row mb-1">
@@ -68,7 +67,7 @@
     <div class="row mb-1">
       <label for="sex" class="col-sm-2 col-form-label col-form-label-sm text-center">성별</label>
       <div class="col-sm-4">
-        <select class="form-select form-select-sm" id="sex" name="sex">
+        <select class="form-select form-select-sm" id="sex" name="sex" th:disabled="${!#strings.isEmpty(userInfo.dicCode)}">
           <option value="SEX002" th:selected="${userInfo.sex eq 'SEX002'}">남</option>
           <option value="SEX001" th:selected="${userInfo.sex eq 'SEX001'}">여</option>
         </select>
@@ -77,17 +76,17 @@
     <div class="row mb-1">
       <label for="birthDate" class="col-sm-2 col-form-label col-form-label-sm text-center">생년월일</label>
       <div class="col-sm-4">
-        <input type="text" class="form-control form-control-sm dateSelector" id="birthDate" name="birthDate" th:value="${userInfo.birthDate}" readonly>
+        <input type="text" class="form-control form-control-sm dateSelector" id="birthDate" name="birthDate" th:value="${userInfo.birthDate}" th:disabled="${!#strings.isEmpty(userInfo.dicCode)}">
       </div>
       <label for="policeInDate" class="col-sm-2 col-form-label col-form-label-sm text-center">해양경찰배명일</label>
       <div class="col-sm-4">
-        <input type="text" class="form-control form-control-sm dateSelector" id="policeInDate" name="policeInDate" th:value="${userInfo.policeInDate}" readonly>
+        <input type="text" class="form-control form-control-sm dateSelector" id="policeInDate" name="policeInDate" th:value="${userInfo.policeInDate}" th:disabled="${!#strings.isEmpty(userInfo.dicCode)}">
       </div>
     </div>
     <div class="row mb-1">
       <label for="ogCd" class="col-sm-2 col-form-label col-form-label-sm text-center">관서</label>
       <div class="col-sm-4">
-        <select class="form-select form-select-sm" id="ogCd" name="ogCd">
+        <select class="form-select form-select-sm" id="ogCd" name="ogCd" th:disabled="${!#strings.isEmpty(userInfo.dicCode)}">
           <option value="">--선택--</option>
           <th:block th:each="code:${ogList}">
             <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq userInfo.ogCd}"></option>
@@ -102,7 +101,7 @@
     <div class="row mb-1">
       <label for="ofcCd" class="col-sm-2 col-form-label col-form-label-sm text-center">부서</label>
       <div class="col-sm-4">
-        <select class="form-select form-select-sm" id="ofcCd" name="ofcCd">
+        <select class="form-select form-select-sm" id="ofcCd" name="ofcCd" th:disabled="${!#strings.isEmpty(userInfo.dicCode)}">
           <option value="">--선택--</option>
           <th:block th:each="code:${ofcList}">
             <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq userInfo.ofcCd}"></option>
@@ -111,13 +110,13 @@
       </div>
       <label for="ofcInDate" class="col-sm-2 col-form-label col-form-label-sm text-center">현부서임용일</label>
       <div class="col-sm-4">
-        <input type="text" class="form-control form-control-sm dateSelector" id="ofcInDate" name="ofcInDate" th:value="${userInfo.ofcInDate}" readonly>
+        <input type="text" class="form-control form-control-sm dateSelector" id="ofcInDate" name="ofcInDate" th:value="${userInfo.ofcInDate}" th:disabled="${!#strings.isEmpty(userInfo.dicCode)}">
       </div>
     </div>
     <div class="row mb-1">
       <label for="ogCd" class="col-sm-2 col-form-label col-form-label-sm text-center">계급</label>
       <div class="col-sm-4">
-        <select class="form-select form-select-sm" id="titleCd" name="titleCd">
+        <select class="form-select form-select-sm" id="titleCd" name="titleCd" th:disabled="${!#strings.isEmpty(userInfo.dicCode)}">
           <option value="">--선택--</option>
           <th:block th:each="code:${titleList}">
             <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq userInfo.titleCd}"></option>
@@ -126,7 +125,7 @@
       </div>
       <label for="titleInDate" class="col-sm-2 col-form-label col-form-label-sm text-center">현계급임용일</label>
       <div class="col-sm-4">
-        <input type="text" class="form-control form-control-sm dateSelector" id="titleInDate" name="titleInDate" th:value="${userInfo.titleInDate}" readonly>
+        <input type="text" class="form-control form-control-sm dateSelector" id="titleInDate" name="titleInDate" th:value="${userInfo.titleInDate}" th:disabled="${!#strings.isEmpty(userInfo.dicCode)}">
       </div>
     </div>
     <div class="row mb-1">
@@ -145,7 +144,7 @@
     <div class="row mb-1">
       <label for="outturnCd" class="col-sm-2 col-form-label col-form-label-sm text-center">경과</label>
       <div class="col-sm-4">
-        <select class="form-select form-select-sm" id="outturnCd" name="outturnCd">
+        <select class="form-select form-select-sm" id="outturnCd" name="outturnCd" th:disabled="${!#strings.isEmpty(userInfo.dicCode)}">
           <option value="">--선택--</option>
           <th:block th:each="code:${outturnList}">
             <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq userInfo.outturnCd}"></option>

src/main/resources/templates/login/joinForm.html

@@ -20,69 +20,68 @@
   <div class="modal-body" th:if="${joinFlag eq 'T'}">
     <form id="userInfoInsert" action="#" th:action="@{/admin/insertUserInfo}" method="post">
       <input type="hidden" name="userSeq" th:value="${userInfo.userSeq}">
-      <div class="mb-3 mt-3 row">
+      <div class="mb-1 mt-3 row">
         <label for="dicCode" class="col-sm-2 col-form-label col-form-label-sm text-center ">디지털식별코드</label>
-        <div class="col-sm-3">
+        <div class="col-sm-2">
           <input type="text" class="form-control form-control-sm" id="dicCode" name="dicCode" autocomplete="off" th:value="${userInfo.dicCode}" disabled>
         </div>
         <!--<button type="button" class="btn btn-sm btn-outline-primary col-sm-1" id="dicCodeSearchBtn">검색</button>-->
       </div>
       <div class="row mb-1">
         <label for="userId" class="col-sm-2 col-form-label col-form-label-sm text-center ">아이디</label>
-        <div class="col-sm-4">
+        <div class="col-sm-2">
           <input type="text" class="form-control form-control-sm" id="userId" name="userId" autocomplete="new-password" th:value="${userInfo.userId}" disabled>
           <!--<label for="userId" style="font-size: 12px">6~20자 사이의 알파벳, 숫자를 입력하세요</label>-->
         </div>
         <label for="userNm" class="col-sm-2 col-form-label col-form-label-sm text-center">이름</label>
-        <div class="col-sm-4">
+        <div class="col-sm-2">
           <input type="text" class=" form-control form-control-sm" id="userNm" name="userNm" autocomplete="off" th:value="${userInfo.userNm}" disabled>
         </div>
       </div>
-      <div class="row mb-1">
+      <div class="row">
         <label for="modalPassword" class="col-sm-2 col-form-label col-form-label-sm text-center">비밀번호</label>
-        <div class="col-sm-4">
+        <div class="col-sm-2">
           <input type="password" class="form-control form-control-sm" id="modalPassword" name="password" autocomplete="new-password">
-          <label for="userId" style="font-size: 12px">8~16자 사이의 알파벳, 숫자, 특수문자 조합</label>
         </div>
         <label for="passwordConfirm" class="col-sm-2 col-form-label col-form-label-sm text-center">비밀번호 확인</label>
-        <div class="col-sm-4">
+        <div class="col-sm-2">
           <input type="password" class="form-control form-control-sm" id="passwordConfirm">
         </div>
       </div>
       <div class="row mb-1">
-        <label for="phoneNo" class="col-sm-2 col-form-label col-form-label-sm text-center">휴대전화</label>
+        <div class="col-sm-2"></div>
-        <div class="col-sm-4">
+        <label for="modalPassword" class="col-sm-4 col-form-label col-form-label-sm" style="font-size: 12px">8~16자 사이의 알파벳, 숫자, 특수문자 조합</label>
-          <input type="tel" class="form-control form-control-sm" id="phoneNo" name="phoneNo">
-          <label for="userId" style="font-size: 12px">-없이 숫자만 입력</label>
-        </div>
-        <label for="email" class="col-sm-2 col-form-label col-form-label-sm text-center">이메일</label>
-        <div class="col-sm-4">
-          <input type="email" class="form-control form-control-sm" id="email" name="email">
-
-        </div>
       </div>
-      <div class="row mb-1">
+      <div class="row">
         <label for="sex" class="col-sm-2 col-form-label col-form-label-sm text-center">성별</label>
-        <div class="col-sm-4">
+        <div class="col-sm-2">
           <select class="form-select form-select-sm" id="sex" name="sex" disabled>
             <option value="SEX002" th:selected="${userInfo.sex eq 'M'}">남</option>
             <option value="SEX001" th:selected="${userInfo.sex eq 'F'}">여</option>
           </select>
         </div>
+        <label for="phoneNo" class="col-sm-2 col-form-label col-form-label-sm text-center">휴대전화</label>
+        <div class="col-sm-2">
+          <input type="tel" class="form-control form-control-sm" id="phoneNo" name="phoneNo" placeholder="-없이 숫자만 입력">
+        </div>
+        <label for="email" class="col-sm-2 col-form-label col-form-label-sm text-center">이메일</label>
+        <div class="col-sm-2">
+          <input type="email" class="form-control form-control-sm" id="email" name="email">
+        </div>
       </div>
       <div class="row mb-1">
         <label for="birthDate" class="col-sm-2 col-form-label col-form-label-sm text-center">생년월일</label>
-        <div class="col-sm-4">
+        <div class="col-sm-2">
           <input type="text" class="form-control form-control-sm dateSelector" id="birthDate" name="birthDate" th:value="${userInfo.birthDate}" disabled>
         </div>
         <label for="policeInDate" class="col-sm-2 col-form-label col-form-label-sm text-center">해양경찰배명일</label>
-        <div class="col-sm-4">
+        <div class="col-sm-2">
           <input type="text" class="form-control form-control-sm dateSelector" id="policeInDate" name="policeInDate" th:value="${userInfo.policeInDate}" disabled>
         </div>
       </div>
       <div class="row mb-1">
         <label for="ogCd" class="col-sm-2 col-form-label col-form-label-sm text-center">관서</label>
-        <div class="col-sm-4">
+        <div class="col-sm-2">
           <select class="form-select form-select-sm" id="ogCd" name="ogCd" disabled>
             <option value="">--선택--</option>
             <th:block th:each="code:${ogList}">
@@ -91,13 +90,13 @@
           </select>
         </div>
         <label for="organInDate" class="col-sm-2 col-form-label col-form-label-sm text-center">현관서전입일</label>
-        <div class="col-sm-4">
+        <div class="col-sm-2">
           <input type="text" class="form-control form-control-sm dateSelector" id="organInDate" name="organInDate" th:value="${userInfo.organInDate}" readonly>
         </div>
       </div>
       <div class="row mb-1">
         <label for="ofcCd" class="col-sm-2 col-form-label col-form-label-sm text-center">부서</label>
-        <div class="col-sm-4">
+        <div class="col-sm-2">
           <select class="form-select form-select-sm" id="ofcCd" name="ofcCd" disabled>
             <option value="">--선택--</option>
             <th:block th:each="code:${ofcList}">
@@ -106,13 +105,13 @@
           </select>
         </div>
         <label for="ofcInDate" class="col-sm-2 col-form-label col-form-label-sm text-center">현부서임용일</label>
-        <div class="col-sm-4">
+        <div class="col-sm-2">
           <input type="text" class="form-control form-control-sm dateSelector" id="ofcInDate" name="ofcInDate" th:value="${userInfo.ofcInDate}" disabled>
         </div>
       </div>
       <div class="row mb-1">
         <label for="ogCd" class="col-sm-2 col-form-label col-form-label-sm text-center">계급</label>
-        <div class="col-sm-4">
+        <div class="col-sm-2">
           <select class="form-select form-select-sm" id="titleCd" name="titleCd" disabled>
             <option value="">--선택--</option>
             <th:block th:each="code:${titleList}">
@@ -121,13 +120,13 @@
           </select>
         </div>
         <label for="titleInDate" class="col-sm-2 col-form-label col-form-label-sm text-center">현계급임용일</label>
-        <div class="col-sm-4">
+        <div class="col-sm-2">
           <input type="text" class="form-control form-control-sm dateSelector" id="titleInDate" name="titleInDate" th:value="${userInfo.titleInDate}" disabled>
         </div>
       </div>
       <div class="row mb-1">
         <label for="dutyCd" class="col-sm-2 col-form-label col-form-label-sm text-center">직책</label>
-        <div class="col-sm-4">
+        <div class="col-sm-2">
           <select class="form-select form-select-sm" id="dutyCd" name="dutyCd">
             <option value="">--선택--</option>
             <th:block th:each="code:${dutyList}">
@@ -135,11 +134,9 @@
             </th:block>
           </select>
         </div>
-      </div>
-      <div class="row mb-1">
         <label for="outturnCd" class="col-sm-2 col-form-label col-form-label-sm text-center">경과</label>
-        <div class="col-sm-4">
+        <div class="col-sm-2">
-          <select class="form-select form-select-sm" id="outturnCd" name="outturnCd" disabled>
+          <select class="form-select form-select-sm" id="outturnCd" name="outturnCd" th:disabled="${userInfo.outturnCd ne null}">
             <option value="">--선택--</option>
             <th:block th:each="code:${outturnList}">
               <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq userInfo.outturnCd}"></option>
@@ -147,25 +144,57 @@
           </select>
         </div>
         <label for="seriesCd" class="col-sm-2 col-form-label col-form-label-sm text-center">직별</label>
-        <div class="col-sm-4">
+        <div class="col-sm-2">
           <select class="form-select form-select-sm" id="seriesCd" name="seriesCd" th:disabled="${userInfo.outturnCd eq null}">
             <option value="">--선택--</option>
             <th:block th:each="code:${seriesList}">
-              <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq userInfo.seriesCd}"></option>
+              <option th:value="${code.itemCd}" th:text="${code.itemValue}"></option>
             </th:block>
           </select>
         </div>
       </div>
       <div class="row mb-1">
-        <label for="languageCd" class="col-sm-2 col-form-label col-form-label-sm text-center">외국어특채</label>
+        <label for="languageCd" class="col-sm-2 col-form-label col-form-label-sm text-center">외국어특채 여부</label>
-        <div class="col-sm-4">
+        <div class="col-sm-2">
           <select class="form-select form-select-sm" id="languageCd" name="languageCd">
             <option value="">해당없음</option>
             <th:block th:each="code:${languageList}">
-              <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq userInfo.groupCd}"></option>
+              <option th:value="${code.itemCd}" th:text="${code.itemValue}"></option>
             </th:block>
           </select>
         </div>
+        <label for="languageCd" class="col-sm-2 col-form-label col-form-label-sm text-center">구사 외국어</label>
+        <div class="col-sm-2">
+          <input type="text" class="form-control form-control-sm" name="useLanguage">
+        </div>
+        <label for="languageCd" class="col-sm-2 col-form-label col-form-label-sm text-center">수준</label>
+        <div class="col-sm-2">
+          <select class="form-select form-select-sm" name="languageGrd">
+            <option value="">해당없음</option>
+            <option value="1">상</option>
+            <option value="2">중</option>
+            <option value="3">하</option>
+          </select>
+        </div>
+      </div>
+      <div class="row mb-1">
+        <label for="languageCd" class="col-sm-2 col-form-label col-form-label-sm text-center">학력사항</label>
+        <div class="col-sm-2">
+          <select class="form-select form-select-sm" name="educationGrd">
+            <option value="">해당없음</option>
+            <th:block th:each="code:${eduGrdList}">
+              <option th:value="${code.itemCd}" th:text="${code.itemValue}"></option>
+            </th:block>
+          </select>
+        </div>
+        <label for="languageCd" class="col-sm-2 col-form-label col-form-label-sm text-center">학교</label>
+        <div class="col-sm-2">
+          <input type="text" class="form-control form-control-sm" name="school">
+        </div>
+        <label for="languageCd" class="col-sm-2 col-form-label col-form-label-sm text-center">전공</label>
+        <div class="col-sm-2">
+          <input type="text" class="form-control form-control-sm" name="specialism">
+        </div>
       </div>
     </form>
   </div>