Переглянути джерело

fix: 结算单下载-文件名去掉逗号(谷歌浏览器不识别)

lixuesong 1 рік тому
батько
коміт
9bdd2dc734

+ 4 - 1
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmPayOffController.java

@@ -456,6 +456,9 @@ public class WmPayOffController {
 			packageDetail.setScorePackageName(scorePackage.getScorePackageName());
 			// 结算信息
 			List<WmScorePackageSettleNote> settleNotes = settleNoteMap.get(scorePackage.getId());
+			if (CollUtil.isEmpty(settleNotes)) {
+				continue;
+			}
 			// 实际到账金额
 			BigDecimal settleAmount = settleNotes.stream()
 					.map(WmScorePackageSettleNote::getSettleAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -513,7 +516,7 @@ public class WmPayOffController {
 			response.reset();
 			//设置response的Header
 			response.addHeader("Content-Disposition",
-					String.format("attachment;filename=请款申请单(%s)-%s.docx", String.join(",", packageIds), DateUtil.format(LocalDateTime.now(),
+					String.format("attachment;filename=请款申请单(%s)-%s.docx", String.join("_", packageIds), DateUtil.format(LocalDateTime.now(),
 							DatePattern.PURE_DATETIME_PATTERN)));
 			response.setContentType("application/vnd.openxmlformats-officedocument.wordprocessingml.document");
 			OutputStream os = new BufferedOutputStream(response.getOutputStream());