From 08eefab8f0b04018dc62928ec2191bcae9d3e7d0 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 15 十月 2021 16:25:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AssemblyUtils.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AssemblyUtils.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AssemblyUtils.java
index b3eae4f..eb24549 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AssemblyUtils.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AssemblyUtils.java
@@ -25,6 +25,8 @@
List<List<Object>> resultList = new ArrayList<>();
//构建单个用户数据
List<Object> userData = new ArrayList<>();
+
+ String noExport = "以上信息仅用于疫苗防控";
//遍历答案列表
Long reserveRecordId = 0L;
Long reserveSubId = 0L;
@@ -33,7 +35,8 @@
if (answerContentVOList != null && answerContentVOList.size() > 0) {
for (ComActQuestnaireAnswerContentVO userAnswers : answerContentVOList) {
//判断是文字描述直接跳过
- if (userAnswers.getOptionType().equals(5) || userAnswers.getOptionType().equals(11)) {
+ if (userAnswers.getOptionType().equals(5) || userAnswers.getOptionType().equals(11)
+ || (StringUtils.isNotEmpty(userAnswers.getAnswerContent()) && userAnswers.getAnswerContent().contains(noExport))) {
continue;
}
//判断reserveRecordId为空则为第一条记录,默认加上昵称和灯谜是
@@ -70,6 +73,11 @@
if(!reserveSubId.equals(userAnswers.getReserveSubId())){
reserveSubId = userAnswers.getReserveSubId();
+ //如果是承诺字段则不导出
+ if(StringUtils.isNotEmpty(userAnswers.getAnswerContent()) && userAnswers.getAnswerContent().contains(noExport)){
+ continue;
+ }
+
//判断当前的组件类型是否是图片上传，导出时需要导出图片
if(userAnswers.getOptionType().equals(11)){
reserveSubId = userAnswers.getReserveSubId();
@@ -87,6 +95,11 @@
sb.append(userAnswers.getAnswerContent()==null?"无":userAnswers.getAnswerContent() + ",");
continue;
}else{
+ if(isOldDuo){
+ String answer = sb.toString();
+ userData.add(answer.substring(0, answer.length() - 1));
+ sb = new StringBuffer();
+ }
isOldDuo = false;
}
sb.append(userAnswers.getAnswerContent()==null?"无":userAnswers.getAnswerContent() + ",");
@@ -94,6 +107,10 @@
userData.add(answer.substring(0, answer.length() - 1));
sb = new StringBuffer();
}else{
+ //如果是承诺字段则不导出
+ if(StringUtils.isNotEmpty(userAnswers.getAnswerContent()) && userAnswers.getAnswerContent().contains(noExport)){
+ continue;
+ }
//判断当前的组件类型是否是图片上传，导出时需要导出图片
if(userAnswers.getOptionType().equals(11)){
reserveSubId = userAnswers.getReserveSubId();
@@ -110,6 +127,11 @@
sb.append(userAnswers.getAnswerContent()==null?"无":userAnswers.getAnswerContent() + ",");
continue;
}else{
+ if(isOldDuo){
+ String answer = sb.toString();
+ userData.add(answer.substring(0, answer.length() - 1));
+ sb = new StringBuffer();
+ }
isOldDuo = false;
}
sb.append(userAnswers.getAnswerContent()==null?"无":userAnswers.getAnswerContent() + ",");
--
Gitblit v1.7.1