解决冲突

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/CommonServiceImpl.java

@@ -551,8 +551,7 @@ public class CommonServiceImpl {
         Path currentWorkingDir = Paths.get("");
         // 获取当前工作目录
         Path rootDir = currentWorkingDir;
-        Path ziLiaoDir = createUniqueDirectory(rootDir, "批量资料");
-       // Path ziLiaoDir =rootDir.resolve("批量资料");
+        Path ziLiaoDir =rootDir.resolve("批量资料");
           for (String peasantHouseholdId : peasantHouseholdIds) {
             SurveyInfoAllDto returnDto = surveyInformationServiceImpl.querySurveyInfo(surveyInformationId, peasantHouseholdId, processInstanceId, null);
             fileName = returnDto.getSurveyInformation().getOwnersName();
@@ -1401,7 +1400,7 @@ public class CommonServiceImpl {
                this.cleanup(folderPath);
                throw new BadRequest("所选文件总大小不得超过500M,当前所选文件总大小为"+totalNum+"M");
            }
-            response.setContentLengthLong((int) totalSize);
+     //       response.setContentLengthLong((int) totalSize);
             addFolderToZip(zipFilePath, folderPath, zos,response);
         } catch (IOException e) {
             e.printStackTrace();