From c7ac655756cc3faeab7f1f86c288ba7b86abe78c Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 17 Sep 2021 17:35:18 +0800
Subject: [PATCH] todo1

---
 .../dto/epmettduck/struct/CascaderExpandStruct.java       | 1 +
 .../service/epmettduck/impl/PrUserProjectServiceImpl.java | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/CascaderExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/CascaderExpandStruct.java
index ebc62596f8..c572f882af 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/CascaderExpandStruct.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/CascaderExpandStruct.java
@@ -36,6 +36,7 @@ public class CascaderExpandStruct {
      */
     private Boolean showAllLevels;
 
+    @Data
     public static class Option {
         public Integer id;
         public String label;
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
index 3617e5a3b9..85af5a1598 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
@@ -37,10 +37,7 @@ import com.epmet.dataaggre.dto.epmettduck.result.AnalysisReportResDTO;
 import com.epmet.dataaggre.dto.epmettduck.result.OptionDTO;
 import com.epmet.dataaggre.dto.epmettduck.result.ProjectProfileResultDTO;
 import com.epmet.dataaggre.dto.epmettduck.result.TDuckListResultDTO;
-import com.epmet.dataaggre.dto.epmettduck.struct.CheckboxExpandStruct;
-import com.epmet.dataaggre.dto.epmettduck.struct.RadioExpandStruct;
-import com.epmet.dataaggre.dto.epmettduck.struct.RateExpandStruct;
-import com.epmet.dataaggre.dto.epmettduck.struct.SelectExpandStruct;
+import com.epmet.dataaggre.dto.epmettduck.struct.*;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectResultEntity;
 import com.epmet.dataaggre.service.epmettduck.PrUserProjectService;
@@ -362,6 +359,9 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
 
             //3.4级联 todo
             if(ProjectItemTypeEnum.CASCADER.getValue().equals(currentType)){
+                CascaderExpandStruct cascaderExpandStruct = JSON.parseObject(item.getExpand(), CascaderExpandStruct.class);
+
+
 
                 continue;
             }