From c7c43cd906af8605ca3d7879d59afb9c7895c155 Mon Sep 17 00:00:00 2001
From: yanyang <rainieyanic@outlook.com>
Date: Fri, 9 Dec 2022 17:00:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=B1=BB=E5=9E=8B=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cnbm/processInspection/dto/InspectionSampleDTO.java   | 3 ++-
 .../service/impl/InspectionSheetServiceImpl.java          | 8 +++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ym-process-inspection/src/main/java/com/cnbm/processInspection/dto/InspectionSampleDTO.java b/ym-process-inspection/src/main/java/com/cnbm/processInspection/dto/InspectionSampleDTO.java
index 929f017..20b2ebd 100644
--- a/ym-process-inspection/src/main/java/com/cnbm/processInspection/dto/InspectionSampleDTO.java
+++ b/ym-process-inspection/src/main/java/com/cnbm/processInspection/dto/InspectionSampleDTO.java
@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.time.Instant;
 import java.time.LocalDateTime;
 
 /**
@@ -30,7 +31,7 @@ public class InspectionSampleDTO implements Serializable {
     private String batchNum;
 
     @ApiModelProperty(value = "取样时间")
-    private LocalDateTime sampleTime;
+    private Instant sampleTime;
 
     @ApiModelProperty(value = "样本号")
     private String sampleNumber;
diff --git a/ym-process-inspection/src/main/java/com/cnbm/processInspection/service/impl/InspectionSheetServiceImpl.java b/ym-process-inspection/src/main/java/com/cnbm/processInspection/service/impl/InspectionSheetServiceImpl.java
index 7f79404..944b906 100644
--- a/ym-process-inspection/src/main/java/com/cnbm/processInspection/service/impl/InspectionSheetServiceImpl.java
+++ b/ym-process-inspection/src/main/java/com/cnbm/processInspection/service/impl/InspectionSheetServiceImpl.java
@@ -238,7 +238,8 @@ public class InspectionSheetServiceImpl extends CrudServiceImpl<InspectionSheetM
 
                 InspectionSampleDTO sampleDTO = new InspectionSampleDTO();
                 sampleDTO.setSampleNumber(sampleNumber);
-                sampleDTO.setSampleTime(LocalDateTime.ofInstant(events.get(0).getTime(), ZoneId.systemDefault()));
+                //sampleDTO.setSampleTime(LocalDateTime.ofInstant(events.get(0).getTime(), ZoneId.systemDefault()));
+                sampleDTO.setSampleTime(events.get(0).getTime());
                 sampleDTO.setBatchNum(dto.getBatchNumber());
                 sampleDTO.setInspectionSheetId(events.get(0).getInspectionSheetId());
 
@@ -264,8 +265,9 @@ public class InspectionSheetServiceImpl extends CrudServiceImpl<InspectionSheetM
             String sampleNumber = dto.getSampleNumber();
             String jsonData = dto.getJsonData();
             JSONObject json = JSON.parseObject(jsonData);
-            LocalDateTime sampleTime = dto.getSampleTime();
-            Instant eventTime = sampleTime.toInstant(ZoneOffset.UTC);
+//            LocalDateTime sampleTime = dto.getSampleTime();
+//            Instant eventTime = sampleTime.toInstant(ZoneOffset.UTC);
+            Instant eventTime = dto.getSampleTime();
             List<Event> list = new ArrayList<>();
             for (Map.Entry entry : json.entrySet()) {
                 String key = entry.getKey().toString();
-- 
2.24.3