From b538979ed6f43a859e469a906f1617e75fb69a72 Mon Sep 17 00:00:00 2001 From: yoon Date: Fri, 21 Feb 2025 09:18:20 +0900 Subject: [PATCH] =?UTF-8?q?=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=20?= =?UTF-8?q?=EB=AA=A9=EB=A1=9D=20=EA=B2=80=EC=83=89=20+=20=EC=B9=B4?= =?UTF-8?q?=ED=85=8C=EA=B3=A0=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/api/ProjectController.java | 21 ++++++++------- .../localhost/mapper/NetprojctMapper.java | 2 +- .../localhost/service/NetprojctService.java | 21 ++++++++++----- src/main/resources/mapper/commoncodMapper.xml | 2 +- src/main/resources/mapper/netprojctMapper.xml | 26 +++++++++++++++++-- 5 files changed, 52 insertions(+), 20 deletions(-) diff --git a/src/main/java/io/company/localhost/controller/api/ProjectController.java b/src/main/java/io/company/localhost/controller/api/ProjectController.java index e91d072..f1094ad 100644 --- a/src/main/java/io/company/localhost/controller/api/ProjectController.java +++ b/src/main/java/io/company/localhost/controller/api/ProjectController.java @@ -49,7 +49,7 @@ public class ProjectController { /** * 프로젝트 연도 조회 * - * @return ApiResponse> + * @return * */ @ParameterCheck @@ -62,13 +62,16 @@ public class ProjectController { /** * 프로젝트 목록 조회 * - * * @return ApiResponse> + * @param projectName 프로젝트 이름 + * @param participantSeq 참여자 번호 + * @param address 주소 정보 (주소, 상세주소, 우편번호 + * @return * */ @ParameterCheck @GetMapping("/select") - public ApiResponse selectProject() { - List projectList = netprojctService.selectProject(); + public ApiResponse selectProject(@ReqMap MapDto map) { + List projectList = netprojctService.selectProject(map); MapDto outData = new MapDto(); outData.put("projectList", projectList); @@ -80,7 +83,7 @@ public class ProjectController { * 프로젝트 등록 * * @param map - * @return ApiResponse + * @return */ @PostMapping("/insert") public ApiResponse insertProject(@ReqMap MapDto map) { @@ -92,7 +95,7 @@ public class ProjectController { * 프로젝트 수정 * * @param map - * @return ApiResponse + * @return * */ @PatchMapping("/update") @@ -106,7 +109,7 @@ public class ProjectController { * 비밀번호 재설정 * * @param map - * @return ApiResponse + * @return * */ @PatchMapping("/updateYon") @@ -118,7 +121,7 @@ public class ProjectController { /** * 프로젝트 멤버리스트 조회 * - * * @return ApiResponse> + * @return * */ @ParameterCheck @@ -131,7 +134,7 @@ public class ProjectController { /** * 프로젝트 log 조회 * - * * @return ApiResponse> + * @return * */ @ParameterCheck diff --git a/src/main/java/io/company/localhost/mapper/NetprojctMapper.java b/src/main/java/io/company/localhost/mapper/NetprojctMapper.java index d87dc46..78d34b5 100644 --- a/src/main/java/io/company/localhost/mapper/NetprojctMapper.java +++ b/src/main/java/io/company/localhost/mapper/NetprojctMapper.java @@ -23,7 +23,7 @@ import io.company.localhost.common.dto.MapDto; @Mapper public interface NetprojctMapper { - List selectProject(); + List selectProject(MapDto map); int insertProject(MapDto map); diff --git a/src/main/java/io/company/localhost/service/NetprojctService.java b/src/main/java/io/company/localhost/service/NetprojctService.java index 80e170a..72d01f5 100644 --- a/src/main/java/io/company/localhost/service/NetprojctService.java +++ b/src/main/java/io/company/localhost/service/NetprojctService.java @@ -38,8 +38,8 @@ public class NetprojctService { * @param * @return */ - public List selectProject() { - return netprojctMapper.selectProject(); + public List selectProject(MapDto map) { + return netprojctMapper.selectProject(map); } @@ -78,7 +78,7 @@ public class NetprojctService { map.put("projctUdt", LocalDateTime.now()); boolean result = netprojctMapper.updateProject(map) > 0; - String color = map.getString("projctCol"); + Integer color = map.getInt("projctCol"); MapDto colorMap = new MapDto(); colorMap.put("color", color); @@ -86,10 +86,17 @@ public class NetprojctService { commoncodMapper.updateColorYon(colorMap); - MapDto OldColorMap = new MapDto(); - colorMap.put("oldColor", color); - colorMap.put("type", "YNP"); - commoncodMapper.updateColorChange(OldColorMap); + Integer originalColor = map.getInt("originalColor"); + + if(originalColor != null) { + MapDto OldColorMap = new MapDto(); + OldColorMap.put("color", originalColor); + OldColorMap.put("type", "YNP"); + + commoncodMapper.updateColorChange(OldColorMap); + } + + return result; } diff --git a/src/main/resources/mapper/commoncodMapper.xml b/src/main/resources/mapper/commoncodMapper.xml index 4e37197..e29188f 100644 --- a/src/main/resources/mapper/commoncodMapper.xml +++ b/src/main/resources/mapper/commoncodMapper.xml @@ -93,7 +93,7 @@ CMNCODYNP = 0 - WHERE CMNCODVAL = #{color}; + WHERE CMNCODVAL = #{color} - SELECT + SELECT DISTINCT p.*, - c .CMNCODNAM AS projctcolor + c.CMNCODNAM AS projctcolor FROM netprojct p LEFT JOIN commoncod c ON p.PROJCTCOL = c.CMNCODVAL + LEFT JOIN promember pm ON p.PROJCTSEQ = pm.PROJCTSEQ WHERE c.CMNCODYON = '1' + + AND ( + p.PROJCTNAM LIKE CONCAT('%', #{searchKeyword}, '%') + OR EXISTS ( + SELECT 1 + FROM promember pm2 + JOIN netmember m ON pm2.MEMBERSEQ = m.MEMBERSEQ + WHERE pm2.PROJCTSEQ = p.PROJCTSEQ + AND pm2.PROJCTYON = '1' + AND m.membernam LIKE CONCAT('%', #{searchKeyword}, '%') + ) + OR p.PROJCTARR LIKE CONCAT('%', #{searchKeyword}, '%') + OR p.PROJCTDTL LIKE CONCAT('%', #{searchKeyword}, '%') + OR p.PROJCTZIP LIKE CONCAT('%', #{searchKeyword}, '%') + ) + + + AND SUBSTRING(p.PROJCTSTR, 1, 4) = #{category} + ORDER BY p.PROJCTSEQ DESC + + INSERT INTO netprojct (