From c110b50500f6446c7471fd4e413c563067381de9 Mon Sep 17 00:00:00 2001
From: WS <1143478319@qq.com>
Date: 星期一, 14 八月 2023 19:49:15 +0800
Subject: [PATCH] V4.0版本温湿度 虫情 气体数据同步

---
 src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java
index ed9b4f6..f383d4b 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java
@@ -87,11 +87,14 @@
             String zkl;
             List<Api1203> api1203List;
             for (Fz35InoutRecord sysData : list) {
+                if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
+                    sysData.setRecordWeight(sysData.getSettleWeight());
+                }
                 //鍒ゆ柇鍑�閲嶆槸鍚﹀ぇ浜�0锛岀瓑浜�0琛ㄧず涓嶅悎鏍硷紝涓嶈繘琛屽悓姝ヤ笂浼�
                 if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
                     continue;
                 }
-                fz35CheckItems = null;
+
                 //鑾峰彇鍏ュ簱璐ㄦ淇℃伅
                 fz35CheckItems = fzzySync1203Rep.listInoutCheckItem(sysData.getCheckId(), deptId.substring(0, 4));
                 if (null == fz35CheckItems || fz35CheckItems.isEmpty()) {
@@ -112,6 +115,9 @@
                 //璐т綅浠g爜
                 apiData.setHwdm(api1105.getHwdm());
                 apiData.setRkywdh(apiData.getRkjydh());
+                if(null == sysData.getFullWeightTime()){
+                    sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 5));
+                }
                 apiData.setQysj(sysData.getFullWeightTime());
                 apiData.setQyrxm(sysData.getCheckUser());
                 //鎵︽牱鏂瑰紡 2-鏅鸿兘闅忔満

--
Gitblit v1.9.3