资金产品查看时基本规则和其他规则分开

src/main/java/com/quantgroup/asset/distribution/model/entity/route/fundproduct/FundProductVo.java

@@ -3,6 +3,7 @@ package com.quantgroup.asset.distribution.model.entity.route.fundproduct;
 import com.quantgroup.asset.distribution.service.jpa.entity.ProductRuleEntity;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -24,12 +25,12 @@ public class FundProductVo {
     private String businessType;
 
     /**
-     * 基本信息和其他信息字段
+     * 基本信息和对应的value
      */
-    private List<ProductRuleEntity> productRuleEntityList;
+    private List<ProductRuleVo> basicRule = new ArrayList<>();
 
     /**
-     * 基本信息和其他信息字段,对应的value
+     * 其他信息和对应的value
      */
-    private Map<Long,String> ruleValueMap;
+    private List<ProductRuleVo> ortherRule = new ArrayList<>();
 }

src/main/java/com/quantgroup/asset/distribution/model/entity/route/fundproduct/ProductRuleVo.java

+package com.quantgroup.asset.distribution.model.entity.route.fundproduct;
+
+import lombok.Data;
+
+import java.sql.Timestamp;
+
+@Data
+public class ProductRuleVo {
+
+    //规则信息
+    private long id;
+    private String ruleName;
+    private String ruleVal;
+    private String ruleEngine;
+    private String ruleChinese;
+    private String textType;
+    private String ruleType;
+    private Byte enable;
+    private Timestamp createdAt;
+    private Timestamp updatedAt;
+
+    //value
+    private String value;
+}

src/main/java/com/quantgroup/asset/distribution/service/route/impl/FundProductServiceImpl.java

@@ -165,7 +165,6 @@ public class FundProductServiceImpl implements IFundProductService {
         //所有的其他规则
         List<ProductRuleEntity> orther = productRuleRepository.getAllByRuleTypeEqualsAndEnableEquals("ORTHER", Byte.valueOf("1"));
         basic.addAll(orther);
-        fundProductVo.setProductRuleEntityList(basic);
         //3.基本信息和其他信息字段,对应的value
         Map<Long,String> map = new HashMap<>();
         //3.1解析基本规则10 <= age && age <= 50 && 10 <= amount && amount <= 20000 && term == 12 && ! include(not_permit_tels,tel)
@@ -237,7 +236,16 @@ public class FundProductServiceImpl implements IFundProductService {
                     break;
             }
         }
-        fundProductVo.setRuleValueMap(map);
+        for (ProductRuleEntity productRuleEntity:basic){
+            ProductRuleVo productRuleVo = new ProductRuleVo();
+            BeanUtils.copyProperties(productRuleEntity,productRuleVo);
+            productRuleVo.setValue(map.computeIfAbsent(productRuleEntity.getId(),k->""));
+            if ("BASIC".equals(productRuleVo.getRuleType())){
+                fundProductVo.getBasicRule().add(productRuleVo);
+            }else if ("ORTHER".equals(productRuleVo.getRuleType())){
+                fundProductVo.getOrtherRule().add(productRuleVo);
+            }
+        }
         return fundProductVo;
     }