luyan
/
epmet-cloud-lingshan
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

分析报告还差一个级联组件

master
yinzuomei 4 years ago
parent
83c1b49dc6
commit
f51cba4d8d
5 changed files with 146 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 29
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/OptionDTO.java
  2. 1
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/CheckboxExpandStruct.java
  3. 2
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/RadioExpandStruct.java
  4. 1
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/SelectExpandStruct.java
  5. 115
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java

29
epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/OptionDTO.java
View File

@ -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;
}

1
epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/CheckboxExpandStruct.java
View File

@ -36,6 +36,7 @@ public class CheckboxExpandStruct {
private List<Option> options;
@Data
public static class Option {
public String label;
public Integer value;

2
epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/RadioExpandStruct.java
View File

@ -23,7 +23,7 @@ public class RadioExpandStruct {
*/
private List<Option> options;
@Data
public static class Option {
public String label;
public Integer value;

1
epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/SelectExpandStruct.java
View File

@ -40,6 +40,7 @@ public class SelectExpandStruct {
private String controlsPosition;
@Data
public static class Option {
public String label;
public Integer value;

115
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
View File

@ -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);
}
//共选择了多少次，每道题相加
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;

Write Preview
Loading…
Cancel
Save