diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java
index 34456091..1a76e634 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java
@@ -226,34 +226,42 @@ public class PoolAddTaxThread extends BaseThread {
                 pramsMap.put("companyCode",companyCode);
                 // 导出文件名
                 StringBuilder ftpFileName = new StringBuilder();
+                ftpFileName.append(userid);
+                ftpFileName.append(fileSplit);
                 ftpFileName.append(fileNamePrefix);
-                ftpFileName.append(DateUtils.dateToMonthStr(new Date()));
                 ftpFileName.append(fileSplit);
-                if ("99".equals(gfTaxNo)) {
-                    if (gfshList.size() > 0) {
-                        if (StringUtils.isNotEmpty(gfshList.get(0))){
-                            ftpFileName.append(poolPaperService.getblocName(gfshList.get(0)));
-                            ftpFileName.append(fileSplit);
-                        }
-                    }
-                } else {
-                    if (gfshList.size() > 0) {
-//                        for (String s : gfshList) {
-//                            if (StringUtils.isNotEmpty(s)){
-//                                ftpFileName.append(poolPaperService.getGfName(s));
-//                                ftpFileName.append(fileSplit);
-//                            }
-//                        }
-                        if (StringUtils.isNotEmpty(gfshList.get(0))){
-                            ftpFileName.append(poolPaperService.getGfName(gfshList.get(0)));
-                            ftpFileName.append(fileSplit);
-                        }
-                    }
-                }
-
-                ftpFileName.append(DateUtils.getNowTimeStamp());
-                title = ftpFileName.toString();
+                ftpFileName.append(DateUtils.getStringDateShort());
+                ftpFileName.append(fileSplit);
+                ftpFileName.append((new Date()).getTime());
                 ftpFileName.append(fileNameSurfix);
+//                ftpFileName.append(fileNamePrefix);
+//                ftpFileName.append(DateUtils.dateToMonthStr(new Date()));
+//                ftpFileName.append(fileSplit);
+//                if ("99".equals(gfTaxNo)) {
+//                    if (gfshList.size() > 0) {
+//                        if (StringUtils.isNotEmpty(gfshList.get(0))){
+//                            ftpFileName.append(poolPaperService.getblocName(gfshList.get(0)));
+//                            ftpFileName.append(fileSplit);
+//                        }
+//                    }
+//                } else {
+//                    if (gfshList.size() > 0) {
+////                        for (String s : gfshList) {
+////                            if (StringUtils.isNotEmpty(s)){
+////                                ftpFileName.append(poolPaperService.getGfName(s));
+////                                ftpFileName.append(fileSplit);
+////                            }
+////                        }
+//                        if (StringUtils.isNotEmpty(gfshList.get(0))){
+//                            ftpFileName.append(poolPaperService.getGfName(gfshList.get(0)));
+//                            ftpFileName.append(fileSplit);
+//                        }
+//                    }
+//                }
+//
+//                ftpFileName.append(DateUtils.getNowTimeStamp());
+//                title = ftpFileName.toString();
+//                ftpFileName.append(fileNameSurfix);
 
                 // 本地文件存储路径
                 StringBuilder excelFile = new StringBuilder();
@@ -409,7 +417,7 @@ public class PoolAddTaxThread extends BaseThread {
         if (firstPage) {
             writeSheet = new WriteSheet();
             writeSheet.setSheetNo(sheetNo);
-            writeSheet.setSheetName(sheetName);
+            writeSheet.setSheetName(title);
             writeTable = new WriteTable();
             writeTable.setTableNo(sheetNo);
             List<List<String>> titles = new ArrayList<>();
diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolOtherThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolOtherThread.java
index a08b9f12..ed6fa5c8 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolOtherThread.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolOtherThread.java
@@ -177,34 +177,42 @@ public class PoolOtherThread extends BaseThread {
 
                 // 导出文件名
                 StringBuilder ftpFileName = new StringBuilder();
+                ftpFileName.append(userid);
+                ftpFileName.append(fileSplit);
                 ftpFileName.append(fileNamePrefix);
-                ftpFileName.append(DateUtils.dateToMonthStr(new Date()));
                 ftpFileName.append(fileSplit);
-                if ("99".equals(gfTaxNo)) {
-                    if (gfshList.size() > 0) {
-                        if (StringUtils.isNotEmpty(gfshList.get(0))){
-                            ftpFileName.append(poolPaperService.getblocName(gfshList.get(0)));
-                            ftpFileName.append(fileSplit);
-                        }
-                    }
-                } else {
-                    if (gfshList.size() > 0) {
-//                        for (String s : gfshList) {
-//                            if (StringUtils.isNotEmpty(s)){
-//                                ftpFileName.append(poolPaperService.getGfName(s));
-//                                ftpFileName.append(fileSplit);
-//                            }
-//                        }
-                        if (StringUtils.isNotEmpty(gfshList.get(0))){
-                            ftpFileName.append(poolPaperService.getGfName(gfshList.get(0)));
-                            ftpFileName.append(fileSplit);
-                        }
-                    }
-                }
-
-                ftpFileName.append(DateUtils.getNowTimeStamp());
-                title = ftpFileName.toString();
+                ftpFileName.append(DateUtils.getStringDateShort());
+                ftpFileName.append(fileSplit);
+                ftpFileName.append((new Date()).getTime());
                 ftpFileName.append(fileNameSurfix);
+//                ftpFileName.append(fileNamePrefix);
+//                ftpFileName.append(DateUtils.dateToMonthStr(new Date()));
+//                ftpFileName.append(fileSplit);
+//                if ("99".equals(gfTaxNo)) {
+//                    if (gfshList.size() > 0) {
+//                        if (StringUtils.isNotEmpty(gfshList.get(0))){
+//                            ftpFileName.append(poolPaperService.getblocName(gfshList.get(0)));
+//                            ftpFileName.append(fileSplit);
+//                        }
+//                    }
+//                } else {
+//                    if (gfshList.size() > 0) {
+////                        for (String s : gfshList) {
+////                            if (StringUtils.isNotEmpty(s)){
+////                                ftpFileName.append(poolPaperService.getGfName(s));
+////                                ftpFileName.append(fileSplit);
+////                            }
+////                        }
+//                        if (StringUtils.isNotEmpty(gfshList.get(0))){
+//                            ftpFileName.append(poolPaperService.getGfName(gfshList.get(0)));
+//                            ftpFileName.append(fileSplit);
+//                        }
+//                    }
+//                }
+//
+//                ftpFileName.append(DateUtils.getNowTimeStamp());
+//                title = ftpFileName.toString();
+//                ftpFileName.append(fileNameSurfix);
 
                 // 本地文件存储路径
                 StringBuilder excelFile = new StringBuilder();
diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolSaleThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolSaleThread.java
index 00bc2ddd..cafead54 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolSaleThread.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolSaleThread.java
@@ -225,34 +225,42 @@ public class PoolSaleThread extends BaseThread {
                 pramsMap.put("invoiceSource",prams.getString("invoiceSource"));
                 // 导出文件名
                 StringBuilder ftpFileName = new StringBuilder();
+                ftpFileName.append(userid);
+                ftpFileName.append(fileSplit);
                 ftpFileName.append(fileNamePrefix);
-                ftpFileName.append(DateUtils.dateToMonthStr(new Date()));
                 ftpFileName.append(fileSplit);
-                if ("99".equals(gfTaxNo)) {
-                    if (gfshList.size() > 0) {
-                        if (StringUtils.isNotEmpty(gfshList.get(0))){
-                            ftpFileName.append(poolPaperService.getblocName(gfshList.get(0)));
-                            ftpFileName.append(fileSplit);
-                        }
-                    }
-                } else {
-                    if (gfshList.size() > 0) {
-//                        for (String s : gfshList) {
-//                            if (StringUtils.isNotEmpty(s)){
-//                                ftpFileName.append(poolPaperService.getGfName(s));
-//                                ftpFileName.append(fileSplit);
-//                            }
-//                        }
-                        if (StringUtils.isNotEmpty(gfshList.get(0))){
-                            ftpFileName.append(poolPaperService.getGfName(gfshList.get(0)));
-                            ftpFileName.append(fileSplit);
-                        }
-                    }
-                }
-
-                ftpFileName.append(DateUtils.getNowTimeStamp());
-                title = ftpFileName.toString();
+                ftpFileName.append(DateUtils.getStringDateShort());
+                ftpFileName.append(fileSplit);
+                ftpFileName.append((new Date()).getTime());
                 ftpFileName.append(fileNameSurfix);
+//                ftpFileName.append(fileNamePrefix);
+//                ftpFileName.append(DateUtils.dateToMonthStr(new Date()));
+//                ftpFileName.append(fileSplit);
+//                if ("99".equals(gfTaxNo)) {
+//                    if (gfshList.size() > 0) {
+//                        if (StringUtils.isNotEmpty(gfshList.get(0))){
+//                            ftpFileName.append(poolPaperService.getblocName(gfshList.get(0)));
+//                            ftpFileName.append(fileSplit);
+//                        }
+//                    }
+//                } else {
+//                    if (gfshList.size() > 0) {
+////                        for (String s : gfshList) {
+////                            if (StringUtils.isNotEmpty(s)){
+////                                ftpFileName.append(poolPaperService.getGfName(s));
+////                                ftpFileName.append(fileSplit);
+////                            }
+////                        }
+//                        if (StringUtils.isNotEmpty(gfshList.get(0))){
+//                            ftpFileName.append(poolPaperService.getGfName(gfshList.get(0)));
+//                            ftpFileName.append(fileSplit);
+//                        }
+//                    }
+//                }
+//
+//                ftpFileName.append(DateUtils.getNowTimeStamp());
+//                title = ftpFileName.toString();
+//                ftpFileName.append(fileNameSurfix);
 
                 // 本地文件存储路径
                 StringBuilder excelFile = new StringBuilder();
@@ -407,7 +415,7 @@ public class PoolSaleThread extends BaseThread {
         if (firstPage) {
             writeSheet = new WriteSheet();
             writeSheet.setSheetNo(sheetNo);
-            writeSheet.setSheetName(sheetName);
+            writeSheet.setSheetName(title);
             writeTable = new WriteTable();
             writeTable.setTableNo(sheetNo);
 
diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/QypcsmkpExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/QypcsmkpExportThread.java
index d67a0789..b7435c15 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/thread/QypcsmkpExportThread.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/thread/QypcsmkpExportThread.java
@@ -130,34 +130,42 @@ public class QypcsmkpExportThread extends BaseThread {
                 }
                 // 导出文件名
                 StringBuilder ftpFileName = new StringBuilder();
+                ftpFileName.append(userid);
+                ftpFileName.append(fileSplit);
                 ftpFileName.append(fileNamePrefix);
-                ftpFileName.append(DateUtils.dateToMonthStr(new Date()));
                 ftpFileName.append(fileSplit);
-                if ("99".equals(gfTaxNo)) {
-                    if (gfshList.size() > 0) {
-                        if (StringUtils.isNotEmpty(gfshList.get(0))){
-                            ftpFileName.append(ticketService.getblocName(gfshList.get(0)));
-                            ftpFileName.append(fileSplit);
-                        }
-                    }
-                } else {
-                    if (gfshList.size() > 0) {
-//                        for (String s : gfshList) {
-//                            if (StringUtils.isNotEmpty(s)){
-//                                ftpFileName.append(ticketService.getGfName(s));
-//                                ftpFileName.append(fileSplit);
-//                            }
-//                        }
-                        if (StringUtils.isNotEmpty(gfshList.get(0))){
-                            ftpFileName.append(ticketService.getGfName(gfshList.get(0)));
-                            ftpFileName.append(fileSplit);
-                        }
-                    }
-                }
-
-                ftpFileName.append(DateUtils.getNowTimeStamp());
-//                title = ftpFileName.toString();
+                ftpFileName.append(DateUtils.getStringDateShort());
+                ftpFileName.append(fileSplit);
+                ftpFileName.append((new Date()).getTime());
                 ftpFileName.append(fileNameSurfix);
+//                ftpFileName.append(fileNamePrefix);
+//                ftpFileName.append(DateUtils.dateToMonthStr(new Date()));
+//                ftpFileName.append(fileSplit);
+//                if ("99".equals(gfTaxNo)) {
+//                    if (gfshList.size() > 0) {
+//                        if (StringUtils.isNotEmpty(gfshList.get(0))){
+//                            ftpFileName.append(ticketService.getblocName(gfshList.get(0)));
+//                            ftpFileName.append(fileSplit);
+//                        }
+//                    }
+//                } else {
+//                    if (gfshList.size() > 0) {
+////                        for (String s : gfshList) {
+////                            if (StringUtils.isNotEmpty(s)){
+////                                ftpFileName.append(ticketService.getGfName(s));
+////                                ftpFileName.append(fileSplit);
+////                            }
+////                        }
+//                        if (StringUtils.isNotEmpty(gfshList.get(0))){
+//                            ftpFileName.append(ticketService.getGfName(gfshList.get(0)));
+//                            ftpFileName.append(fileSplit);
+//                        }
+//                    }
+//                }
+//
+//                ftpFileName.append(DateUtils.getNowTimeStamp());
+////                title = ftpFileName.toString();
+//                ftpFileName.append(fileNameSurfix);
 
                 // 本地文件存储路径
                 StringBuilder excelFile = new StringBuilder();