From 364991f6b4be02169f7285df9b028ef2b9d77ec2 Mon Sep 17 00:00:00 2001 From: "hehihoho3@gmail.com" Date: Tue, 5 Nov 2024 18:14:50 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B6=9C=ED=87=B4=EA=B7=BC=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/itn/admin/cmn/util/DateUtils.java | 8 ++ .../admin/commute/service/CommuteService.java | 3 + .../service/impl/CommuteServiceImpl.java | 34 +++++ .../admin/commute/web/CommuteController.java | 14 +- .../itn/commute/mapper/ItnCommuteMapper.java | 3 + .../spam/service/impl/SpamServiceImpl.java | 1 + .../mapper/itn/commute/CommuteMapper.xml | 24 ++++ .../resources/templates/commute/list.html | 128 +++++++++++++----- 8 files changed, 172 insertions(+), 43 deletions(-) diff --git a/src/main/java/com/itn/admin/cmn/util/DateUtils.java b/src/main/java/com/itn/admin/cmn/util/DateUtils.java index 50c91fb..536fba7 100644 --- a/src/main/java/com/itn/admin/cmn/util/DateUtils.java +++ b/src/main/java/com/itn/admin/cmn/util/DateUtils.java @@ -44,4 +44,12 @@ public class DateUtils { } + public static String getFormatToStandardDate(String workDt) { + + // LocalDate로 변환 + LocalDate date = LocalDate.parse(workDt, DateTimeFormatter.ofPattern("yyyy-M-d")); + + // 원하는 형식으로 변환 + return date.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")); + } } diff --git a/src/main/java/com/itn/admin/commute/service/CommuteService.java b/src/main/java/com/itn/admin/commute/service/CommuteService.java index 89f730c..3d6cbbf 100644 --- a/src/main/java/com/itn/admin/commute/service/CommuteService.java +++ b/src/main/java/com/itn/admin/commute/service/CommuteService.java @@ -1,6 +1,7 @@ package com.itn.admin.commute.service; import com.itn.admin.commute.mapper.domain.CommuteVO; +import com.itn.admin.commute.mapper.domain.ItnCommuteVO; import java.util.Map; @@ -11,4 +12,6 @@ public interface CommuteService { Map getList(CommuteVO commuteVO); Map transfer(CommuteVO commuteVO); + + Map getCommuteList(ItnCommuteVO itnCommuteVO); } 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 3a7f92e..5f40cb3 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 @@ -7,6 +7,8 @@ import com.itn.admin.commute.mapper.domain.ItnCommuteGroupVO; import com.itn.admin.commute.mapper.domain.ItnCommuteVO; import com.itn.admin.commute.mapper.domain.UserEnum; import com.itn.admin.commute.service.CommuteService; +import com.itn.admin.itn.code.mapper.domain.CodeDetailVO; +import com.itn.admin.itn.code.server.CodeDetailService; import com.itn.admin.itn.commute.mapper.ItnCommuteMapper; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -34,6 +36,9 @@ public class CommuteServiceImpl implements CommuteService { @Autowired ItnCommuteMapper itnCommuteMapper; + @Autowired + CodeDetailService codeDetailService; + private static final int PAGE_SIZE = 5; @@ -50,6 +55,30 @@ public class CommuteServiceImpl implements CommuteService { return map; } + @Override + public Map getCommuteList(ItnCommuteVO itnCommuteVO) { + // controller에 return + + if(StringUtils.isEmpty(itnCommuteVO.getWorkDt())){ + Map map = DateUtils.getPreviousBusinessDay(); + itnCommuteVO.setWorkDt(DateUtils.getFormatToStandardDate(map.get("year") +"-"+map.get("month")+"-"+map.get("day"))); + } + + log.info(":: rsnCode01List :: "); + List codeList = codeDetailService.getDetailsByGroupId("COMMUTE"); + + List itnCommuteList = itnCommuteMapper.findByWorkDtFromItnCommute(itnCommuteVO.getWorkDt()); + + + + + Map returnMap = new HashMap(); + returnMap.put("itnCommuteList", itnCommuteList); + returnMap.put("codeList", codeList); + return returnMap; + } + + @Override public Map transfer(CommuteVO commuteVO) { List commuteList = makeList(commuteVO); @@ -59,6 +88,10 @@ public class CommuteServiceImpl implements CommuteService { System.out.println("startDate :: "+startDate); String workDt = startDate.split(" ")[0]; + + workDt = DateUtils.getFormatToStandardDate(workDt); + + Integer groupId = itnCommuteMapper.findByCommuteGroupIdFromItnCommuteWhereWordDt(workDt); // groupId가 없으면 groupId insert @@ -102,6 +135,7 @@ public class CommuteServiceImpl implements CommuteService { } + public List makeList(CommuteVO commuteVO){ diff --git a/src/main/java/com/itn/admin/commute/web/CommuteController.java b/src/main/java/com/itn/admin/commute/web/CommuteController.java index ca4cd95..b4a5111 100644 --- a/src/main/java/com/itn/admin/commute/web/CommuteController.java +++ b/src/main/java/com/itn/admin/commute/web/CommuteController.java @@ -38,20 +38,14 @@ public class CommuteController { @GetMapping(value = "/commute/list_test") public String list_test(@ModelAttribute ItnCommuteVO itnCommuteVO, Model model) { // commuteVO.getWorkDt()를 사용하여 workDt 값에 접근할 수 있습니다. - System.out.println("itnCommuteVO.getWorkDt(); : "+ itnCommuteVO.getWorkDt()); - - -// Map map = DateUtils.getPreviousBusinessDay(); -// commuteVO.setSearchYear(map.get("year")); -// commuteVO.setSearchMonth(map.get("month")); -// commuteVO.setSearchDay(map.get("day")); -// Map resultMap = commuteService.getList(itnCommuteVO); + + Map resultMap = commuteService.getCommuteList(itnCommuteVO); // -// model.addAttribute("list", resultMap.get("resultList")); -// model.addAttribute("commuteVO", resultMap.get("commuteVO")); + model.addAttribute("list", resultMap.get("itnCommuteList")); + model.addAttribute("codeList", resultMap.get("codeList")); return "commute/list"; } diff --git a/src/main/java/com/itn/admin/itn/commute/mapper/ItnCommuteMapper.java b/src/main/java/com/itn/admin/itn/commute/mapper/ItnCommuteMapper.java index 99253a8..7d1cdd5 100644 --- a/src/main/java/com/itn/admin/itn/commute/mapper/ItnCommuteMapper.java +++ b/src/main/java/com/itn/admin/itn/commute/mapper/ItnCommuteMapper.java @@ -32,4 +32,7 @@ public interface ItnCommuteMapper { void insertCommuteGroup(ItnCommuteGroupVO itnGroupVO); void upsertCommuteList(List itnCommuteList); + + + List findByWorkDtFromItnCommute(String workDt); } diff --git a/src/main/java/com/itn/admin/itn/mjon/spam/service/impl/SpamServiceImpl.java b/src/main/java/com/itn/admin/itn/mjon/spam/service/impl/SpamServiceImpl.java index ed97956..901026b 100644 --- a/src/main/java/com/itn/admin/itn/mjon/spam/service/impl/SpamServiceImpl.java +++ b/src/main/java/com/itn/admin/itn/mjon/spam/service/impl/SpamServiceImpl.java @@ -139,6 +139,7 @@ public class SpamServiceImpl implements SpamService { } } + log.info(":: rsnCode01List :: "); List rsnCode01List = codeDetailService.getDetailsByGroupId("SPAM"); Map resultMap = new HashMap<>(); diff --git a/src/main/resources/mapper/itn/commute/CommuteMapper.xml b/src/main/resources/mapper/itn/commute/CommuteMapper.xml index dc8c619..cc79ee5 100644 --- a/src/main/resources/mapper/itn/commute/CommuteMapper.xml +++ b/src/main/resources/mapper/itn/commute/CommuteMapper.xml @@ -35,6 +35,30 @@ limit 1 + + + INSERT INTO itn_commute (commute_group_id, name, pstn, work_dt, start_time, start_rslt, end_time, end_rslt) diff --git a/src/main/resources/templates/commute/list.html b/src/main/resources/templates/commute/list.html index a4fc172..4ba650d 100644 --- a/src/main/resources/templates/commute/list.html +++ b/src/main/resources/templates/commute/list.html @@ -208,37 +208,38 @@ - - 1 - 박성경 - 2012.11.02 04:38:30 - 미인식 - 2012.11.02 04:38:30 - 미인식 - - - 2 - 박성경 - 2012.11.02 06:47:02 - - 2012.11.02 07:01:10 - - - - 3 - 박성경 - 2012.11.02 07:01:10 - - 2012.11.02 07:01:10 - 연차(오전) - - - 4 - 박성경 - 2012.11.02 07:03:21 - - 2012.11.02 07:05:39 - + + + + + + + + + + + + + + + + + + @@ -276,12 +277,73 @@ + + + - -