From ed7a3a67b70ac931487dd6b0aae29ba4c7e50435 Mon Sep 17 00:00:00 2001
From: k-oshita <k-oshita@iij.ad.jp>
Date: Fri, 18 Sep 2026 16:11:20 +0900
Subject: [PATCH] =?UTF-8?q?[EDIT]=E3=83=A1=E3=83=8B=E3=83=A5=E3=83=BC?=
 =?UTF-8?q?=E7=94=BB=E9=9D=A2=E3=81=A7=E7=8F=BE=E5=9C=A8=E9=AB=98=E3=81=AE?=
 =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=82=92=E3=81=A7=E3=81=8D=E3=82=8B=E7=94=A8?=
 =?UTF-8?q?=E3=81=AB=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/example/demo/app/domain/model/GoalModel.java  | 6 ++++--
 .../demo/app/domain/service/impl/GoalServiceImpl.java      | 3 ++-
 .../app/presentation/controller/TransactionController.java | 2 ++
 .../com/example/demo/app/presentation/form/GoalForm.java   | 5 ++++-
 src/main/resources/templates/goal_view.html                | 1 -
 src/main/resources/templates/menu.html                     | 7 +++++++
 6 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/example/demo/app/domain/model/GoalModel.java b/src/main/java/com/example/demo/app/domain/model/GoalModel.java
index 74845d1..d128209 100644
--- a/src/main/java/com/example/demo/app/domain/model/GoalModel.java
+++ b/src/main/java/com/example/demo/app/domain/model/GoalModel.java
@@ -25,6 +25,8 @@ public class GoalModel {
 	private Integer goalComplete;
 	
 	private Integer achievementRate; // 達成率
+	
+	private Integer currentAmount; // 現在の資産
 
 	public static GoalModel convertFrom(GoalEntity goalEntity) {
 		return new GoalModel(
@@ -34,7 +36,7 @@ public class GoalModel {
 				goalEntity.getTargetAmount(),
 				goalEntity.getDeadline(),
 				goalEntity.getGoalComplete(),
-				null);
+				null,null);
 	}
 
 	public static GoalEntity convertTo(GoalModel goalModel) {
@@ -56,7 +58,7 @@ public class GoalModel {
 				goalForm.getTargetAmount(),
 				goalForm.getDeadline(),
 				goalForm.getGoalComplete()
-				,null);
+				,null,null);
 	}
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/example/demo/app/domain/service/impl/GoalServiceImpl.java b/src/main/java/com/example/demo/app/domain/service/impl/GoalServiceImpl.java
index 4654d05..a1d31e8 100644
--- a/src/main/java/com/example/demo/app/domain/service/impl/GoalServiceImpl.java
+++ b/src/main/java/com/example/demo/app/domain/service/impl/GoalServiceImpl.java
@@ -56,7 +56,8 @@ public class GoalServiceImpl implements GoalService {
 				goalModel.getTargetAmount(),
 				goalModel.getDeadline(),
 				goalModel.getGoalComplete(),
-				achievementRate);   
+				achievementRate,
+				currentAmount);   
 	}
 	
 	@Override
diff --git a/src/main/java/com/example/demo/app/presentation/controller/TransactionController.java b/src/main/java/com/example/demo/app/presentation/controller/TransactionController.java
index fb726ad..4897ccb 100644
--- a/src/main/java/com/example/demo/app/presentation/controller/TransactionController.java
+++ b/src/main/java/com/example/demo/app/presentation/controller/TransactionController.java
@@ -344,6 +344,8 @@ public class TransactionController {
 		UserForm userForm = UserForm.convertFrom(userService.findByUserId(loginUser.getUserId()));
 
 		model.addAttribute("achievementRate", goalForm.getAchievementRate());
+		
+	    model.addAttribute("currentAmount", goalForm.getCurrentAmount());
 
 		model.addAttribute("targetAmount", goalForm.getTargetAmount());
 
diff --git a/src/main/java/com/example/demo/app/presentation/form/GoalForm.java b/src/main/java/com/example/demo/app/presentation/form/GoalForm.java
index b4a5b63..5956fd6 100644
--- a/src/main/java/com/example/demo/app/presentation/form/GoalForm.java
+++ b/src/main/java/com/example/demo/app/presentation/form/GoalForm.java
@@ -29,6 +29,8 @@ public class GoalForm {
 	private Integer goalComplete;
 	
 	private Integer achievementRate; // 達成率
+	
+	private Integer currentAmount; // 現在の資産
 
 	public static GoalForm convertFrom(GoalModel goalModel) {
 		return new GoalForm(
@@ -38,7 +40,8 @@ public class GoalForm {
 				goalModel.getTargetAmount(),
 				goalModel.getDeadline(),
 				goalModel.getGoalComplete(),
-				goalModel.getAchievementRate());
+				goalModel.getAchievementRate(),
+				goalModel.getCurrentAmount());
 	}
 
 //	public static List<GoalForm> convertFrom(List<GoalModel> goalModelList) {
diff --git a/src/main/resources/templates/goal_view.html b/src/main/resources/templates/goal_view.html
index 2ae5153..71daf84 100644
--- a/src/main/resources/templates/goal_view.html
+++ b/src/main/resources/templates/goal_view.html
@@ -14,7 +14,6 @@
 	<h1>目標詳細</h1>
 
 	<table>
-
 		<tr>
 			<th>目標名</th>
 			<td th:text="${goalForm.goalTitle}"></td>
diff --git a/src/main/resources/templates/menu.html b/src/main/resources/templates/menu.html
index 04dd00a..4470464 100644
--- a/src/main/resources/templates/menu.html
+++ b/src/main/resources/templates/menu.html
@@ -118,6 +118,13 @@
 		<span th:text="${targetAmount}"></span>
 		<span>円</span>
 	</div>
+	
+	<div>
+			<span>現在高</span>
+			<span th:text="${currentAmount}"></span>
+			<span>円</span>
+		</div>
+
 	<div>
 		<span>貯金額</span>
 		<span th:text="${saving}"></span>