手工认证导出

dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java

@@ -234,37 +234,47 @@ public class ManualAthensThread 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))){
-                            if (StringUtils.isNotEmpty(gfshList.get(0))){
-                                ftpFileName.append(rzFpxxService.getblocName(gfshList.get(0)));
-                            }
-                            ftpFileName.append(fileSplit);
-                            log.info("税号名称获取");
-                        }
-                    }
-                } else {
-                    if (gfshList.size() > 0) {
-//                        for (String s : gfshList) {
-//                            if (StringUtils.isNotEmpty(s)){
-//                                ftpFileName.append(rzFpxxService.getGfName(s));
-//                                ftpFileName.append(fileSplit);
+                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))){
+//                            if (StringUtils.isNotEmpty(gfshList.get(0))){
+//                                ftpFileName.append(rzFpxxService.getblocName(gfshList.get(0)));
 //                            }
+//                            ftpFileName.append(fileSplit);
+//                            log.info("税号名称获取");
 //                        }
-                        if (StringUtils.isNotEmpty(gfshList.get(0))){
-                            ftpFileName.append(rzFpxxService.getGfName(gfshList.get(0)));
-                                ftpFileName.append(fileSplit);
-                        }
-                    }
-                }
-
-                ftpFileName.append(DateUtils.getNowTimeStamp());
-                title = ftpFileName.toString();
-                ftpFileName.append(fileNameSurfix);
+//                    }
+//                } else {
+//                    if (gfshList.size() > 0) {
+////                        for (String s : gfshList) {
+////                            if (StringUtils.isNotEmpty(s)){
+////                                ftpFileName.append(rzFpxxService.getGfName(s));
+////                                ftpFileName.append(fileSplit);
+////                            }
+////                        }
+//                        if (StringUtils.isNotEmpty(gfshList.get(0))){
+//                            ftpFileName.append(rzFpxxService.getGfName(gfshList.get(0)));
+//                                ftpFileName.append(fileSplit);
+//                        }
+//                    }
+//                }
+//
+//                ftpFileName.append(DateUtils.getNowTimeStamp());
+//                title = ftpFileName.toString();
+//                ftpFileName.append(fileNameSurfix);
 
                 // 本地文件存储路径
                 StringBuilder excelFile = new StringBuilder();
@@ -378,7 +388,7 @@ public class ManualAthensThread 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<>();