From b270a07828a9627f1a42e254a430c9921fec4e95 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期三, 26 三月 2025 16:14:37 +0800
Subject: [PATCH] Merge branch 'master' of http://dlindusit.com:53929/r/iailab-plat

---
 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleInfoConstructor.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleInfoConstructor.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleInfoConstructor.java
index af4ae5b..430c810 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleInfoConstructor.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleInfoConstructor.java
@@ -81,7 +81,7 @@
                 dateTime = calculateTime(originalTime, true, columnItem.getDataLength(), columnItem.getGranularity());
                 break;
             case PLAN:
-                dateTime = calculateTime(originalTime, true, columnItem.getDataLength() + 1, columnItem.getGranularity());
+                dateTime = originalTime;
                 break;
             case IND:
             case IND_ASCII:
@@ -114,7 +114,7 @@
                 dateTime = calculateTime(originalTime, true, 1, columnItem.getGranularity());
                 break;
             case PLAN:
-                dateTime = calculateTime(originalTime, true, 1, columnItem.getGranularity());
+                dateTime = calculateTime(originalTime, false, columnItem.getDataLength()-1, columnItem.getGranularity());
                 break;
             case IND:
             case IND_ASCII:

--
Gitblit v1.9.3