11 Commits

Author SHA1 Message Date
baab2a822d Merge branch 'n-kawahito' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into s-morimoto 2026-09-29 15:14:27 +09:00
25986b455e Merge branch 'k-kobayashi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into s-morimoto 2026-09-29 14:48:11 +09:00
c7a33c997c Merge branch 'k-kobayashi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into s-morimoto 2026-09-29 14:38:02 +09:00
3818da7b4e Merge branch 'n-kawahito' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into s-morimoto 2026-09-29 14:37:39 +09:00
f37dd792a0 Merge branch 'n-kawahito' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into s-morimoto 2026-09-29 13:36:21 +09:00
109b8125d6 Merge branch 's-choi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into s-morimoto 2026-09-29 11:15:57 +09:00
626c4d6721 Merge branch 's-choi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into s-morimoto 2026-09-29 11:00:49 +09:00
e43958a1fb Merge branch 's-choi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into s-morimoto 2026-09-29 10:55:27 +09:00
57a76ae044 no message 2026-09-29 10:24:55 +09:00
4880a4285e Merge branch 's-choi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into s-morimoto
# Conflicts:
#	src/main/java/com/example/demo/aop/handler/GlobalExceptionHandler.java
2026-09-29 10:24:41 +09:00
03b1b7d982 [EDIT]バグ修正 2026-09-29 10:22:58 +09:00
2 changed files with 23 additions and 23 deletions

View File

@@ -49,7 +49,7 @@ public class GlobalExceptionHandler {
LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE_ILLEGAL_TRANSITION, e);
System.out.println("session invalidated");
System.out.println("session invalidated method not supported exception");
session.invalidate();
return TransitionTargetPageNameKeyword.ERROR_HTML;

View File

@@ -372,29 +372,29 @@ public class TransactionController {
@RequestParam(required = false, defaultValue = "0") String months) {
LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
System.out.println("******************************************::1");
LocalDate today = LocalDate.now();
System.out.println("******************************************::2");
int year = (years.equals("0")) ? today.getYear() : Integer.parseInt(years);
System.out.println("******************************************::3");
int month = (months.equals("0")) ? today.getMonthValue() : Integer.parseInt(months);
System.out.println("******************************************::4");
YearMonth yearMonth = YearMonth.of(year, month);
System.out.println("******************************************::5");
int lastDay = yearMonth.lengthOfMonth();
System.out.println("******************************************::6");
int firstDayOfWeek = yearMonth.atDay(1).getDayOfWeek().getValue() % 7;
System.out.println("******************************************::7");
YearMonth previousYearMonth = yearMonth.minusMonths(1);
System.out.println("******************************************::8");
int previousYear = previousYearMonth.getYear();
int previousMonth = previousYearMonth.getMonthValue();
System.out.println("******************************************::9");
YearMonth nextYearMonth = yearMonth.plusMonths(1);
System.out.println("******************************************::10");
int nextYear = nextYearMonth.getYear();
int nextMonth = nextYearMonth.getMonthValue();
System.out.println("******************************************::11");
model.addAttribute(PageReturnAttributeKeyword.YEAR, year);
model.addAttribute(PageReturnAttributeKeyword.MONTH, month);
model.addAttribute(PageReturnAttributeKeyword.DAY, today.getDayOfMonth());
@@ -407,34 +407,34 @@ public class TransactionController {
model.addAttribute(PageReturnAttributeKeyword.NEXT_YEAR, nextYear);
model.addAttribute(PageReturnAttributeKeyword.NEXT_MONTH, nextMonth);
System.out.println("******************************************::12");
LocalDate startDate = yearMonth.atDay(1);
LocalDate endDate = yearMonth.atEndOfMonth();
System.out.println("******************************************::13");
List<Income> incomeList = transactionService.findTotalIncomeList(startDate, endDate, loginUser.getUserId());
System.out.println("******************************************::14");
List<Expense> expenseList = transactionService.findTotalExpenseList(startDate, endDate, loginUser.getUserId());
System.out.println("******************************************::15");
model.addAttribute(PageReturnAttributeKeyword.INCOME_LIST, incomeList);
model.addAttribute(PageReturnAttributeKeyword.EXPENSE_LIST, expenseList);
System.out.println("******************************************::16");
int totalIncome = transactionService.findTotalIncome(startDate, endDate, loginUser.getUserId());
int totalExpense = transactionService.findTotalExpense(startDate, endDate, loginUser.getUserId());
System.out.println("******************************************::17");
model.addAttribute(PageReturnAttributeKeyword.TOTAL_INCOME, totalIncome);
model.addAttribute(PageReturnAttributeKeyword.TOTAL_EXPENSE, totalExpense);
System.out.println("******************************************::18");
List<GoalForm> goalForm = GoalForm.convertFrom(goalService.getGoalByUserId(loginUser.getUserId()));
System.out.println("******************************************::19");
UserForm userForm = UserForm.convertFrom(userService.findByUserId(loginUser.getUserId()));
System.out.println("******************************************::20");
List<GoalForm> resultList = goalForm.stream().filter(goal -> goal.getGoalComplete() == 0)
.collect(Collectors.toList());
System.out.println("******************************************::21");
if (!resultList.isEmpty()) {
GoalForm result = resultList.getFirst();
System.out.println("******************************************::22");
model.addAttribute(PageReturnAttributeKeyword.ACHIEVEMENT_RATE, result.getAchievementRate());
model.addAttribute(PageReturnAttributeKeyword.CURRENT_AMOUNT, result.getCurrentAmount());