资料上传

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

@@ -554,9 +554,11 @@ public class CommonServiceImpl {
           for (String peasantHouseholdId : peasantHouseholdIds) {
             SurveyInfoAllDto returnDto = surveyInformationServiceImpl.querySurveyInfo(surveyInformationId, peasantHouseholdId, processInstanceId, null);
             fileName = returnDto.getSurveyInformation().getOwnersName();
-
+            if (!redisKey.contains(",")){
                 redisUtils.set(redisKey, MapBuilder.<String, Object>create()
                         .put("value", currentBili).build());
+            }
+
             String powerStationInstanceId = powerStationMapper.getInstanceIdByhouseId(peasantHouseholdId);
             String financingInstanceId  = financingAuditingMapper.getInstanceIdByhouseId(peasantHouseholdId);
             List<LinkedHashMap> powerStationWorkLog = new ArrayList<>();
@@ -859,20 +861,22 @@ public class CommonServiceImpl {
             }
 
             //  response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename="+returnDto.getSurveyInformation().getOwnersName()+".zip");
+              if (redisKey.contains(",")){
                   currentBili = currentBili + baifenbi;
                   redisUtils.set(redisKey,MapBuilder.<String, Object>create()
                           .put("value", currentBili).build());
               }
+        }
 
         String encodedFilename = "";
         response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
         if (peasantHouseholdIds.size() > 1){
             fileName = "批量资料";
-            encodedFilename = URLEncoder.encode( "批量资料.zip", StandardCharsets.UTF_8.name());
+
             response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName+".zip", "UTF-8"));
             createZipFile(ziLiaoDir, fileName,response);
         }else {
-            encodedFilename = URLEncoder.encode( fileName+".zip", StandardCharsets.UTF_8.name());
+
             response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName+".zip", "UTF-8"));
             createZipFile(ziLiaoDir, "批量资料/"+fileName,response);
         }