From 33ad92a73de17e8d72f30632ced04dca5719f76e Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期二, 22 四月 2025 15:51:55 +0800
Subject: [PATCH] 数据同步调整

---
 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 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 701e781..0799559 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
@@ -93,6 +93,9 @@
                 if (sysData.getRecordStatus().equals("DEL") || sysData.getRecordStatus().equals("ERROR")) {
                     continue;
                 }
+                if (!sysData.getProgress().equals("RECORD")){
+                    continue;
+                }
                 if (null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0) {
                     sysData.setRecordWeight(sysData.getSettleWeight());
                 }
@@ -161,11 +164,13 @@
 
                 //璐ㄦ鎶ュ憡鍗曞彿
                 List<Api1310> dataByHwdm = api1310Rep.getDataByHwdm(apiData.getHwdm(), "02");
-                apiData.setZjbgdh(dataByHwdm.get(0).getZjbgdh());
+                if (null != dataByHwdm && dataByHwdm.size() > 0) {
+                    apiData.setZjbgdh(dataByHwdm.get(0).getZjbgdh());
+                }
 
                 //鐢熸垚鏂瑰紡
                 apiData.setScfs(1);
-                if(StringUtils.isNotEmpty(sysData.getRecordStatus()) && sysData.getRecordStatus().equals("ADD")){
+                if (StringUtils.isNotEmpty(sysData.getRecordStatus()) && sysData.getRecordStatus().equals("ADD")) {
                     apiData.setScfs(2);
                     apiData.setSdblyy("搴撳尯鍋滅數瀵艰嚧鏃犳硶鎸夋祦绋嬭繘琛屽嚭搴�");
                 }
@@ -235,6 +240,7 @@
                 apiData.setBz(StringUtils.isEmpty(sysData.getRemarks()) ? "鏆傛棤澶囨敞淇℃伅" : sysData.getRemarks());
                 apiData.setBzbdbz(25);
                 apiData.setBzbjs(0);
+                apiData.setBzw(StringUtils.isEmpty(sysData.getBzw()) ? "9" : sysData.getBzw());
                 apiData.setCmqrmgryxm(StringUtils.isEmpty(sysData.getRegisterUser()) ? "闂ㄥ矖浜�" : sysData.getRegisterUser());
                 apiData.setDjmgryxm(StringUtils.isEmpty(sysData.getRegisterUser()) ? "鐧昏浜�" : sysData.getRegisterUser());
                 apiData.setZcbgyxm(StringUtils.isEmpty(sysData.getHandleUser()) ? "鍊间粨鍛�" : sysData.getHandleUser());

--
Gitblit v1.9.3