From ac9b4c99b2534e31a8ce9948b376feb514c2ec20 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期五, 01 三月 2024 11:31:52 +0800
Subject: [PATCH] 优化损益数据同步

---
 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
index f29a073..def2483 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
@@ -120,6 +120,7 @@
                 if(StringUtils.isEmpty(sysData.getUserId()) || sysData.getUserId().length() != 18){
                     sysData.setUserId("410183199003187055");
                 }
+                apiData.setSfzh(sysData.getUserId());
 
                 //鑾峰彇閫氱煡鍗曚俊鎭紝鏌ヨ鍚堝悓鍙峰拰璁″垝鏄庣粏鍙�
                 listInoutNotice = fzzySyncNoticeInRep.listInoutNoticeInById(sysData.getNoticeId());
@@ -132,9 +133,12 @@
                         }
                     }
                     if (StringUtils.isNotEmpty(listInoutNotice.get(0).getPlanId())) {
-                        api1404List = api1404Rep.getDataByBizId(listInoutNotice.get(0).getPlanId());
+                        api1404List = api1404Rep.getDataByBizIdAndKqdm(listInoutNotice.get(0).getPlanId(), kqdm);
                         if(null != api1404List && api1404List.size() > 0){
                             apiData.setJhmxh(api1404List.get(0).getJhmxdh());
+                            if(StringUtils.isEmpty(sysData.getFoodYear())){
+                                sysData.setFoodYear(api1404List.get(0).getShnd());
+                            }
                         }
                     }
                 }
@@ -157,7 +161,7 @@
                 mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getFoodType());
                 apiData.setLsxzdm(mappingCode);
 
-                apiData.setShnd(StringUtils.isEmpty(sysData.getFoodYear()) ? DateFormatUtils.format(new Date(), "yyyy") : sysData.getFoodYear());
+                apiData.setShnd(StringUtils.isEmpty(sysData.getFoodYear()) ? DateFormatUtils.format(sysData.getRegisterTime(), "yyyy") : sysData.getFoodYear());
 
                 //浜у湴浠g爜
                 mappingCode = commonService.getFoodLocationIdFromCache(sysData.getFoodLocation());

--
Gitblit v1.9.3