Browse Source

修改获取审核人接口

songxinlu 3 năm trước cách đây
mục cha
commit
53ec7526d8

+ 10 - 7
report-service/src/main/java/com/lantone/report/facade/MedAppealInfoManagementFacade.java

@@ -36,8 +36,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @Description:申诉审核管理
@@ -309,23 +311,24 @@ public class MedAppealInfoManagementFacade {
         //获取审核人列表
         List<GetReviewerDTO> reviewers = sysUserRoleFacade.getBaseMapper().getUserByRole(getReviewerVO);
         //获取申诉人申诉记录审核人(时间倒序)
-        List<AppealInfo> appealInfos = appealInfoFacade.list(new QueryWrapper<AppealInfo>()
-                .select("DISTINCT  check_id")
+        List<Long> appealInfos = appealInfoFacade.list(new QueryWrapper<AppealInfo>()
+                .select("check_id")
                 .eq("claimant_id", getReviewerVO.getClaimantId())
-                .orderByDesc("gmt_create"));
+                .orderByDesc("gmt_create")).stream().map(AppealInfo::getCheckId).distinct().collect(Collectors.toList());
+        //去重
         return sortReviewer(reviewers, appealInfos);
     }
 
-    private List<GetReviewerDTO> sortReviewer(List<GetReviewerDTO> reviewers, List<AppealInfo> appealInfos) {
-        if (ListUtil.isEmpty(appealInfos)) {
+    private List<GetReviewerDTO> sortReviewer(List<GetReviewerDTO> reviewers, List<Long> checkIds) {
+        if (ListUtil.isEmpty(checkIds)) {
             return reviewers;
         }
         List<GetReviewerDTO> temp = new ArrayList<>(reviewers);
         if (ListUtil.isNotEmpty(reviewers)) {
             List<GetReviewerDTO> out = new ArrayList<>();
-            for (AppealInfo appealInfo : appealInfos) {
+            for (Long checkId : checkIds) {
                 for (GetReviewerDTO getReviewerDTO : reviewers) {
-                    if (getReviewerDTO.getId().intValue() == appealInfo.getCheckId().intValue()) {
+                    if (getReviewerDTO.getId().intValue() == checkId.intValue()) {
                         out.add(getReviewerDTO);
                         temp.remove(getReviewerDTO);
                     }