人群包回显处理

src/main/java/com/yaoyaozw/customer/service/impl/CrowdPackageServiceImpl.java

@@ -34,9 +34,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -133,6 +132,14 @@ public class CrowdPackageServiceImpl extends ServiceImpl<MaterialCrowdPackageMap
         List<CrowdPackageConditionMatch> conditionMatchList = matchService.list(new QueryWrapper<CrowdPackageConditionMatch>().eq("package_id", id));
         JSONArray jsonArray = JSONUtil.parseArray(conditionMatchList);
         List<CrowdPackageConditionMatchVO> parseConditionList = jsonArray.toList(CrowdPackageConditionMatchVO.class);
+        // 获取条件的主体
+        if (CollectionUtil.isNotEmpty(parseConditionList)) {
+            Set<String> conditionIdSet = parseConditionList.stream().map(CrowdPackageConditionMatchVO::getConditionId).collect(Collectors.toSet());
+            List<CrowdPackageCondition> conditionList = conditionService.list(new QueryWrapper<CrowdPackageCondition>().in("id", conditionIdSet));
+            Map<Long, CrowdPackageCondition> conditionMap = conditionList.stream().collect(Collectors.toMap(CrowdPackageCondition::getId, Function.identity()));
+
+            parseConditionList.forEach(item -> item.setConditionEntity(conditionMap.get(item.longConditionId())));
+        }
         vo.setConditionList(parseConditionList);
         return new GenericsResult<>(vo);
     }

src/main/java/com/yaoyaozw/customer/vo/crowd/CrowdPackageConditionMatchVO.java

 package com.yaoyaozw.customer.vo.crowd;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.yaoyaozw.customer.entity.CrowdPackageCondition;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -33,6 +34,7 @@ public class CrowdPackageConditionMatchVO implements Serializable {
     @ApiModelProperty("条件表主键ID")
     private Long conditionId;
 
+    private CrowdPackageCondition conditionEntity;
 
     /**
      * 条件描述
@@ -46,4 +48,8 @@ public class CrowdPackageConditionMatchVO implements Serializable {
         }
         return conditionId.toString();
     }
+
+    public Long longConditionId() {
+        return this.conditionId;
+    }
 }