From b194758b327d04227a9e37a4869ae4aec9461fa3 Mon Sep 17 00:00:00 2001 From: hyunzzii Date: Mon, 9 Jun 2025 18:57:28 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20=EC=8B=A4=EC=8B=9C=EA=B0=84=20?= =?UTF-8?q?=EC=98=88=EC=83=81=20=EA=B8=89=EC=97=AC=20=EC=A1=B0=ED=9A=8C=20?= =?UTF-8?q?=EA=B0=80=EB=8A=A5=ED=95=98=EA=B2=8C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mangoboss/app/api/facade/payroll/BossPayrollFacade.java | 4 ++-- .../mangoboss/app/api/facade/payroll/StaffPayrollFacade.java | 2 +- app/src/main/resources/data.sql | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/mangoboss/app/api/facade/payroll/BossPayrollFacade.java b/app/src/main/java/com/mangoboss/app/api/facade/payroll/BossPayrollFacade.java index 5b7e6428..888785ee 100644 --- a/app/src/main/java/com/mangoboss/app/api/facade/payroll/BossPayrollFacade.java +++ b/app/src/main/java/com/mangoboss/app/api/facade/payroll/BossPayrollFacade.java @@ -110,8 +110,8 @@ public void deleteAccount(final Long storeId, final Long bossId) { public List getPayrollsByMonth(final Long storeId, final Long bossId, final YearMonth yearMonth) { storeService.isBossOfStore(storeId, bossId); - payrollSettingService.isTransferDateBefore(storeId, yearMonth); - payrollService.validateMonthIsBeforeCurrent(yearMonth); +// payrollSettingService.isTransferDateBefore(storeId, yearMonth); +// payrollService.validateMonthIsBeforeCurrent(yearMonth); List staffs = staffService.getStaffsForStore(storeId); List payrolls = payrollService.getTransferredPayrollsByMonth(storeId, yearMonth); diff --git a/app/src/main/java/com/mangoboss/app/api/facade/payroll/StaffPayrollFacade.java b/app/src/main/java/com/mangoboss/app/api/facade/payroll/StaffPayrollFacade.java index 965fd2e7..796d2bfa 100644 --- a/app/src/main/java/com/mangoboss/app/api/facade/payroll/StaffPayrollFacade.java +++ b/app/src/main/java/com/mangoboss/app/api/facade/payroll/StaffPayrollFacade.java @@ -27,7 +27,7 @@ public class StaffPayrollFacade { public PayrollResponse getPayrollDetail(final Long storeId, final Long userId, final YearMonth yearMonth) { StaffEntity staff = staffService.getVerifiedStaff(userId, storeId); - payrollService.validateMonthIsBeforeCurrent(yearMonth); +// payrollService.validateMonthIsBeforeCurrent(yearMonth); PayrollEntity payroll = payrollService.getPayrollForStaffAndMonth(staff.getId(), yearMonth); if (payroll != null) { return PayrollResponse.ofForPayroll(payroll, payslipService.getPayslipByPayrollId(payroll.getId())); diff --git a/app/src/main/resources/data.sql b/app/src/main/resources/data.sql index bcc79ec2..4d6fe06d 100644 --- a/app/src/main/resources/data.sql +++ b/app/src/main/resources/data.sql @@ -4,7 +4,7 @@ VALUES (1, 'test1@ajou.ac.kr', '망고보스', null, '010-1234-5678', '11111111' 'https://mblogthumb-phinf.pstatic.net/MjAyMDAyMTBfODAg/MDAxNTgxMzA0MTE3ODMy.ACRLtB9v5NH-I2qjWrwiXLb7TeUiG442cJmcdzVum7cg.eTLpNg_n0rAS5sWOsofRrvBy0qZk_QcWSfUiIagTfd8g.JPEG.lattepain/1581304118739.jpg?type=w800', 'BOSS', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP), (2, 'test2@ajou.ac.kr', '망알바', null, '010-2312-1111', '22222222', '2006-05-11', - 'http://k.kakaocdn.net/dn/KNfQc/btsNkI4rZDT/FqS6EhArmExoRcVX9bane1/img_110x110.jpg', + 'https://mblogthumb-phinf.pstatic.net/MjAyMDAyMTBfODAg/MDAxNTgxMzA0MTE3ODMy.ACRLtB9v5NH-I2qjWrwiXLb7TeUiG442cJmcdzVum7cg.eTLpNg_n0rAS5sWOsofRrvBy0qZk_QcWSfUiIagTfd8g.JPEG.lattepain/1581304118739.jpg?type=w800', 'STAFF', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP), (3, 'test3@ajou.ac.kr', '고알바', null, '010-4972-4844', '33333333', '2004-07-22', 'https://mblogthumb-phinf.pstatic.net/MjAyMDAyMTBfODAg/MDAxNTgxMzA0MTE3ODMy.ACRLtB9v5NH-I2qjWrwiXLb7TeUiG442cJmcdzVum7cg.eTLpNg_n0rAS5sWOsofRrvBy0qZk_QcWSfUiIagTfd8g.JPEG.lattepain/1581304118739.jpg?type=w800', @@ -16,7 +16,7 @@ VALUES (1, 'test1@ajou.ac.kr', '망고보스', null, '010-1234-5678', '11111111' 'https://mblogthumb-phinf.pstatic.net/MjAyMDAyMTBfODAg/MDAxNTgxMzA0MTE3ODMy.ACRLtB9v5NH-I2qjWrwiXLb7TeUiG442cJmcdzVum7cg.eTLpNg_n0rAS5sWOsofRrvBy0qZk_QcWSfUiIagTfd8g.JPEG.lattepain/1581304118739.jpg?type=w800', 'STAFF', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP), (6, 'test6@ajou.ac.kr', '정알바', null, '010-7712-2367', '66666666', '1997-09-01', - 'http://k.kakaocdn.net/dn/bD4Rih/btsNXAxY4w1/XuxLt8jAsnIA5ZaHVjkE0k/img_110x110.jpg', + 'https://mblogthumb-phinf.pstatic.net/MjAyMDAyMTBfODAg/MDAxNTgxMzA0MTE3ODMy.ACRLtB9v5NH-I2qjWrwiXLb7TeUiG442cJmcdzVum7cg.eTLpNg_n0rAS5sWOsofRrvBy0qZk_QcWSfUiIagTfd8g.JPEG.lattepain/1581304118739.jpg?type=w800', 'STAFF', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); INSERT INTO store (store_id, boss_id, name, address, business_number, store_type, invite_code,