From f51cba4d8d8e1558d3c3b154076718a385aef078 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 17 Sep 2021 16:47:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E6=9E=90=E6=8A=A5=E5=91=8A=E8=BF=98?=
 =?UTF-8?q?=E5=B7=AE=E4=B8=80=E4=B8=AA=E7=BA=A7=E8=81=94=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/epmettduck/result/OptionDTO.java      |  29 +++++
 .../struct/CheckboxExpandStruct.java          |   1 +
 .../epmettduck/struct/RadioExpandStruct.java  |   2 +-
 .../epmettduck/struct/SelectExpandStruct.java |   1 +
 .../impl/PrUserProjectServiceImpl.java        | 117 +++++++++++++++++-
 5 files changed, 146 insertions(+), 4 deletions(-)
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/OptionDTO.java

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/OptionDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/OptionDTO.java
new file mode 100644
index 0000000000..c1d64bba1e
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/OptionDTO.java
@@ -0,0 +1,29 @@
+package com.epmet.dataaggre.dto.epmettduck.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author yinzuomei
+ * @Date 2021/9/17 3:25 下午
+ */
+@Data
+public class OptionDTO implements Serializable {
+    /**
+     * 选项题目
+     */
+    private String label;
+
+    /**
+     * 答案值
+     */
+    private Integer value;
+
+    /**
+     * 多少个人选择此答案
+     */
+    private Integer currentCount=0;
+}
+
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/CheckboxExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/CheckboxExpandStruct.java
index 788bb12aa9..09b4978f57 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/CheckboxExpandStruct.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/CheckboxExpandStruct.java
@@ -36,6 +36,7 @@ public class CheckboxExpandStruct {
     private List<Option> options;
 
 
+    @Data
     public static class Option {
         public String label;
         public Integer value;
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/RadioExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/RadioExpandStruct.java
index a9ea86b5d4..5a4455fd31 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/RadioExpandStruct.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/RadioExpandStruct.java
@@ -23,7 +23,7 @@ public class RadioExpandStruct {
      */
     private List<Option> options;
 
-
+    @Data
     public static class Option {
         public String label;
         public Integer value;
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/SelectExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/SelectExpandStruct.java
index 27788d5ea6..0eaacde3b6 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/SelectExpandStruct.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/SelectExpandStruct.java
@@ -40,6 +40,7 @@ public class SelectExpandStruct {
     private String controlsPosition;
 
 
+    @Data
     public static class Option {
         public String label;
         public Integer value;
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 0739d25834..db180c3bf4 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
@@ -32,8 +32,12 @@ import com.epmet.dataaggre.dao.epmettduck.PrUserProjectDao;
 import com.epmet.dataaggre.dto.epmettduck.PrUserProjectDTO;
 import com.epmet.dataaggre.dto.epmettduck.ProjectItemTypeEnum;
 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.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.entity.epmettduck.PrUserProjectEntity;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectResultEntity;
 import com.epmet.dataaggre.service.epmettduck.PrUserProjectService;
@@ -165,6 +169,7 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
                 ||ProjectItemTypeEnum.DATE_RANGE.getValue().equals(currentType)){
 
                 for(PrUserProjectResultEntity res:resultList){
+
                     JSONObject originalData = JSON.parseObject(res.getOriginalData());
                     //手机号、邮箱、身份证、单行文本: INPUT
                     //多行文本
@@ -181,8 +186,8 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
                         }else{
                             log.warn("没有当前的key:,可能用户没填写吧"+key);
                         }
+                        continue;
                     }
-
                     //省市联动： PROVINCE_CITY
                     //时间范围选择
                     //日期范围选择
@@ -195,7 +200,9 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
                                 validTotal+=1;
                             }
                         }
+                        continue;
                     }
+
                     //地理位置：INPUT_MAP
                     if(ProjectItemTypeEnum.INPUT_MAP.getValue().equals(currentType)){
                         if(originalData.containsKey(key)){
@@ -205,6 +212,8 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
                                 validTotal += 1;
                             }
                         }
+                        //不加也行，后面也没有代码块了
+                        continue;
                     }
                 }
 
@@ -212,12 +221,114 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
                 item.setDetail(detail);
                 continue;
             }
