From b854d8d7604329dcf99584d15f83ff02076d9e07 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期四, 01 九月 2022 10:52:04 +0800
Subject: [PATCH] 假删除fix
---
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/ExamineTemplateServiceImpl.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/ExamineTemplateServiceImpl.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/ExamineTemplateServiceImpl.java
index 5279424..e47e4e8 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/ExamineTemplateServiceImpl.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/ExamineTemplateServiceImpl.java
@@ -80,6 +80,12 @@
f.setSetPersonDepartmentName(depNameMap.get(f.getSetPersonDepartmentId()));
});
+ //获取考核项目明细
+ respList.forEach(f->{
+ List<ExamineItem> list = examineItemRepository.selectList(new QueryWrapper<ExamineItem>().eq("examine_template_id",f.getId()));
+ f.setExamineItemList(list);
+ });
+
return new SearchResultVO<>(
true,
@@ -116,7 +122,14 @@
if(StringUtils.hasText(infoDto.getDelExamineItems())){
List<Long> idList = Arrays.stream(infoDto.getDelExamineItems().split(",")).map(s-> Long.parseLong(s.trim()))
.collect(Collectors.toList());
- examineItemService.removeByIds(idList);
+ List<ExamineItem> delList = new ArrayList<>();
+ idList.forEach(f->{
+ ExamineItem info = new ExamineItem();
+ info.setDelFlag(1);
+ info.setId(f);
+ delList.add(info);
+ });
+ examineItemService.updateBatchById(delList);
}
ExamineTemplate examineTemplate = BeanCopyUtils.copyBean(infoDto, ExamineTemplate.class);
--
Gitblit v1.9.2