From b00e99040a54b9342debd14fa82b14b0aab1cea0 Mon Sep 17 00:00:00 2001 From: luoyuanqiao <2376770955@qq.com> Date: 星期四, 24 二月 2022 11:25:43 +0800 Subject: [PATCH] bug修复 --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AssemblyUtils.java | 22 ++++++---------------- 1 files changed, 6 insertions(+), 16 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 43a52bb..722fa99 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 @@ -2,7 +2,6 @@ import com.panzhihua.common.model.vos.community.ComActQuestnaireAnswerContentVO; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.io.FileUtils; import javax.imageio.ImageIO; import javax.xml.bind.DatatypeConverter; @@ -34,14 +33,19 @@ //构建单个用户数据 List<Object> userData = new ArrayList<>(); - String noExport = "以上信息仅用于疫苗防控"; + String noExport = "以上信息仅用于"; //遍历答案列表 Long reserveRecordId = 0L; Long reserveSubId = 0L; Boolean isOldDuo = false; StringBuffer sb = new StringBuffer(); if (answerContentVOList != null && answerContentVOList.size() > 0) { + int a=0; for (ComActQuestnaireAnswerContentVO userAnswers : answerContentVOList) { + a++; + if(answerContentVOList.size()==26&&a==9){ + userData.add(" "); + } //判断是文字描述直接跳过 if (userAnswers.getOptionType().equals(5) || userAnswers.getOptionType().equals(11) || (StringUtils.isNotEmpty(userAnswers.getAnswerContent()) && userAnswers.getAnswerContent().contains(noExport))) { @@ -179,19 +183,5 @@ resultList.add(userData); } return resultList; - } - - public static File createTmpFile(InputStream inputStream, String name, String ext, File tmpDirFile) throws IOException { - File resultFile = File.createTempFile(name, '.' + ext, tmpDirFile); - resultFile.deleteOnExit(); - FileUtils.copyToFile(inputStream, resultFile); - return resultFile; - } - - public static File bytesToFile(byte[] bytes, String fileType) throws IOException { - return createTmpFile(new ByteArrayInputStream(bytes), - UUID.randomUUID().toString(), - fileType, - Files.createTempDirectory("tempFile").toFile()); } } -- Gitblit v1.7.1