Merge pull request #155 from Bamdoliro/perf/#152

[개선] 접수증 양식 변경
Bamdoliro · Oct 13, 2024 · f7d4f99 · f7d4f99
2 parents d835b71 + c2df8f6
commit f7d4f99
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/main/java/com/bamdoliro/maru/presentation/form/FormController.java b/src/main/java/com/bamdoliro/maru/presentation/form/FormController.java
@@ -225,7 +225,7 @@ public ResponseEntity<Resource> generateAdmissionTicket(
     }
 
     @GetMapping("/proof-of-application")
-    public ResponseEntity<Resource> generateProfOfApplication(
+    public ResponseEntity<Resource> generateProofOfApplication(
             @AuthenticationPrincipal(authority = Authority.USER) User user
     ) {
         return ResponseEntity.ok()

diff --git a/src/main/resources/templates/proof-of-application.html b/src/main/resources/templates/proof-of-application.html
@@ -123,7 +123,7 @@
                 </td>
             </tr>
             <tr>
-                <td class="ba center" style="width: 33%" rowspan="5">
+                <td class="ba center" style="width: 33%" rowspan="6">
                     <img
                             th:src="${identificationPictureUri}"
                             alt="증명사진"/>
@@ -133,7 +133,12 @@
             </tr>
             <tr>
                 <th scope="row" class="ba">전형구분</th>
-                <td class="ba" th:text="${form.type.getCategory().description}"></td>
+                <td class="ba" th:text="${form.type.getMainCategory().description}"></td>
+            </tr>
+            <tr>
+                <th scope="row" class="ba">대상구분</th>
+                <td class="ba" th:unless="${form.type.isNationalVeteransEducation()}" th:text="${form.type.getDescription()}"></td>
+                <td class="ba" th:if="${form.type.isNationalVeteransEducation()}">국가보훈대상자</td>
             </tr>
             <tr>
                 <th scope="row" class="ba">생년월일</th>