From c75c27634f569b439c83d606b052257df3d82f0a Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期三, 26 三月 2025 15:36:54 +0800
Subject: [PATCH] 数据同步调整

---
 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java
index 77b5fe1..eb80be6 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java
@@ -146,7 +146,7 @@
                         sysData.setRegisterTime(DateUtils.addDays(sysData.getRegisterTime(), numDay));
                     }
 
-                    apiData.setQysj(sysData.getRegisterTime());
+
                     apiData.setQyrxm(sysData.getCheckUser());
                     //鎵︽牱鏂瑰紡 2-鏅鸿兘闅忔満
                     apiData.setQyfs("2");
@@ -186,7 +186,20 @@
                         apiData.setJyjg("1");
                     }
                     apiData.setJyrxm(sysData.getCheckUser());
-                    apiData.setJysj(DateUtils.addMinutes(sysData.getRegisterTime(), 30));
+                    if (null == sysData.getCheckTime()) {
+                        sysData.setCheckTime(DateUtils.addMinutes(sysData.getFullWeightTime(), -5));
+                    }
+                    if (sysData.getCheckTime().after(sysData.getEmptyWeightTime())) {
+                        sysData.setCheckTime(DateUtils.addMinutes(sysData.getFullWeightTime(), -5));
+                    }
+                    apiData.setJysj(sysData.getCheckTime());
+                    if (null == sysData.getSampleTime()) {
+                        sysData.setSampleTime(DateUtils.addMinutes(sysData.getCheckTime(), -1));
+                    }
+                    if (sysData.getSampleTime().after(sysData.getCheckTime())) {
+                        sysData.setSampleTime(DateUtils.addMinutes(sysData.getCheckTime(), -1));
+                    }
+                    apiData.setQysj(sysData.getSampleTime());
 
                     //绮鍝佺
                     String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0,3));

--
Gitblit v1.9.3