From 44f3bf96e118d7a39cda60a5f76424a521a32f97 Mon Sep 17 00:00:00 2001
From: 10001392 <1055202292@qq.com>
Date: Mon, 12 Aug 2024 22:15:58 +0800
Subject: [PATCH] =?UTF-8?q?EBOM=20PBOM=20SAP=E6=8A=A5=E9=94=99=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=EF=BC=8C=E6=98=BE=E7=A4=BA=E5=88=9B=E5=BB=BA=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nflg/product/bomnew/pojo/vo/OperationErrorMsgVO.java | 9 +++++++++
 .../product/bomnew/service/BomNewEbomParentService.java  | 4 +++-
 .../product/bomnew/service/BomNewPbomParentService.java  | 4 +++-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/OperationErrorMsgVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/OperationErrorMsgVO.java
index 9221b416..d5428047 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/OperationErrorMsgVO.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/OperationErrorMsgVO.java
@@ -6,6 +6,7 @@ import org.apache.commons.lang.StringUtils;
 import org.ttzero.excel.annotation.ExcelColumn;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 
 /**
  * @author 曹鹏飞
@@ -18,6 +19,14 @@ public class OperationErrorMsgVO extends OperationErrorMsgBaseVO implements Seri
     @ExcelColumn("所在行")
     public String primaryKey;
 
+    /**
+     * 创建时间
+     */
+
+    @ApiModelProperty(value = "创建时间")
+    @ExcelColumn("创建时间")
+    private LocalDateTime createdTime;
+
     public OperationErrorMsgVO() {
     }
 
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
index 060cce06..1400f253 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
@@ -2812,7 +2812,9 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
                 .eq(BomNewSapErrorMsgEntity::getTargetRowId, rowId)
                 .one();
         if (Objects.isNull(sapErrorMsgEntity)) return Collections.emptyList();
-        return JSON.parseArray(sapErrorMsgEntity.getData(), OperationErrorMsgVO.class);
+        List<OperationErrorMsgVO> resultList = JSON.parseArray(sapErrorMsgEntity.getData(), OperationErrorMsgVO.class);
+        resultList.forEach(result -> result.setCreatedTime(sapErrorMsgEntity.getCreatedTime()));
+        return resultList;
     }
 
 
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
index c2881a2b..d9fed474 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
@@ -1568,7 +1568,9 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
                 .eq(BomNewSapErrorMsgEntity::getTargetRowId, rowId)
                 .one();
         if (Objects.isNull(sapErrorMsgEntity)) return Collections.emptyList();
-        return JSON.parseArray(sapErrorMsgEntity.getData(), OperationErrorMsgVO.class);
+        List<OperationErrorMsgVO> resultList = JSON.parseArray(sapErrorMsgEntity.getData(), OperationErrorMsgVO.class);
+        resultList.forEach(result -> result.setCreatedTime(sapErrorMsgEntity.getCreatedTime()));
+        return resultList;
     }
 
     public List<BomNewPbomParentVO> getReverseBoms(Long parentRowId) {