From c26e227abe288476c11b0a8b7875045e71efa14c Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: Thu, 30 Apr 2026 17:30:00 +0800
Subject: [PATCH] 新增修改
---
multi-system/src/main/java/com/gkhy/exam/system/service/impl/ItemReviewServiceImpl.java | 39 ++++++++++++++++++++++++++++++---------
1 files changed, 30 insertions(+), 9 deletions(-)
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/ItemReviewServiceImpl.java b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/ItemReviewServiceImpl.java
index 88d4753..52cc9e6 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/ItemReviewServiceImpl.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/ItemReviewServiceImpl.java
@@ -8,13 +8,15 @@
import com.gkhy.exam.common.utils.StringUtils;
import com.gkhy.exam.system.domain.ItemReview;
import com.gkhy.exam.system.domain.ItemReviewUser;
-import com.gkhy.exam.system.domain.ProductItem;
+import com.gkhy.exam.system.domain.ProcessInspection;
+import com.gkhy.exam.system.domain.ProjectDocument;
import com.gkhy.exam.system.domain.vo.ItemReviewUserVo;
import com.gkhy.exam.system.mapper.ItemReviewMapper;
import com.gkhy.exam.system.mapper.ItemReviewUserMapper;
import com.gkhy.exam.system.mapper.ProductItemMapper;
import com.gkhy.exam.system.service.ItemReviewService;
-import org.checkerframework.checker.units.qual.A;
+import com.gkhy.exam.system.service.ProcessInspectionService;
+import com.gkhy.exam.system.service.ProjectDocumentService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -22,7 +24,6 @@
import java.time.LocalDateTime;
import java.util.Arrays;
import java.util.List;
-import java.util.stream.Collectors;
@Service
public class ItemReviewServiceImpl extends ServiceImpl<ItemReviewMapper, ItemReview> implements ItemReviewService {
@@ -35,6 +36,12 @@
@Autowired
private ProductItemMapper productItemMapper;
+
+ @Autowired
+ private ProjectDocumentService projectDocumentService;
+
+ @Autowired
+ private ProcessInspectionService processInspectionService;
@Override
@@ -51,9 +58,16 @@
List<ItemReviewUser> itemReviewUsers = itemReviewUserMapper.selectByReviewId(review.getId());
review.setReviewUsers(itemReviewUsers);
}
- List<String> list = Arrays.asList(review.getProductItemIds().split(","));
- List<ProductItem> productItems = productItemMapper.selectBatchIds(list);
- review.setProductItems(productItems);
+ if (!StringUtils.isEmpty(review.getProductItemIds())){
+ List<String> list = Arrays.asList(review.getProductItemIds().split(","));
+ List<ProjectDocument> projectDocuments = projectDocumentService.listByIds(list);
+ review.setProjectDocuments(projectDocuments);
+ }
+ if (StringUtils.isNotBlank(review.getProcessItemIds())){
+ List<String> list2 = Arrays.asList(review.getProcessItemIds().split(","));
+ List<ProcessInspection> processInspections = processInspectionService.listByIds(list2);
+ review.setProcessInspections(processInspections);
+ }
}
return CommonPage.restPage(itemReviews);
}
@@ -127,9 +141,16 @@
public CommonResult approvalList(Integer userId) {
List<ItemReviewUserVo> itemReviewUserVos = itemReviewUserMapper.selectByUserId(userId);
for (ItemReviewUserVo itemReviewUserVo : itemReviewUserVos) {
- List<String> list = Arrays.asList(itemReviewUserVo.getProductItemIds().split(","));
- List<ProductItem> productItems = productItemMapper.selectBatchIds(list);
- itemReviewUserVo.setProductItems(productItems);
+ if (!StringUtils.isEmpty(itemReviewUserVo.getProductItemIds())){
+ List<String> list = Arrays.asList(itemReviewUserVo.getProductItemIds().split(","));
+ List<ProjectDocument> projectDocuments = projectDocumentService.listByIds(list);
+ itemReviewUserVo.setProjectDocuments(projectDocuments);
+ }
+ if (StringUtils.isNotBlank(itemReviewUserVo.getProcessItemIds())){
+ List<String> list2 = Arrays.asList(itemReviewUserVo.getProcessItemIds().split(","));
+ List<ProcessInspection> processInspections = processInspectionService.listByIds(list2);
+ itemReviewUserVo.setProcessInspections(processInspections);
+ }
}
return CommonResult.success(itemReviewUserVos);
}
--
Gitblit v1.9.2