From 7bfee511ecfa17d63fa9a0908fdecdf199b13aaf Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期五, 26 一月 2024 14:57:00 +0800
Subject: [PATCH] 优化宁夏接口-库区图监控点位标注

---
 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
index 1a39112..7b2a534 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
@@ -111,7 +111,10 @@
             //榛樿涓�涓殢渚垮��
             apiData.setLxdh(StringUtils.isEmpty(sysData.getUserContact()) ? "13012345678" : sysData.getUserContact().trim());
 
-            apiData.setSfzh(null == sysData.getUserId() ? "410183199003187055" : sysData.getUserId().trim());
+            if(StringUtils.isEmpty(sysData.getUserId()) || sysData.getUserId().length() != 18){
+                sysData.setUserId("410183199003187055");
+            }
+            apiData.setSfzh(sysData.getUserId());
 
             //閫氱煡鍗曞彿
             apiData.setCktzdh(sysData.getNoticeId());
@@ -126,7 +129,7 @@
                     }
                 }
                 if (StringUtils.isNotEmpty(listInoutNotice.get(0).getPlanId())) {
-                    List<Api1404> api1404List = api1404Rep.getDataByBizId(listInoutNotice.get(0).getPlanId());
+                    List<Api1404> api1404List = api1404Rep.getDataByBizIdAndKqdm(listInoutNotice.get(0).getPlanId(), kqdm);
                     if(null != api1404List && api1404List.size() > 0){
                         apiData.setJhmxh(api1404List.get(0).getJhmxdh());
                     }
@@ -224,8 +227,8 @@
                     apiData.setMz(fz40InoutRecordItem.getFullWeight());
                     apiData.setPz(fz40InoutRecordItem.getEmptyWeight());
                     apiData.setJz(fz40InoutRecordItem.getSettleWeight());
-                    sysData.setEmptyWeightTime(fz40InoutRecordItem.getEmptyWeightTime());
-                    sysData.setFullWeightTime(fz40InoutRecordItem.getFullWeightTime());
+                    apiData.setMzjlsj(fz40InoutRecordItem.getFullWeightTime());
+                    apiData.setPzjlsj(fz40InoutRecordItem.getEmptyWeightTime());
 
                     api1205List = api1205Rep.getDataById(apiData.getCkywdh());
                     if(null == api1205List || api1205List.isEmpty()){

--
Gitblit v1.9.3