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 229da38..50e5638 100644 --- a/src/main/java/io/company/localhost/controller/api/ProjectController.java +++ b/src/main/java/io/company/localhost/controller/api/ProjectController.java @@ -17,14 +17,13 @@ package io.company.localhost.controller.api; import java.util.List; +import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PatchMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.multipart.MultipartFile; import io.company.localhost.common.annotation.ParameterCheck; import io.company.localhost.common.annotation.ReqMap; @@ -33,8 +32,6 @@ import io.company.localhost.common.dto.MapDto; import io.company.localhost.service.NetprojctService; import io.company.localhost.service.ProMemberService; import io.company.localhost.service.commoncodService; -import io.company.localhost.utils.AuthUtil; -import io.company.localhost.vo.MemberVo; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -146,4 +143,18 @@ public class ProjectController { return ApiResponse.ok(netprojctService.selectProjectLog(projctSeq)); } + + /** + * 프로젝트 삭제 + * + * @return + * + */ + @ParameterCheck + @PatchMapping("/delete") + public ApiResponse deleteProject(@ReqMap MapDto map) { + boolean isDelete = netprojctService.deleteProject(map); + return ApiResponse.ok(isDelete); + } + } diff --git a/src/main/java/io/company/localhost/mapper/NetprojctMapper.java b/src/main/java/io/company/localhost/mapper/NetprojctMapper.java index 0ae863b..9255cb9 100644 --- a/src/main/java/io/company/localhost/mapper/NetprojctMapper.java +++ b/src/main/java/io/company/localhost/mapper/NetprojctMapper.java @@ -30,4 +30,6 @@ public interface NetprojctMapper { int updateProject(MapDto map); List selectProjectLog(int projctSeq); + + int deleteProject(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 0614f11..15d6983 100644 --- a/src/main/java/io/company/localhost/service/NetprojctService.java +++ b/src/main/java/io/company/localhost/service/NetprojctService.java @@ -14,12 +14,13 @@ *************************************************************/ package io.company.localhost.service; -import java.math.BigInteger; import java.time.LocalDateTime; import java.util.List; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import io.company.localhost.common.annotation.ReqMap; import io.company.localhost.common.dto.MapDto; import io.company.localhost.mapper.NetprojctMapper; import io.company.localhost.mapper.PromemberMapper; @@ -113,6 +114,26 @@ public class NetprojctService { public List selectProjectLog(int projctSeq) { return netprojctMapper.selectProjectLog(projctSeq); } - + + /** + * 프로젝트 삭제 + * + * @param + * @return + */ + public boolean deleteProject(MapDto map) { + + boolean result = netprojctMapper.deleteProject(map) > 0; + + Integer color = map.getInt("projctCol"); + + MapDto colorMap = new MapDto(); + colorMap.put("color", color); + colorMap.put("type", "YNP"); + + commoncodMapper.updateColorChange(colorMap); + + return result; + } } diff --git a/src/main/resources/mapper/NetprojctMapper.xml b/src/main/resources/mapper/NetprojctMapper.xml index a20e6c7..d9d8a05 100644 --- a/src/main/resources/mapper/NetprojctMapper.xml +++ b/src/main/resources/mapper/NetprojctMapper.xml @@ -8,9 +8,9 @@ p.*, c.CMNCODNAM AS projctcolor FROM netprojct p - LEFT JOIN commoncod c ON p.PROJCTCOL = c.CMNCODVAL + LEFT JOIN commoncod c ON p.PROJCTCOL = c.CMNCODVAL AND c.CMNCODYNP = '1' LEFT JOIN promember pm ON p.PROJCTSEQ = pm.PROJCTSEQ - WHERE c.CMNCODYON = '1' + WHERE 1=1 AND ( p.PROJCTNAM LIKE CONCAT('%', #{searchKeyword}, '%') @@ -80,17 +80,29 @@ + + + DELETE FROM netprojct WHERE PROJCTSEQ = #{projctSeq} + +