From bf86c2ddaeddb32d55689d2a584fa2472cdba761 Mon Sep 17 00:00:00 2001
From: lau572 <1010031226@qq.com>
Date: Tue, 2 Apr 2024 18:25:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=83=85=E6=8A=A5=E6=9D=BF=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DcBoardReleaseLogController.java           | 18 ++++++++++++++++++
 .../zc/business/domain/DcBoardReleaseLog.java  |  6 +++---
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/zc-business/src/main/java/com/zc/business/controller/DcBoardReleaseLogController.java b/zc-business/src/main/java/com/zc/business/controller/DcBoardReleaseLogController.java
index 6a926a72..8d034717 100644
--- a/zc-business/src/main/java/com/zc/business/controller/DcBoardReleaseLogController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/DcBoardReleaseLogController.java
@@ -1,8 +1,11 @@
 package com.zc.business.controller;
 
 import java.util.List;
+import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -62,6 +65,21 @@ public class DcBoardReleaseLogController extends BaseController
     public void export(HttpServletResponse response, DcBoardReleaseLog dcBoardReleaseLog)
     {
         List<DcBoardReleaseLog> list = dcBoardReleaseLogService.selectDcBoardReleaseLogList(dcBoardReleaseLog);
+        for (DcBoardReleaseLog releaseLog : list) {
+            String content = releaseLog.getReleaseContent();
+            List<Map<String,Object>> contentList = JSONArray.parseObject(content,List.class);
+            if (contentList != null){
+                StringBuilder contentText = new StringBuilder();
+                for (int i = 0; i < contentList.size(); i++) {
+                    String contentItem = contentList.get(i+1).get("CONTENT").toString().replace("\\\\n"," ");
+                    contentText.append(i).append(".").append(contentItem).append("\n");
+                }
+                releaseLog.setReleaseContent(contentText.toString());
+            } else {
+                releaseLog.setReleaseContent("");
+            }
+
+        }
         ExcelUtil<DcBoardReleaseLog> util = new ExcelUtil<>(DcBoardReleaseLog.class);
         util.exportExcel(response, list, "情报板内容发布日志数据");
     }
diff --git a/zc-business/src/main/java/com/zc/business/domain/DcBoardReleaseLog.java b/zc-business/src/main/java/com/zc/business/domain/DcBoardReleaseLog.java
index 262dc44c..00eed7d1 100644
--- a/zc-business/src/main/java/com/zc/business/domain/DcBoardReleaseLog.java
+++ b/zc-business/src/main/java/com/zc/business/domain/DcBoardReleaseLog.java
@@ -40,7 +40,7 @@ public class DcBoardReleaseLog extends BaseEntity
     private String stakeMark;
 
     /** 方向1-上行,2-中,3-下行 */
-    @Excel(name = "方向1-上行,2-中,3-下行")
+    @Excel(name = "方向",readConverterExp = "1=上行,2=中,3=下行")
     @ApiModelProperty(value="方向1-上行,2-中,3-下行")
     private String direction;
 
@@ -50,7 +50,7 @@ public class DcBoardReleaseLog extends BaseEntity
     private String releaseContent;
 
     /** 发布状态（0：成功；1：失败） */
-    @Excel(name = "发布状态", readConverterExp = "0=：成功；1：失败")
+    @Excel(name = "发布状态", readConverterExp = "0=成功,1失败")
     @ApiModelProperty(value="发布状态0=：成功；1：失败")
     private String releaseStatus;
 
@@ -81,7 +81,7 @@ public class DcBoardReleaseLog extends BaseEntity
     private String releaseUserId;
 
     /** 发布端 */
-    @Excel(name = "发布端")
+    @Excel(name = "发布端", readConverterExp = "00=系统用户,01=智慧大脑,02=GIS+BIM")
     @ApiModelProperty(value="发布端（00=系统用户,01=智慧大脑,02=GIS+BIM")
     private String platform;