dcs 1 năm trước cách đây
mục cha
commit
25b892c3d6

+ 1 - 1
virgo.api/src/main/java/com/bosshand/virgo/api/dao/ProjectItemTargetDao.java

@@ -20,6 +20,6 @@ public interface ProjectItemTargetDao {
 
 	int delete(long id);
 
-	int deleteByProjectId(long id);
+	int deleteByProjectId(long projectId);
 
 }

+ 12 - 5
virgo.api/src/main/java/com/bosshand/virgo/api/dao/ProjectItemTargetRoomDao.java

@@ -7,10 +7,17 @@ import java.util.List;
 
 @Mapper
 public interface ProjectItemTargetRoomDao {
-    public ProjectItemTargetRoom get(long id);
-    public List<ProjectItemTargetRoom> getProjectItemTargetRoom(ProjectItemTargetRoom projectItemTargetRoom);
-    public int insert(ProjectItemTargetRoom projectItemTargetRoom);
-    public int update(ProjectItemTargetRoom projectItemTargetRoom);
-    public int delete(long id);
+
+    ProjectItemTargetRoom get(long id);
+
+    List<ProjectItemTargetRoom> getProjectItemTargetRoom(ProjectItemTargetRoom projectItemTargetRoom);
+
+    int insert(ProjectItemTargetRoom projectItemTargetRoom);
+
+    int update(ProjectItemTargetRoom projectItemTargetRoom);
+
+    int delete(long id);
+
+    int deleteByProjectId(long projectId);
 
 }

+ 7 - 0
virgo.api/src/main/java/com/bosshand/virgo/api/service/ProjectService.java

@@ -3,9 +3,11 @@ package com.bosshand.virgo.api.service;
 import com.bosshand.virgo.api.dao.ProjectDao;
 import com.bosshand.virgo.api.dao.ProjectItemDao;
 import com.bosshand.virgo.api.dao.ProjectItemTargetDao;
+import com.bosshand.virgo.api.dao.ProjectItemTargetRoomDao;
 import com.bosshand.virgo.api.model.Project;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -21,6 +23,9 @@ public class ProjectService {
 	@Autowired
 	private ProjectItemTargetDao projectItemTargetDao;
 
+	@Autowired
+	private ProjectItemTargetRoomDao projectItemTargetRoomDao;
+
 	public Project get(long id) {
 		return projectDao.get(id);
 	}
@@ -42,10 +47,12 @@ public class ProjectService {
 		return projectDao.getLimit(project, currIndex, pageSize);
 	}
 
+	@Transactional
 	public void deleteProject(long id) {
 		projectDao.delete(id);
 		projectItemDao.deleteByProjectId(id);
 		projectItemTargetDao.deleteByProjectId(id);
+		projectItemTargetRoomDao.deleteByProjectId(id);
 	}
 
 	public List<Project> getProjectByOrganizationId(long organizationId) {

+ 4 - 0
virgo.api/src/main/resources/mapper/ProjectItemTargetMapper.xml

@@ -23,6 +23,10 @@
         DELETE FROM project_item_target WHERE id = #{id}
     </delete>
 
+    <delete id="deleteByProjectId">
+        DELETE FROM project_item_target WHERE projectId = #{projectId}
+    </delete>
+
     <update id="update" parameterType="com.bosshand.virgo.api.model.ProjectItemTarget">
         UPDATE project_item_target
         <trim prefix="set" suffixOverrides=",">

+ 4 - 0
virgo.api/src/main/resources/mapper/ProjectItemTargetRoomMapper.xml

@@ -68,6 +68,10 @@
         DELETE FROM project_item_target_room WHERE id=#{id}
     </delete>
 
+    <delete id="deleteByProjectId">
+        DELETE FROM project_item_target_room WHERE projectId=#{projectId}
+    </delete>
+
     <update id="update" parameterType="com.bosshand.virgo.api.model.ProjectItemTargetRoom">
         UPDATE project_item_target_room
         <trim prefix="set" suffixOverrides=",">