From 9ffcbe15ca5ed491cd1bd1ddd6d067aab250fd7c Mon Sep 17 00:00:00 2001
From: liwen <w790785492@163.com>
Date: Mon, 22 Apr 2024 14:11:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=BC=94=E7=BB=83?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E8=A1=A8=E3=80=81=E5=9F=B9=E8=AE=AD=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E8=A1=A8=E5=AF=BC=E5=87=BA=E5=86=85=E5=AE=B9=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E6=8D=A2=E8=A1=8C=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../safeproduct/service/impl/RehearsalRecordServiceImpl.java   | 10 ++++++++--
 .../hzims/safeproduct/service/impl/TrainRecordServiceImpl.java |  6 ++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/RehearsalRecordServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/RehearsalRecordServiceImpl.java
index a269bf6..a4366b5 100644
--- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/RehearsalRecordServiceImpl.java
+++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/RehearsalRecordServiceImpl.java
@@ -141,14 +141,14 @@ public class RehearsalRecordServiceImpl extends ServiceImpl<RehearsalRecordMappe
     public void exportRehearsalRecordData(Long id, HttpServletResponse response) {
         RehearsalRecordDetailVO rehearsalRecordDetailVO = this.getRecordDetailVOById(id);
         // 数据处理
-        // 图片
+        // 时间
         if (StringUtils.isNotEmpty(rehearsalRecordDetailVO.getActualStartTime())){
             rehearsalRecordDetailVO.setActualStartTime(TimeUtils.format(rehearsalRecordDetailVO.getActualStartTime()));
         }
         if (StringUtils.isNotEmpty(rehearsalRecordDetailVO.getActualEndTime())){
             rehearsalRecordDetailVO.setActualEndTime(TimeUtils.format(rehearsalRecordDetailVO.getActualEndTime()));
         }
-
+        // 图片
         List<ImageEntity> list = new ArrayList<>();
         if (StringUtils.isNotEmpty(rehearsalRecordDetailVO.getImgPath())) {
             String[] imgArr = rehearsalRecordDetailVO.getImgPath().split(",");
@@ -162,6 +162,12 @@ public class RehearsalRecordServiceImpl extends ServiceImpl<RehearsalRecordMappe
             list.add(new ImageEntity());
         }
         rehearsalRecordDetailVO.setImages(list);
+        // 记录：换行符使用\r\n
+        String standardRecord = rehearsalRecordDetailVO.getRecord().replaceAll("\n", "\r\n");
+        rehearsalRecordDetailVO.setRecord(standardRecord);
+        // 评价：换行符使用\r\n
+        String standardComment = rehearsalRecordDetailVO.getComment().replaceAll("\n", "\r\n");
+        rehearsalRecordDetailVO.setComment(standardComment);
         // 表头年月
         String code = rehearsalRecordDetailVO.getCode();
         rehearsalRecordDetailVO.setYear(code.substring(4, 8));
diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/TrainRecordServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/TrainRecordServiceImpl.java
index e12b15f..9a79a53 100644
--- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/TrainRecordServiceImpl.java
+++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/TrainRecordServiceImpl.java
@@ -157,6 +157,12 @@ public class TrainRecordServiceImpl extends ServiceImpl<TrainRecordMapper, Train
         } else {
             trainRecordDetailVO.setTrainMethod(TrainMethodEnum.OFFLINE.getDesc());
         }
+        // 内容：换行符使用\r\n
+        String standardContent = trainRecordDetailVO.getContent().replaceAll("\n", "\r\n");
+        trainRecordDetailVO.setContent(standardContent);
+        // 评价：换行符使用\r\n
+        String standardCommand = trainRecordDetailVO.getCommand().replaceAll("\n", "\r\n");
+        trainRecordDetailVO.setCommand(standardCommand);
         // 图片
         if (StringUtils.isNotEmpty(trainRecordDetailVO.getImgPath())) {
             trainRecordDetailVO.setImages(Arrays.stream(trainRecordDetailVO.getImgPath().split(",")).map(img->