From 14f58a2434b4e610449c56bbd8649f33839e9e55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=9A=B0=EC=84=B1?= Date: Mon, 16 Jun 2025 17:27:55 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EC=9E=90=EB=8F=99=EC=9D=B4=EC=B2=B4=20?= =?UTF-8?q?=EA=B8=B0=EB=B3=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapters/web/GetBanksUIController.java | 36 ++++++++++++------- .../main/resources/messages/uri.properties | 5 +++ .../resources/templates/info/bank/banks.html | 23 ++++++++++-- 3 files changed, 49 insertions(+), 15 deletions(-) diff --git a/front/src/main/java/app/module/front/usecase/info/bankUI/getBanksUI/adapters/web/GetBanksUIController.java b/front/src/main/java/app/module/front/usecase/info/bankUI/getBanksUI/adapters/web/GetBanksUIController.java index 067b01d0..11fd9c68 100644 --- a/front/src/main/java/app/module/front/usecase/info/bankUI/getBanksUI/adapters/web/GetBanksUIController.java +++ b/front/src/main/java/app/module/front/usecase/info/bankUI/getBanksUI/adapters/web/GetBanksUIController.java @@ -10,12 +10,14 @@ import app.module.front.usecase.info.monthly.getMonthlyInputStatuss.ports.applic import app.module.front.usecase.info.monthly.getMonthlyInputStatuss.ports.application.domain.GetMonthlyInputStatussCmd; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; import org.springframework.data.web.PageableDefault; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import java.time.LocalDate; import java.time.format.DateTimeFormatter; @@ -28,35 +30,45 @@ class GetBanksUIController { private final GetMonthlyInputStatussPortIn portIn; - @GetMapping(path = "/info/bank") - String operate(Model model, - @PageableDefault(sort = "month", direction = Sort.Direction.DESC, page = 0, size = 13) Pageable pageable - ) { + @GetMapping(path = "/info/bank/{currentMonth}") + String operateMonth(Model model, @PathVariable String currentMonth) { + + Pageable pageable = PageRequest.of( + 0, + 13, + Sort.by(Sort.Direction.DESC, "month") + ); - //TODO 사양 결정이 아직 안되 리스트 가져오는것과 오늘 날짜로 가져오는것 둘다 Page list = portIn.operate( pageable, new GetMonthlyInputStatussCmd( null, null, AuthUtil.getUserSeq())); + model.addAttribute("list", list); - - String currentMonth = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM")); - - GetMonthlyInputStatuss matched = list.getContent().stream() + GetMonthlyInputStatuss monthStatus = list.getContent().stream() .filter(item -> currentMonth.equals(item.getMonth())) .findFirst() .orElseThrow(() -> new NoSuchElementException("해당 월의 데이터가 없습니다.")); - - - + model.addAttribute("monthStatus", monthStatus); // TODO 페키지명이 넘무 길어서 그냥 model.addAttribute("MonthStatus", MonthStatus.class); return "info/bank/banks"; } + + + + @GetMapping(path = "/info/bank") + String operate() { + + String currentMonth = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM")); + + return "redirect:/info/bank/" + currentMonth; + + } } \ No newline at end of file diff --git a/front/src/main/resources/messages/uri.properties b/front/src/main/resources/messages/uri.properties index b1abe7cc..565797b1 100644 --- a/front/src/main/resources/messages/uri.properties +++ b/front/src/main/resources/messages/uri.properties @@ -25,6 +25,11 @@ uri.front.info.monthly.path=/info/monthly uri.front.info.monthly.create.{{pathVar}}=\uC784\uC0B0\uBB3C \uD604\uD669 uri.front.info.bank=\uC740\uD589 \uC790\uB3D9\uC774\uCCB4 \uB0B4\uC5ED uri.front.info.bank.path=/info/bank +uri.front.info.bank.{{pathVar}}=\uC740\uD589 \uC790\uB3D9\uC774\uCCB4 \uB0B4\uC5ED +uri.front.info.bank.create.input.{{pathVar}}=\uC740\uD589 \uC790\uB3D9\uC774\uCCB4 \uB0B4\uC5ED +uri.front.info.bank.create.input.month.{{pathVar}}=\uC740\uD589 \uC790\uB3D9\uC774\uCCB4 \uB0B4\uC5ED +uri.front.info.bank.create.output.{{pathVar}}=\uC740\uD589 \uC790\uB3D9\uC774\uCCB4 \uB0B4\uC5ED +uri.front.info.bank.create.output.month.{{pathVar}}=\uC740\uD589 \uC790\uB3D9\uC774\uCCB4 \uB0B4\uC5ED diff --git a/front/src/main/resources/templates/info/bank/banks.html b/front/src/main/resources/templates/info/bank/banks.html index 2a6cb7f6..89f725eb 100644 --- a/front/src/main/resources/templates/info/bank/banks.html +++ b/front/src/main/resources/templates/info/bank/banks.html @@ -13,18 +13,35 @@ @@ -34,7 +51,7 @@ + + \ No newline at end of file diff --git a/admin/src/main/resources/templates/researcher/detail.html b/admin/src/main/resources/templates/researcher/detail.html index 0d580b55..30af1164 100644 --- a/admin/src/main/resources/templates/researcher/detail.html +++ b/admin/src/main/resources/templates/researcher/detail.html @@ -56,17 +56,14 @@ -
-
-
- TOTAL. -
-
- +

+ 총 건 +

+ +
+
@@ -147,9 +144,11 @@
+
diff --git a/admin/src/main/resources/templates/researcher/researchers.html b/admin/src/main/resources/templates/researcher/researchers.html index 290363dc..f0815145 100644 --- a/admin/src/main/resources/templates/researcher/researchers.html +++ b/admin/src/main/resources/templates/researcher/researchers.html @@ -5,7 +5,6 @@
-
@@ -73,41 +72,36 @@
-
-
-
-
- TOTAL. +
+

+ 총 건 +

+ + + + + + + + + + + + + +
이름전화번호실사지역임가수사용여부
+
+ +
+ +
+
+
-
-
- - - - - - - - - - - - - -
이름전화번호실사지역임가수사용여부
-
- -
- - -
-
- -
-
+
@@ -154,10 +148,10 @@ const paging = $('.paging'); paging.empty(); paging.append( - uiUtil.getPagingUI(pageNo, f.size.value, response.totalPages, + uiUtil.getPagingUI(pageNo, response.size, response.totalPages, (movePageNo) => { f.page.value = movePageNo; - goSearch(); + getResearchers(movePageNo); })); }, From 689134e5965bbb515712c5ada79361147efe706e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Mon, 16 Jun 2025 17:33:53 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EC=96=B4=EB=93=9C=EB=AF=BC=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/createAdmin/adapters/web/CreateAdminController.java | 2 -- .../admin/updateAdmin/adapters/web/UpdateAdminController.java | 2 -- 2 files changed, 4 deletions(-) diff --git a/api/src/main/java/app/module/api/usecases/admin/createAdmin/adapters/web/CreateAdminController.java b/api/src/main/java/app/module/api/usecases/admin/createAdmin/adapters/web/CreateAdminController.java index 9580986a..597fa1b9 100644 --- a/api/src/main/java/app/module/api/usecases/admin/createAdmin/adapters/web/CreateAdminController.java +++ b/api/src/main/java/app/module/api/usecases/admin/createAdmin/adapters/web/CreateAdminController.java @@ -51,10 +51,8 @@ class CreateAdminController { reqVO.getSeq(), reqVO.getId(), reqVO.getPassword(), - reqVO.getEmail(), reqVO.getRegionMainCode(), reqVO.getAccountDisabled(), - reqVO.getAccountLocked(), reqVO.getRoleIds()); return ResponseEntity.status(HttpStatus.OK).body(new CreateAdminResVO(createdId)); diff --git a/api/src/main/java/app/module/api/usecases/admin/updateAdmin/adapters/web/UpdateAdminController.java b/api/src/main/java/app/module/api/usecases/admin/updateAdmin/adapters/web/UpdateAdminController.java index 704663a8..9debdf37 100644 --- a/api/src/main/java/app/module/api/usecases/admin/updateAdmin/adapters/web/UpdateAdminController.java +++ b/api/src/main/java/app/module/api/usecases/admin/updateAdmin/adapters/web/UpdateAdminController.java @@ -57,10 +57,8 @@ class UpdateAdminController { reqVO.getSeq(), reqVO.getId(), reqVO.getUpdatePassword(), - reqVO.getEmail(), reqVO.getRegionMainCode(), reqVO.getAccountDisabled(), - reqVO.getAccountLocked(), reqVO.getRoleIds()); return ResponseEntity.status(HttpStatus.OK).body(new UpdateAdminResVO(updatedId));