From fca9b034b6d7da2e613df0438601b7276607be06 Mon Sep 17 00:00:00 2001
From: lroyia <814876716@qq.com>
Date: Sat, 17 Jul 2021 10:31:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A0=87=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/io/lroyia/Ftl2Csv.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/lroyia/Ftl2Csv.java b/src/main/java/io/lroyia/Ftl2Csv.java
index 92eb515..f36c564 100644
--- a/src/main/java/io/lroyia/Ftl2Csv.java
+++ b/src/main/java/io/lroyia/Ftl2Csv.java
@@ -89,7 +89,8 @@ public class Ftl2Csv {
 
         // 创建列表csv文件
         FileWriter writer = new FileWriter("F:/penaltyList.csv");
-        String[] listHeader = new String[]{"NOTICEID", "NoticeTitle", "NoticeNO", "NoticeContent", "JudAuth", "JudAuth_CN", "JudDate", "NoticeDate", "NoticeType", "S_EXT_FROMNODE", "S_EXT_DATATIME"};
+        String[] listHeader = new String[]{"NOTICEID", "NOTICETITLE", "NOTICENO", "NOTICECONTENT",
+                "JUDAUTH", "JUDAUTH_CN", "JUDDATE", "NOTICEDATE", "NOTICETYPE", "S_EXT_FROMNODE", "S_EXT_DATATIME", "dstate"};
         CSVPrinter csvPrinter = new CSVPrinter(writer, CSVFormat.DEFAULT.withHeader(listHeader));
         List<List<String>> result = new ArrayList<>();
         for (PenaltyNoticeInfoForm value : list.values()) {
@@ -106,6 +107,7 @@ public class Ftl2Csv {
             resultSet.add("91");
             resultSet.add(StringUtils.EMPTY);
             resultSet.add(date);
+            resultSet.add("0");
             result.add(resultSet);
         }
         csvPrinter.printRecords(result);
@@ -215,7 +217,7 @@ public class Ftl2Csv {
             String id = each.attr("id");
             if(!content.isEmpty()){
                 PenaltyNoticeInfoForm atom = new PenaltyNoticeInfoForm();
-                atom.setContent(content.html());
+                atom.setContent(content.html().replace("\n", "").replace("\t", ""));
                 atom.setNameList(each.select("table").html());
                 result.put(id, atom);
             }else if(!iframe.isEmpty()){