From c9f757b9cbfcea425179eca92d310319c1aac8b6 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 15 Mar 2024 11:34:46 +0800
Subject: [PATCH] fix:走航日报补充提交
---
screen-api/src/main/java/com/moral/api/controller/CruiserController.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/CruiserController.java b/screen-api/src/main/java/com/moral/api/controller/CruiserController.java
index 06f0500..23c3e71 100644
--- a/screen-api/src/main/java/com/moral/api/controller/CruiserController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/CruiserController.java
@@ -164,6 +164,9 @@
public void loadDaily( @RequestBody Map<String,Object> params,HttpServletResponse response) throws IOException {
List<Integer> ids = (List<Integer>) params.get("ids");
List<DailyVo> dailyVos = specialDeviceService.loadDaily(ids);
+ if (ObjectUtils.isEmpty(dailyVos)){
+ throw new BusinessException("���������������������");
+ }
dailyDocx(dailyVos,response);
}
@@ -509,9 +512,12 @@
}*/
-
+ String name = dailyVos.get(0).getName();
+ String type = dailyVos.get(0).getType();
map.put("code",builder);
map.put("time1",DateUtils.getCurCNDate());
+ map.put("name",name);
+ map.put("type",type);
// map.put("pho",new PictureRenderData(100, 100, "G:\\home\\3d423e3cb05d7edc35c38e3173af2a0d.jpg"));
// map.put("pho1",new PictureRenderData(500, 500, path+"\\0a4ab467-304d-4871-948f-55aa7e820975.png"));
@@ -523,6 +529,8 @@
put("time1",map.get("time1"));
// put("pho", map.get("pho"));
// put("pho1", map.get("pho1"));
+ put("name",map.get("name"));
+ put("type",map.get("type"));
put("detailList1", detailList1);
put("detailList2", detailList2);
put("detailList3", detailList3);
@@ -547,6 +555,7 @@
response.setContentType("multipart/form-data");
// ���������������
response.addHeader("Content-Disposition", "attachment;fileName=ce.docx" );
+// response.setHeader("Content-Disposition", "attachment; filename=\"" + name+type+"������������" + "\"");
response.setCharacterEncoding("UTF-8");
//���������������
/* File file1 = new File("G:\\test\\test2.docx");
--
Gitblit v1.8.0