From 09551f24349d1f78486ac07d1501516f1fab8b9f Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Tue, 5 Jul 2022 16:46:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E3=80=81=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E3=80=81prehomo=E5=88=A0=E9=99=A4dre=E5=B7=A5=E7=A8=8B?=
 =?UTF-8?q?=E5=B8=88=E6=8E=A5=E5=8F=A3=E5=AE=8C=E5=96=84=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectTaskInventoryDetailEOServiceImpl.java | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java
index 87566e6cd..1734c2ea5 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java
@@ -15,6 +15,7 @@ import com.jero.modules.project.enums.JumpLinkEnum;
 import com.jero.modules.project.enums.MsgTypeEnum;
 import com.jero.modules.project.enums.SendMsgFlagEnum;
 import com.jero.modules.project.mapper.*;
+import com.jero.modules.project.service.IFeedbackHistoryService;
 import com.jero.modules.project.service.IProjectTaskInventoryDetailEOService;
 import com.jero.modules.project.service.IProjectTaskInventoryFeedbackEOService;
 import com.jero.modules.project.util.SendMessageUtils;
@@ -57,6 +58,9 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
 	@Autowired
 	private IProjectTaskInventoryFeedbackEOService projectTaskInventoryFeedbackEOService;
 
+	@Autowired
+	private IFeedbackHistoryService feedbackHistoryService;
+
 	@Value(value = "${jero.backUrl}")
 	private String backUrl;
 
@@ -202,7 +206,17 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
 	@Override
     public void deleteById(String id) {
         removeById(id);
-    }
+        QueryWrapper<ProjectTaskInventoryFeedbackEO> queryWrapper = new QueryWrapper<>();
+		queryWrapper.lambda().eq(ProjectTaskInventoryFeedbackEO::getProjectTaskInventoryId,id);
+		List<ProjectTaskInventoryFeedbackEO> list = this.projectTaskInventoryFeedbackEOService.list(queryWrapper);
+		if(CollectionUtils.isNotEmpty(list)){
+			List<String> projectTaskInventoryFeedbackIdList = list.stream().map(ProjectTaskInventoryFeedbackEO::getId).distinct().collect(Collectors.toList());
+			this.projectTaskInventoryFeedbackEOService.deleteByIds(projectTaskInventoryFeedbackIdList);
+			QueryWrapper<FeedbackHistory> historyDeleteWrapper = new QueryWrapper<>();
+			historyDeleteWrapper.lambda().in(FeedbackHistory::getFeedbackId,projectTaskInventoryFeedbackIdList);
+			this.feedbackHistoryService.remove(historyDeleteWrapper);
+		}
+	}
 
 	/**
 	 * 批量删除