From b72144f43b9851a9fc30678115869cca451af6e7 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期六, 13 八月 2022 16:58:56 +0800
Subject: [PATCH] 修改打包名称辨识

---
 src/main/java/com/whyc/service/ProductBomService.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/whyc/service/ProductBomService.java b/src/main/java/com/whyc/service/ProductBomService.java
index 5c2bc7c..8d6f067 100644
--- a/src/main/java/com/whyc/service/ProductBomService.java
+++ b/src/main/java/com/whyc/service/ProductBomService.java
@@ -58,7 +58,7 @@
         font.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD);
         cellStyle.setFont(font);
         //鐢熸垚excel骞跺皢dwg鏂囦欢鏀惧湪鍚屼竴鎶ヤ笅鍘嬬缉
-        creatBomExcel(req,resp,boms,wb);
+        creatBomExcel(req,resp,boms,wb,"pic");
         //璁板綍鏃ュ織
         DocUser docUser= ActionUtil.getUser();
         String operationDetail="鍏蜂綋鍥剧焊涓烘暟閲�:"+boms.size();
@@ -205,7 +205,7 @@
             }
         }
         //鐢熸垚excel骞跺皢dwg鏂囦欢鏀惧湪鍚屼竴鎶ヤ笅鍘嬬缉
-        creatBomExcel(req,resp,list,wb);
+        creatBomExcel(req,resp,list,wb,"bom");
         //璁板綍鏃ュ織
         DocUser docUser= ActionUtil.getUser();
         String operationDetail="鍏蜂綋浜у搧姣嶆枡鍨嬪彿涓�:"+parentModel;
@@ -214,7 +214,7 @@
         logService.recordOperationLog(docUser.getId(),docUser.getName(), UserOperation.TYPE_DOWNLOAD.getType(),new Date(),terminalIp,opreationMsg,operationDetail);
     }
     //鏍规嵁浜у搧淇℃伅鍒涘缓excel琛ㄦ牸骞跺瓨鏀惧湪鎸囧畾鐩綍
-    public void creatBomExcel(HttpServletRequest req, HttpServletResponse resp,List list, HSSFWorkbook wb){
+    public void creatBomExcel(HttpServletRequest req, HttpServletResponse resp,List list, HSSFWorkbook wb,String type){
         String fileDirName = FileDirPath.getFileDirName();
         String rootFace="";
         String excelName="";
@@ -333,6 +333,10 @@
             File file=new File(rootFace+".zip");
             FileOutputStream forootFace = new FileOutputStream(file);
             ZipUtils.toZip(rootFace, forootFace,true);
+            String timeStr= ActionUtil.sdfwithFTP.format(new Date());
+            if(type.equals("pic")){
+                excelName=timeStr;
+            }
             // 杞爜闃叉涔辩爜
             resp.addHeader("Content-Disposition", "attachment;filename="
                     + new String(excelName.getBytes("UTF-8"), "ISO8859-1")

--
Gitblit v1.9.1