studio视角下获取项目状态评估

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ConditionAssessmentEOServiceImpl.java

@@ -13,6 +13,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
@@ -174,25 +175,28 @@ public class ConditionAssessmentEOServiceImpl extends ServiceImpl<ConditionAsses
 	 */
 	@Override
 	public List<ConditionAssessmentEO> getProjectStatusAssessList(List<String> projectLawsInventoryIdList) {
-		List<ConditionAssessmentEO> result = null;
-
+		List<ConditionAssessmentEO> result = new ArrayList<>();
 		QueryWrapper<ConditionAssessmentEO> queryWrapper = new QueryWrapper<>();
 		queryWrapper.lambda().in(ConditionAssessmentEO::getProjectLawsInventoryId,projectLawsInventoryIdList);
-
 		List<ConditionAssessmentEO> projectTaskInventoryConditionAssessmentEOList = this.baseMapper.selectList(queryWrapper);
-		if(CollectionUtils.isNotEmpty(projectTaskInventoryConditionAssessmentEOList)){
-			if(projectTaskInventoryConditionAssessmentEOList.size()>1){
-				// 匿名比较器排序
-				Collections.sort(projectTaskInventoryConditionAssessmentEOList, new Comparator<ConditionAssessmentEO>() {
-					@Override
-					public int compare(ConditionAssessmentEO p1, ConditionAssessmentEO p2) {
-						return p1.getConditionAssessment().compareTo(p2.getConditionAssessment());
-					}
-				});
-			}
 
-			ConditionAssessmentEO conditionAssessmentEO = projectTaskInventoryConditionAssessmentEOList.get(0);
-			result.add(conditionAssessmentEO);
+		for (String  projectLawsInventoryId : projectLawsInventoryIdList) {
+			List<ConditionAssessmentEO> collect = projectTaskInventoryConditionAssessmentEOList.stream()
+					.filter(e -> projectLawsInventoryId.equals(e.getProjectLawsInventoryId())).collect(Collectors.toList());
+
+			if(CollectionUtils.isNotEmpty(collect)){
+				if(collect.size()>1){
+					// 匿名比较器排序
+					Collections.sort(collect, new Comparator<ConditionAssessmentEO>() {
+						@Override
+						public int compare(ConditionAssessmentEO p1, ConditionAssessmentEO p2) {
+							return p1.getConditionAssessment().compareTo(p2.getConditionAssessment());
+						}
+					});
+				}
+				ConditionAssessmentEO conditionAssessmentEO = collect.get(0);
+				result.add(conditionAssessmentEO);
+			}
 		}
 		return result;
 	}