From ebab4bb51e39ad886074d1fd799257376d360c87 Mon Sep 17 00:00:00 2001
From: yoon <nmjk0123@gmail.com>
Date: Thu, 27 Feb 2025 13:24:06 +0900
Subject: [PATCH] =?UTF-8?q?=EC=82=AD=EC=A0=9C=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/api/ProjectController.java     | 19 +++++++---
 .../localhost/mapper/NetprojctMapper.java     |  2 ++
 .../localhost/service/NetprojctService.java   | 25 +++++++++++--
 src/main/resources/mapper/NetprojctMapper.xml | 36 ++++++++++++-------
 4 files changed, 64 insertions(+), 18 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 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<Boolean> 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<MapDto> 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<MapDto> 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
 	    <if test="searchKeyword != null and searchKeyword != ''">
 	        AND (
 	            p.PROJCTNAM LIKE CONCAT('%', #{searchKeyword}, '%')
@@ -80,17 +80,29 @@
 
     <!-- 프로젝트 로그 조회 -->
     <select id="selectProjectLog" parameterType="int" resultType="map">
-       SELECT 
-            DATE_FORMAT(PROJCTCDT, '%Y-%m-%d %H:%i') as createDate,
-            PROJCTCMB as creator,
-            CASE 
-                WHEN PROJCTUDT IS NOT NULL THEN DATE_FORMAT(PROJCTUDT, '%Y-%m-%d %H:%i')
-                ELSE NULL 
-            END as updateDate,
-            PROJCTUMB as updater
-        FROM netprojct
-        WHERE PROJCTSEQ = #{projctSeq}
+       	SELECT logDate, logMessage
+		FROM (
+		    SELECT 
+		        DATE_FORMAT(PROJCTCDT, '%Y-%m-%d %H:%i') AS logDate,
+		        CONCAT('[', PROJCTCMB, '] 프로젝트 등록') AS logMessage
+		    FROM netprojct
+		    WHERE PROJCTSEQ = #{projctSeq}
+		    
+		    UNION ALL
+		    
+		    SELECT 
+		        DATE_FORMAT(PROJCTUDT, '%Y-%m-%d %H:%i') AS logDate,
+		        CONCAT('[', PROJCTUMB, '] 프로젝트 수정') AS logMessage
+		    FROM netprojct
+		    WHERE PROJCTSEQ = #{projctSeq} AND PROJCTUDT IS NOT NULL
+		) AS logs
+		ORDER BY logDate DESC;
     </select>
     
+    <!-- 프로젝트 삭제 -->
+    <delete id="deleteProject">
+        DELETE FROM netprojct WHERE PROJCTSEQ = #{projctSeq}
+    </delete>
+    
     
 </mapper>