From e7db6d5fe551a275ad5457cf9da8e52ee385296f Mon Sep 17 00:00:00 2001 From: CZT <czt18638530771@163.com> Date: 星期一, 14 八月 2023 18:17:22 +0800 Subject: [PATCH] 优化4.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