diff --git a/src/main/java/io/company/localhost/controller/api/CommutersController.java b/src/main/java/io/company/localhost/controller/api/CommutersController.java index 723522b..93065b9 100644 --- a/src/main/java/io/company/localhost/controller/api/CommutersController.java +++ b/src/main/java/io/company/localhost/controller/api/CommutersController.java @@ -106,10 +106,11 @@ public class CommutersController { * @return * */ - @PatchMapping("/update") - public ApiResponse updateCommuterProject(@ReqMap MapDto map) { - boolean isCommuter = commutersService.updateCommuterProject(map); - return ApiResponse.ok(isCommuter); - } + /* + * @PatchMapping("/update") public ApiResponse + * updateCommuterProject(@ReqMap MapDto map) { boolean isCommuter = + * commutersService.updateCommuterProject(map); return + * ApiResponse.ok(isCommuter); } + */ } diff --git a/src/main/java/io/company/localhost/mapper/CommutersMapper.java b/src/main/java/io/company/localhost/mapper/CommutersMapper.java index 80c54cb..6dc119b 100644 --- a/src/main/java/io/company/localhost/mapper/CommutersMapper.java +++ b/src/main/java/io/company/localhost/mapper/CommutersMapper.java @@ -33,7 +33,7 @@ public interface CommutersMapper { List selectTodayCommuter(); - int updateCommuterProject(MapDto map); +// int updateCommuterProject(MapDto map); int deleteCommuters(MapDto map); diff --git a/src/main/java/io/company/localhost/service/CommutersService.java b/src/main/java/io/company/localhost/service/CommutersService.java index 9eae2b5..e9051a0 100644 --- a/src/main/java/io/company/localhost/service/CommutersService.java +++ b/src/main/java/io/company/localhost/service/CommutersService.java @@ -100,8 +100,9 @@ public class CommutersService { * @param map * @return */ - public boolean updateCommuterProject(MapDto map) { - return commutersMapper.updateCommuterProject(map) > 0; - } + /* + * public boolean updateCommuterProject(MapDto map) { return + * commutersMapper.updateCommuterProject(map) > 0; } + */ } diff --git a/src/main/resources/mapper/CommutersMapper.xml b/src/main/resources/mapper/CommutersMapper.xml index 1971a47..a2ce960 100644 --- a/src/main/resources/mapper/CommutersMapper.xml +++ b/src/main/resources/mapper/CommutersMapper.xml @@ -25,11 +25,12 @@ - UPDATE commuters - SET COMMUTLVE = #{commutLve} - WHERE MEMBERSEQ = #{memberSeq} - AND COMMUTDAY = CURDATE() - + UPDATE commuters + SET COMMUTLVE = #{commutLve}, + PROJCTLVE = #{projctLve} + WHERE MEMBERSEQ = #{memberSeq} + AND COMMUTDAY = CURDATE() + - SELECT c.COMMUTCMT, m.MEMBERSEQ, m.MEMBERPRF as profile, p.PROJCTNAM + SELECT c.COMMUTCMT, c.PROJCTLVE, c.COMMUTLVE, m.MEMBERSEQ, m.MEMBERPRF as profile, p.PROJCTNAM FROM commuters c JOIN netmember m ON c.MEMBERSEQ = m.MEMBERSEQ JOIN netprojct p ON c.PROJCTSEQ = p.PROJCTSEQ @@ -75,12 +76,12 @@ - + DELETE FROM commuters WHERE PROJCTSEQ = #{projctSeq} diff --git a/src/main/resources/mapper/NetprojctMapper.xml b/src/main/resources/mapper/NetprojctMapper.xml index a955ec5..cb472a7 100644 --- a/src/main/resources/mapper/NetprojctMapper.xml +++ b/src/main/resources/mapper/NetprojctMapper.xml @@ -85,11 +85,10 @@ WHERE PROJCTSEQ = #{projctSeq} - + - SELECT p.PROJCTSEQ, p.PROJCTNAM, c.CMNCODNAM AS projctcolor, - MAX(cm.COMMUTCMT) AS last_check_in_time - FROM promember pm - JOIN netprojct p ON pm.PROJCTSEQ = p.PROJCTSEQ - LEFT JOIN commoncod c ON p.PROJCTCOL = c.CMNCODVAL AND c.CMNCODYNP = '1' - LEFT JOIN commuters cm ON pm.PROJCTSEQ = cm.PROJCTSEQ AND cm.MEMBERSEQ = pm.MEMBERSEQ - WHERE pm.MEMBERSEQ = #{memberSeq} - AND pm.PROJCTYON = '1' - AND (p.PROJCTEND IS NULL OR p.PROJCTEND >= CURDATE()) - GROUP BY p.PROJCTSEQ, p.PROJCTNAM, c.CMNCODNAM - ORDER BY last_check_in_time DESC, p.PROJCTSTR DESC - - + SELECT + p.PROJCTSEQ, + p.PROJCTNAM, + c.CMNCODNAM AS projctcolor, + MAX(cm.PROJCTLVE) AS last_worked_project, + MAX(cm.COMMUTLVE) AS last_check_out_time, + MAX(cm.COMMUTCMT) AS last_check_in_time + FROM promember pm + JOIN netprojct p ON pm.PROJCTSEQ = p.PROJCTSEQ + LEFT JOIN commoncod c ON p.PROJCTCOL = c.CMNCODVAL AND c.CMNCODYNP = '1' + LEFT JOIN commuters cm + ON pm.MEMBERSEQ = cm.MEMBERSEQ + AND (pm.PROJCTSEQ = cm.PROJCTSEQ OR pm.PROJCTSEQ = cm.PROJCTLVE) + WHERE pm.MEMBERSEQ = #{memberSeq} + AND pm.PROJCTYON = '1' + AND (p.PROJCTEND IS NULL OR p.PROJCTEND >= CURDATE()) + GROUP BY p.PROJCTSEQ, p.PROJCTNAM, c.CMNCODNAM + ORDER BY + MAX(cm.COMMUTLVE) DESC, + MAX(cm.COMMUTCMT) DESC, + p.PROJCTSTR DESC + DELETE FROM promember WHERE PROJCTSEQ = #{projctSeq}