From ae87905c5370440a91720c2359293474af2214ad Mon Sep 17 00:00:00 2001 From: hylee Date: Wed, 4 Sep 2024 11:45:40 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B6=9C=ED=87=B4=EA=B7=BC=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=20=EC=95=8C=EB=B0=94=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/commute/mapper/domain/UserEnum.java | 6 ++++- .../service/impl/CommuteServiceImpl.java | 22 ------------------- 2 files changed, 5 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/itn/admin/commute/mapper/domain/UserEnum.java b/src/main/java/com/itn/admin/commute/mapper/domain/UserEnum.java index aad57d3..9ca1845 100644 --- a/src/main/java/com/itn/admin/commute/mapper/domain/UserEnum.java +++ b/src/main/java/com/itn/admin/commute/mapper/domain/UserEnum.java @@ -22,7 +22,11 @@ public enum UserEnum { ,user15("&@~S6vaRrMJmeRjp0T8z+/ybg==","강민경", "팀장") ,user16("&@~7mpJXFU+euFUNEdHmHLQVQ==","정수빈", "대리") ,user17("&@~+BL2FKvmIQc/jIyHvz0jew==","박은지", "주임") - ,user18("&@~6MWcZ9FnikUCQ8NTFDqHHQ==","itn6", "") + + ,user18("&@~/GE8OIrOSbOevc+sViEvbg==","이수현R", "알바") + ,user19("&@~l+Zs/I7piSIFu9WBQaI1eg==","임선율R", "알바") + + ,user99("&@~6MWcZ9FnikUCQ8NTFDqHHQ==","itn6", "") // ,user19("&@~8v+/5tt7+aiF/GuAhT37Xw==","S고수빈") // ,user20("&@~CQiMHkwkUohlvmCXqtzFLA==","S나은총") // ,user21("&@~l+Zs/I7piSIFu9WBQaI1eg==","S최보빈") diff --git a/src/main/java/com/itn/admin/commute/service/impl/CommuteServiceImpl.java b/src/main/java/com/itn/admin/commute/service/impl/CommuteServiceImpl.java index b9fad39..f9cbdbd 100644 --- a/src/main/java/com/itn/admin/commute/service/impl/CommuteServiceImpl.java +++ b/src/main/java/com/itn/admin/commute/service/impl/CommuteServiceImpl.java @@ -137,28 +137,6 @@ public class CommuteServiceImpl implements CommuteService { ); -/* - 출근 09시20분~30분 출근 09시00분~15분 - 퇴근 13시30분~45분 퇴근 13시30분~45분 - 박승미 대리 이명환 주임 -*/ - - CommuteVO commuteVO1= new CommuteVO(); - commuteVO1.setFirstActivityTime(getRandomTime("09:20:01", "09:29:59")); - commuteVO1.setLastActivityTime(getRandomTime("13:30:00", "13:45:00")); - commuteVO1.setUsrid("박승미"); - commuteVO1.setPstn("대리"); - - CommuteVO commuteVO2= new CommuteVO(); - commuteVO2.setFirstActivityTime(getRandomTime("09:00:01", "09:14:59")); - commuteVO2.setLastActivityTime(getRandomTime("13:30:00", "13:45:00")); - commuteVO2.setUsrid("이명환"); - commuteVO2.setPstn("주임"); - - commuteList.add(commuteVO1); - commuteList.add(commuteVO2); - - // controller에 return Map map = new HashMap();