Skip to content

A
amos-boot-zx-biz
Commit 688e82b7 authored by 朱晨阳's avatar 朱晨阳
Browse files
Options

解决冲突

parent 8113f82a
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/CommonServiceImpl.java
View file @ 688e82b7
...@@ -551,8 +551,7 @@ public class CommonServiceImpl { ...@@ -551,8 +551,7 @@ public class CommonServiceImpl {
Path currentWorkingDir = Paths.get(""); Path currentWorkingDir = Paths.get("");
// 获取当前工作目录 // 获取当前工作目录
Path rootDir = currentWorkingDir; Path rootDir = currentWorkingDir;
Path ziLiaoDir = createUniqueDirectory(rootDir, "批量资料"); Path ziLiaoDir =rootDir.resolve("批量资料");
// Path ziLiaoDir =rootDir.resolve("批量资料");
for (String peasantHouseholdId : peasantHouseholdIds) { for (String peasantHouseholdId : peasantHouseholdIds) {
SurveyInfoAllDto returnDto = surveyInformationServiceImpl.querySurveyInfo(surveyInformationId, peasantHouseholdId, processInstanceId, null); SurveyInfoAllDto returnDto = surveyInformationServiceImpl.querySurveyInfo(surveyInformationId, peasantHouseholdId, processInstanceId, null);
fileName = returnDto.getSurveyInformation().getOwnersName(); fileName = returnDto.getSurveyInformation().getOwnersName();
...@@ -1401,7 +1400,7 @@ public class CommonServiceImpl { ...@@ -1401,7 +1400,7 @@ public class CommonServiceImpl {
this.cleanup(folderPath); this.cleanup(folderPath);
throw new BadRequest("所选文件总大小不得超过500M,当前所选文件总大小为"+totalNum+"M"); throw new BadRequest("所选文件总大小不得超过500M,当前所选文件总大小为"+totalNum+"M");
} }
response.setContentLengthLong((int) totalSize); // response.setContentLengthLong((int) totalSize);
addFolderToZip(zipFilePath, folderPath, zos,response); addFolderToZip(zipFilePath, folderPath, zos,response);
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment