From 49c72fa8ce5557faeaaee7784e86ceafcc12877c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 16 九月 2021 09:09:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_bak' into test_bak
---
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActReserveApi.java | 64 +++++++++++++++----------------
1 files changed, 31 insertions(+), 33 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActReserveApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActReserveApi.java
index 4e6d3ee..1559193 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActReserveApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActReserveApi.java
@@ -487,7 +487,7 @@
String firstRowContent = "登记明细";
List<String> head0 = new ArrayList<>();
head0.add(firstRowContent);
- head0.add("姓名");
+ head0.add("登记人昵称");
headList.add(head0);
List<String> head1 = new ArrayList<>();
head1.add(firstRowContent);
@@ -497,7 +497,11 @@
if (sub.getType() != 5) {
List<String> headn = new ArrayList<>();
headn.add(firstRowContent);
- headn.add(sub.getContent());
+ if(sub.getType() == 11){
+ headn.add(sub.getContent().substring(0, sub.getContent().indexOf("（")));
+ }else{
+ headn.add(sub.getContent());
+ }
headList.add(headn);
}
});
@@ -593,18 +597,14 @@
if (!reserveRecordId.equals(userAnswers.getReserveRecordId())) {
reserveSubId = 0L;
- String answer = sb.toString();
- userData.add(answer.substring(0, answer.length() - 1));
- sb = new StringBuffer();
- resultList.add(userData);
-
userData = new ArrayList<>();
reserveRecordId = userAnswers.getReserveRecordId();
userData.add(userAnswers.getNickName());
userData.add(DateUtils.format(userAnswers.getTime(), DateUtils.ymdhms_format));
- answer = sb.toString();
- if(StringUtils.isEmpty(answer)){
+ if(StringUtils.isNotEmpty(userAnswers.getAnswerContent())){
userData.add(userAnswers.getAnswerContent());
+ }else{
+ userData.add(" ");
}
}else{
if(reserveSubId.equals(0L)){
@@ -613,47 +613,45 @@
if(!reserveSubId.equals(userAnswers.getReserveSubId())){
reserveSubId = userAnswers.getReserveSubId();
- String answer = sb.toString();
- if(StringUtils.isEmpty(answer)){
- sb.append(userAnswers.getAnswerContent() + ",");
- answer = sb.toString();
+
+ //判断当前的组件类型是否是图片上传，导出时需要导出图片
+ if(userAnswers.getOptionType().equals(11)){
+ reserveSubId = userAnswers.getReserveSubId();
+ try {
+ userData.add(new URL(userAnswers.getAnswerContent()));
+ }catch (Exception e){
+ userData.add(" ");
+ log.error("导出转换图片失败！");
+ }
+ continue;
}
+ sb.append(userAnswers.getAnswerContent()==null?"无":userAnswers.getAnswerContent() + ",");
+ String answer = sb.toString();
userData.add(answer.substring(0, answer.length() - 1));
sb = new StringBuffer();
-
- //判断当前的组件类型是否是图片上传，导出时需要导出图片
- if(userAnswers.getOptionType().equals(11)){
- reserveSubId = userAnswers.getReserveSubId();
- try {
- userData.add(new URL(userAnswers.getAnswerContent()));
- }catch (Exception e){
- userData.add("");
- log.error("导出转换图片失败！");
- }
- continue;
- }
- sb.append(userAnswers.getAnswerContent() + ",");
}else{
-
//判断当前的组件类型是否是图片上传，导出时需要导出图片
if(userAnswers.getOptionType().equals(11)){
reserveSubId = userAnswers.getReserveSubId();
try {
userData.add(new URL(userAnswers.getAnswerContent()));
}catch (Exception e){
- userData.add("");
+ userData.add(" ");
log.error("导出转换图片失败！");
}
continue;
}
- sb.append(userAnswers.getAnswerContent() + ",");
+ sb.append(userAnswers.getAnswerContent()==null?"无":userAnswers.getAnswerContent() + ",");
+ String answer = sb.toString();
+ userData.add(answer.substring(0, answer.length() - 1));
+ sb = new StringBuffer();
}
}
}
- String answer = sb.toString();
- if(StringUtils.isNotEmpty(answer)){
- userData.add(answer.substring(0, answer.length() - 1));
- }
+// String answer = sb.toString();
+// if(StringUtils.isNotEmpty(answer)){
+// userData.add(answer.substring(0, answer.length() - 1));
+// }
resultList.add(userData);
}
return resultList;
--
Gitblit v1.7.1