From c3811d01d1929a98a0f34f70ca187d82ee312dbb Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期三, 03 十一月 2021 17:26:50 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AssemblyUtils.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 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 eb24549..1db88f6 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
@@ -3,6 +3,8 @@
import com.panzhihua.common.model.vos.community.ComActQuestnaireAnswerContentVO;
import lombok.extern.slf4j.Slf4j;
+import javax.xml.bind.DatatypeConverter;
+import java.io.ByteArrayInputStream;
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
@@ -89,6 +91,17 @@
}
continue;
}
+ //判断当前组件类型是否签名
+ if(userAnswers.getOptionType().equals(12)){
+ reserveSubId = userAnswers.getReserveSubId();
+ try {
+ userData.add(new ByteArrayInputStream(DatatypeConverter.parseBase64Binary(userAnswers.getAnswerContent().substring(userAnswers.getAnswerContent().indexOf("，")+ 1))));
+ }catch (Exception e){
+ userData.add(" ");
+ log.error("导出转换图片失败！");
+ }
+ continue;
+ }
if(userAnswers.getOptionType().equals(1)){
isOldDuo = true;
@@ -122,6 +135,17 @@
}
continue;
}
+ //判断当前组件类型是否签名
+ if(userAnswers.getOptionType().equals(12)){
+ reserveSubId = userAnswers.getReserveSubId();
+ try {
+ userData.add(new ByteArrayInputStream(DatatypeConverter.parseBase64Binary(userAnswers.getAnswerContent().substring(userAnswers.getAnswerContent().indexOf("，")+ 1))));
+ }catch (Exception e){
+ userData.add(" ");
+ log.error("导出转换图片失败！");
+ }
+ continue;
+ }
if(userAnswers.getOptionType().equals(1)){
isOldDuo = true;
sb.append(userAnswers.getAnswerContent()==null?"无":userAnswers.getAnswerContent() + ",");
--
Gitblit v1.7.1