+            // 3、下拉选择、级联选择、单选框组、多选框组显示不同选项选择次数、所占比例
+            //3.1、下拉选择
+            if (ProjectItemTypeEnum.SELECT.getValue().equals(currentType)) {
+                SelectExpandStruct selectExpandStruct = JSON.parseObject(item.getExpand(), SelectExpandStruct.class);
+                List<OptionDTO> options = new ArrayList<>();
+                if (null != selectExpandStruct) {
+                    options = ConvertUtils.sourceToTarget(selectExpandStruct.getOptions(), OptionDTO.class);
+                }
 
-            //3、下拉选择、级联选择、单选框组、多选框组显示不同选项选择次数、所占比例
-            if(ProjectItemTypeEnum.SELECT.getValue().equals(currentType)){
+                //共选择了多少次，每道题相加
+                int totalCount = 0;
+                for (OptionDTO optionDTO : options) {
+                    //currentCount：每道题，被选了多少次？
+                    int currentCount = 0;
+                    for (PrUserProjectResultEntity res : resultList) {
+                        JSONObject originalData = JSON.parseObject(res.getOriginalData());
+                        if (selectExpandStruct.getMultiple()) {
+                            //多选
+                            if(originalData.containsKey(key)){
+                                List<Integer> answers = (List<Integer>) originalData.get(key);
+                                if (!CollectionUtils.isEmpty(answers) && answers.contains(optionDTO.getValue())) {
+                                    currentCount += 1;
+                                }
+                            }
 
+                        } else {
+                            //单选
+                            if(originalData.containsKey(key)){
+                                Integer answer = (Integer) originalData.get(key);
+                                if (null != answer && optionDTO.getValue() == answer) {
+                                    currentCount += 1;
+                                }
+                            }
+                        }
+                    }
+                    optionDTO.setCurrentCount(currentCount);
+                    totalCount += currentCount;
+                }
+                detail.put("totalCount", totalCount);
+                detail.put("options", options);
+                item.setDetail(detail);
                 continue;
             }
+            // 3.2 单选
+            if (ProjectItemTypeEnum.RADIO.getValue().equals(currentType)) {
+                RadioExpandStruct radioExpandStruct = JSON.parseObject(item.getExpand(), RadioExpandStruct.class);
+                List<OptionDTO> options = new ArrayList<>();
+                if (null != radioExpandStruct) {
+                    options = ConvertUtils.sourceToTarget(radioExpandStruct.getOptions(), OptionDTO.class);
+                }
+
+                //共选择了多少次，每道题相加
+                int totalCount = 0;
+                for (OptionDTO optionDTO : options) {
+                    //currentCount：每道题，被选了多少次？
+                    int currentCount = 0;
+                    for (PrUserProjectResultEntity res : resultList) {
+                        JSONObject originalData = JSON.parseObject(res.getOriginalData());
+                        //单选
+                        if(originalData.containsKey(key)){
+                            Integer answer = (Integer) originalData.get(key);
+                            if (null != answer && optionDTO.getValue() == answer) {
+                                currentCount += 1;
+                            }
+                        }
+                    }
+                    optionDTO.setCurrentCount(currentCount);
+                    totalCount += currentCount;
+                }
+                detail.put("totalCount", totalCount);
+                detail.put("options", options);
+                item.setDetail(detail);
+                continue;
+            }
+
+            // 3.3多选
+            if (ProjectItemTypeEnum.CHECKBOX.getValue().equals(currentType)) {
+                CheckboxExpandStruct checkboxExpandStruct = JSON.parseObject(item.getExpand(), CheckboxExpandStruct.class);
+                List<OptionDTO> options = new ArrayList<>();
+                if (null != checkboxExpandStruct) {
+                    options = ConvertUtils.sourceToTarget(checkboxExpandStruct.getOptions(), OptionDTO.class);
+                }
+
+                //共选择了多少次，每道题相加
+                int totalCount = 0;
+                for (OptionDTO optionDTO : options) {
+                    //currentCount：每道题，被选了多少次？
+                    int currentCount = 0;
+                    for (PrUserProjectResultEntity res : resultList) {
+                        JSONObject originalData = JSON.parseObject(res.getOriginalData());
+                        //多选
+                        if(originalData.containsKey(key)){
+                            List<Integer> answers = (List<Integer>) originalData.get(key);
+                            if (!CollectionUtils.isEmpty(answers) && answers.contains(optionDTO.getValue())) {
+                                currentCount += 1;
+                            }
+                        }
+                    }
+                    optionDTO.setCurrentCount(currentCount);
+                    totalCount += currentCount;
+                }
+                detail.put("totalCount", totalCount);
+                detail.put("options", options);
+                item.setDetail(detail);
+                continue;
+            }
+
+
             if(ProjectItemTypeEnum.CASCADER.getValue().equals(currentType)){
 
                 continue;